Skip to content

Commit 7e63420

Browse files
torvaldstorvalds
committed
Merge tag 'acpi-5.7-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull more ACPI updates from Rafael Wysocki: "Additional ACPI updates. These update the ACPICA code in the kernel to the 20200326 upstream revision, fix an ACPI-related CPU hotplug deadlock on x86, update Intel Tiger Lake device IDs in some places, add a new ACPI backlight blacklist entry, update the "acpi_backlight" kernel command line switch documentation and clean up a CPPC library routine. Specifics: - Update the ACPICA code in the kernel to upstream revision 20200326 including: * Fix for a typo in a comment field (Bob Moore) * acpiExec namespace init file fixes (Bob Moore) * Addition of NHLT to the known tables list (Cezary Rojewski) * Conversion of PlatformCommChannel ASL keyword to PCC (Erik Kaneda) * acpiexec cleanup (Erik Kaneda) * WSMT-related typo fix (Erik Kaneda) * sprintf() utility function fix (John Levon) * IVRS IVHD type 11h parsing implementation (Michał Żygowski) * IVRS IVHD type 10h reserved field name fix (Michał Żygowski) - Fix ACPI-related CPU hotplug deadlock on x86 (Qian Cai) - Fix Intel Tiger Lake ACPI device IDs in several places (Gayatri Kammela) - Add ACPI backlight blacklist entry for Acer Aspire 5783z (Hans de Goede) - Fix documentation of the "acpi_backlight" kernel command line switch (Randy Dunlap) - Clean up the acpi_get_psd_map() CPPC library routine (Liguang Zhang)" * tag 'acpi-5.7-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: x86: ACPI: fix CPU hotplug deadlock thermal: int340x_thermal: fix: Update Tiger Lake ACPI device IDs platform/x86: intel-hid: fix: Update Tiger Lake ACPI device ID ACPI: Update Tiger Lake ACPI device IDs ACPI: video: Use native backlight on Acer Aspire 5783z ACPI: video: Docs update for "acpi_backlight" kernel parameter options ACPICA: Update version 20200326 ACPICA: Fixes for acpiExec namespace init file ACPICA: Add NHLT table signature ACPICA: WSMT: Fix typo, no functional change ACPICA: utilities: fix sprintf() ACPICA: acpiexec: remove redeclaration of acpi_gbl_db_opt_no_region_support ACPICA: Change PlatformCommChannel ASL keyword to PCC ACPICA: Fix IVRS IVHD type 10h reserved field name ACPICA: Implement IVRS IVHD type 11h parsing ACPICA: Fix a typo in a comment field ACPI: CPPC: clean up acpi_get_psd_map()
2 parents ef05db1 + 33ae7f7 commit 7e63420

27 files changed

Lines changed: 155 additions & 77 deletions

‎Documentation/admin-guide/kernel-parameters.txt‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,13 @@
2222
default: 0
2323

2424
acpi_backlight= [HW,ACPI]
25-
acpi_backlight=vendor
26-
acpi_backlight=video
27-
If set to vendor, prefer vendor specific driver
25+
{ vendor | video | native | none }
26+
If set to vendor, prefer vendor-specific driver
2827
(e.g. thinkpad_acpi, sony_acpi, etc.) instead
2928
of the ACPI video.ko driver.
29+
If set to video, use the ACPI video.ko driver.
30+
If set to native, use the device's native backlight mode.
31+
If set to none, disable the ACPI backlight interface.
3032

3133
acpi_force_32bit_fadt_addr
3234
force FADT to use 32 bit addresses rather than the

