hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ACPI: configfs: Resolve objects on host-directed table loads 

If an ACPI SSDT overlay is loaded after built-in tables
have been loaded e.g. via configfs or efivar_ssdt_load()
it is necessary to rewalk the namespace to resolve
references. Without this, relative and absolute paths
like ^PCI0.SBUS or \_SB.PCI0.SBUS are not resolved
correctly.

Make configfs loads use the same method as efivar_ssdt_load().

Signed-off-by: Nikolaus Voss <nikolaus.voss@loewensteinmedical.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Nikolaus Voss 2019-06-12 10:36:06 +02:00 committed by Rafael J. Wysocki
parent c78fea61f0
commit d06c47e3dd
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/acpi/acpi_configfs.c
View File

@ -56,11 +56,7 @@ static ssize_t acpi_table_aml_write(struct config_item *cfg,
if (!table->header) if (!table->header)
return -ENOMEM; return -ENOMEM;
ACPI_INFO(("Host-directed Dynamic ACPI Table Load:")); ret = acpi_load_table(table->header);
ret = acpi_tb_install_and_load_table(
ACPI_PTR_TO_PHYSADDR(table->header),
ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL, FALSE,
&table->index);
if (ret) { if (ret) {
kfree(table->header); kfree(table->header);
table->header = NULL; table->header = NULL;

11
drivers/acpi/acpica/tbxfload.c
View File

@ -297,6 +297,17 @@ acpi_status acpi_load_table(struct acpi_table_header *table)
status = acpi_tb_install_and_load_table(ACPI_PTR_TO_PHYSADDR(table), status = acpi_tb_install_and_load_table(ACPI_PTR_TO_PHYSADDR(table),
ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL, ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL,
FALSE, &table_index); FALSE, &table_index);
if (ACPI_SUCCESS(status)) {
/* Complete the initialization/resolution of package objects */
status = acpi_ns_walk_namespace(ACPI_TYPE_PACKAGE,
ACPI_ROOT_OBJECT,
ACPI_UINT32_MAX, 0,
acpi_ns_init_one_package,
NULL, NULL, NULL);
}
return_ACPI_STATUS(status); return_ACPI_STATUS(status);
} }