‎arch/x86/kernel/acpi/cstate.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,8 @@ int acpi_processor_ffh_cstate_probe(unsigned int cpu,
161161

162162
/* Make sure we are running on right CPU */
163163

164-
retval = work_on_cpu(cpu, acpi_processor_ffh_cstate_probe_cpu, cx);
164+
retval = call_on_cpu(cpu, acpi_processor_ffh_cstate_probe_cpu, cx,
165+
false);
165166
if (retval == 0) {
166167
/* Use the hint in CST */
167168
percpu_entry->states[cx->index].eax = cx->address;

‎drivers/acpi/acpica/acnamesp.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,8 @@ u32
256256
acpi_ns_build_normalized_path(struct acpi_namespace_node *node,
257257
char *full_path, u32 path_size, u8 no_trailing);
258258

259+
void acpi_ns_normalize_pathname(char *original_path);
260+
259261
char *acpi_ns_get_normalized_pathname(struct acpi_namespace_node *node,
260262
u8 no_trailing);
261263

‎drivers/acpi/acpica/dbinput.c‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -468,16 +468,14 @@ char *acpi_db_get_next_token(char *string,
468468
return (NULL);
469469
}
470470

471-
/* Remove any spaces at the beginning */
471+
/* Remove any spaces at the beginning, ignore blank lines */
472472

473-
if (*string == ' ') {
474-
while (*string && (*string == ' ')) {
475-
string++;
476-
}
473+
while (*string && isspace(*string)) {
474+
string++;
475+
}
477476

478-
if (!(*string)) {
479-
return (NULL);
480-
}
477+
if (!(*string)) {
478+
return (NULL);
481479
}
482480

483481
switch (*string) {
@@ -570,7 +568,7 @@ char *acpi_db_get_next_token(char *string,
570568

571569
/* Find end of token */
572570

573-
while (*string && (*string != ' ')) {
571+
while (*string && !isspace(*string)) {
574572
string++;
575573
}
576574
break;

‎drivers/acpi/acpica/dbxface.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,7 @@ acpi_status acpi_initialize_debugger(void)
409409
acpi_gbl_db_output_flags = ACPI_DB_CONSOLE_OUTPUT;
410410

411411
acpi_gbl_db_opt_no_ini_methods = FALSE;
412+
acpi_gbl_db_opt_no_region_support = FALSE;
412413

413414
acpi_gbl_db_buffer = acpi_os_allocate(ACPI_DEBUG_BUFFER_SIZE);
414415
if (!acpi_gbl_db_buffer) {

‎drivers/acpi/acpica/dswexec.c‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
#include "acinterp.h"
1717
#include "acnamesp.h"
1818
#include "acdebug.h"
19+
#ifdef ACPI_EXEC_APP
20+
#include "aecommon.h"
21+
#endif
1922

2023
#define _COMPONENT ACPI_DISPATCHER
2124
ACPI_MODULE_NAME("dswexec")
@@ -329,6 +332,10 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
329332
u32 op_class;
330333
union acpi_parse_object *next_op;
331334
union acpi_parse_object *first_arg;
335+
#ifdef ACPI_EXEC_APP
336+
char *namepath;
337+
union acpi_operand_object *obj_desc;
338+
#endif
332339

333340
ACPI_FUNCTION_TRACE_PTR(ds_exec_end_op, walk_state);
334341

@@ -537,6 +544,32 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
537544

538545
status =
539546
acpi_ds_eval_buffer_field_operands(walk_state, op);
547+
if (ACPI_FAILURE(status)) {
548+
break;
549+
}
550+
#ifdef ACPI_EXEC_APP
551+
/*
552+
* acpi_exec support for namespace initialization file (initialize
553+
* buffer_fields in this code.)
554+
*/
555+
namepath =
556+
acpi_ns_get_external_pathname(op->common.node);
557+
status = ae_lookup_init_file_entry(namepath, &obj_desc);
558+
if (ACPI_SUCCESS(status)) {
559+
status =
560+
acpi_ex_write_data_to_field(obj_desc,
561+
op->common.
562+
node->object,
563+
NULL);
564+
if ACPI_FAILURE
565+
(status) {
566+
ACPI_EXCEPTION((AE_INFO, status,
567+
"While writing to buffer field"));
568+
}
569+
}
570+
ACPI_FREE(namepath);
571+
status = AE_OK;
572+
#endif
540573
break;
541574

542575
case AML_TYPE_CREATE_OBJECT:

‎drivers/acpi/acpica/dswload.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include "acdispat.h"
1515
#include "acinterp.h"
1616
#include "acnamesp.h"
17-
1817
#ifdef ACPI_ASL_COMPILER
1918
#include "acdisasm.h"
2019
#endif
@@ -399,7 +398,6 @@ acpi_status acpi_ds_load1_end_op(struct acpi_walk_state *walk_state)
399398
union acpi_parse_object *op;
400399
acpi_object_type object_type;
401400
acpi_status status = AE_OK;
402-
403401
#ifdef ACPI_ASL_COMPILER
404402
u8 param_count;
405403
#endif

‎drivers/acpi/acpica/dswload2.c‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
#include "acinterp.h"
1616
#include "acnamesp.h"
1717
#include "acevents.h"
18+
#ifdef ACPI_EXEC_APP
19+
#include "aecommon.h"
20+
#endif
1821

1922
#define _COMPONENT ACPI_DISPATCHER
2023
ACPI_MODULE_NAME("dswload2")
@@ -373,6 +376,10 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
373376
struct acpi_namespace_node *new_node;
374377
u32 i;
375378
u8 region_space;
379+
#ifdef ACPI_EXEC_APP
380+
union acpi_operand_object *obj_desc;
381+
char *namepath;
382+
#endif
376383

377384
ACPI_FUNCTION_TRACE(ds_load2_end_op);
378385

@@ -466,6 +473,11 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
466473
* be evaluated later during the execution phase
467474
*/
468475
status = acpi_ds_create_buffer_field(op, walk_state);
476+
if (ACPI_FAILURE(status)) {
477+
ACPI_EXCEPTION((AE_INFO, status,
478+
"CreateBufferField failure"));
479+
goto cleanup;
480+
}
469481
break;
470482

471483
case AML_TYPE_NAMED_FIELD:
@@ -604,6 +616,29 @@ acpi_status acpi_ds_load2_end_op(struct acpi_walk_state *walk_state)
604616
case AML_NAME_OP:
605617

606618
status = acpi_ds_create_node(walk_state, node, op);
619+
if (ACPI_FAILURE(status)) {
620+
goto cleanup;
621+
}
622+
#ifdef ACPI_EXEC_APP
623+
/*
624+
* acpi_exec support for namespace initialization file (initialize
625+
* Name opcodes in this code.)
626+
*/
627+
namepath = acpi_ns_get_external_pathname(node);
628+
status = ae_lookup_init_file_entry(namepath, &obj_desc);
629+
if (ACPI_SUCCESS(status)) {
630+
631+
/* Detach any existing object, attach new object */
632+
633+
if (node->object) {
634+
acpi_ns_detach_object(node);
635+
}
636+
acpi_ns_attach_object(node, obj_desc,
637+
obj_desc->common.type);
638+
}
639+
ACPI_FREE(namepath);
640+
status = AE_OK;
641+
#endif
607642
break;
608643

609644
case AML_METHOD_OP:

‎drivers/acpi/acpica/nsnames.c‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
#define _COMPONENT ACPI_NAMESPACE
1414
ACPI_MODULE_NAME("nsnames")
1515

16-
/* Local Prototypes */
17-
static void acpi_ns_normalize_pathname(char *original_path);
18-
1916
/*******************************************************************************
2017
*
2118
* FUNCTION: acpi_ns_get_external_pathname
@@ -30,7 +27,6 @@ static void acpi_ns_normalize_pathname(char *original_path);
3027
* for error and debug statements.
3128
*
3229
******************************************************************************/
33-
3430
char *acpi_ns_get_external_pathname(struct acpi_namespace_node *node)
3531
{
3632
char *name_buffer;
@@ -411,7 +407,7 @@ char *acpi_ns_build_prefixed_pathname(union acpi_generic_state *prefix_scope,
411407
*
412408
******************************************************************************/
413409

414-
static void acpi_ns_normalize_pathname(char *original_path)
410+
void acpi_ns_normalize_pathname(char *original_path)
415411
{
416412
char *input_path = original_path;
417413
char *new_path_buffer;

‎drivers/acpi/acpica/utdecode.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS] = {
7878
"IPMI", /* 0x07 */
7979
"GeneralPurposeIo", /* 0x08 */
8080
"GenericSerialBus", /* 0x09 */
81-
"PlatformCommChannel" /* 0x0A */
81+
"PCC" /* 0x0A */
8282
};
8383

8484
const char *acpi_ut_get_region_name(u8 space_id)

0 commit comments

Comments
 (0)