| Message ID | 20191024185556.4606-6-erik.schmauss@intel.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Delegated to: | Rafael Wysocki |
| Headers | show |
| Series | ACPICA version 20191018 | expand |
On Thu, Oct 24, 2019 at 11:55:49AM -0700, Erik Schmauss wrote: > From: Nikolaus Voss <nikolaus.voss@loewensteinmedical.de> > > ACPICA commit d1716a829d19be23277d9157c575a03b9abb7457 > > For unloading an ACPI table, it is necessary to provide the index of > the table. The method intended for dynamically loading or hotplug > addition of tables, acpi_load_table(), should provide this information > via an optional pointer to the loaded table index. > > This patch fixes the table unload function of acpi_configfs. > Thank you! My comments below. First of all, can I be Cc'ed to all series to be able to test? > Reported-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Fixes: d06c47e3dd07f ("ACPI: configfs: Resolve objects on host-directed > table loads") I believe this has to be one line. > --- a/drivers/acpi/acpi_configfs.c > +++ b/drivers/acpi/acpi_configfs.c > @@ -53,7 +53,7 @@ static ssize_t acpi_table_aml_write(struct config_item *cfg, > if (!table->header) > return -ENOMEM; > > - ret = acpi_load_table(table->header); > + ret = acpi_load_table(table->header, &table->index); > if (ret) { > kfree(table->header); > table->header = NULL; As far as I understood the release notes of latest ACPICA there is also a counterpart function being provided. That said, we need to modify ConfigFS removing path to use the new API. Am I correct?
On Fri, Oct 25, 2019 at 10:19 AM Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > > On Thu, Oct 24, 2019 at 11:55:49AM -0700, Erik Schmauss wrote: > > From: Nikolaus Voss <nikolaus.voss@loewensteinmedical.de> > > > > ACPICA commit d1716a829d19be23277d9157c575a03b9abb7457 > > > > For unloading an ACPI table, it is necessary to provide the index of > > the table. The method intended for dynamically loading or hotplug > > addition of tables, acpi_load_table(), should provide this information > > via an optional pointer to the loaded table index. > > > > This patch fixes the table unload function of acpi_configfs. > > > > Thank you! > > My comments below. > > First of all, can I be Cc'ed to all series to be able to test? > > > Reported-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > > > Fixes: d06c47e3dd07f ("ACPI: configfs: Resolve objects on host-directed > > table loads") > > I believe this has to be one line. Yes, it does, but I fix up such things, so no worries. > > --- a/drivers/acpi/acpi_configfs.c > > +++ b/drivers/acpi/acpi_configfs.c > > @@ -53,7 +53,7 @@ static ssize_t acpi_table_aml_write(struct config_item *cfg, > > if (!table->header) > > return -ENOMEM; > > > > - ret = acpi_load_table(table->header); > > + ret = acpi_load_table(table->header, &table->index); > > if (ret) { > > kfree(table->header); > > table->header = NULL; > > As far as I understood the release notes of latest ACPICA there is also a > counterpart function being provided. That said, we need to modify ConfigFS > removing path to use the new API. > > Am I correct? Yes, you are. These are just ACPICA changes and we still need to update the configfs I/F on top of them. Cheers!
diff --git a/drivers/acpi/acpi_configfs.c b/drivers/acpi/acpi_configfs.c index 57d9d574d4dd..77f81242a28e 100644 --- a/drivers/acpi/acpi_configfs.c +++ b/drivers/acpi/acpi_configfs.c @@ -53,7 +53,7 @@ static ssize_t acpi_table_aml_write(struct config_item *cfg, if (!table->header) return -ENOMEM; - ret = acpi_load_table(table->header); + ret = acpi_load_table(table->header, &table->index); if (ret) { kfree(table->header); table->header = NULL; diff --git a/drivers/acpi/acpica/dbfileio.c b/drivers/acpi/acpica/dbfileio.c index c6e25734dc5c..e1b6e54a96ac 100644 --- a/drivers/acpi/acpica/dbfileio.c +++ b/drivers/acpi/acpica/dbfileio.c @@ -93,7 +93,7 @@ acpi_status acpi_db_load_tables(struct acpi_new_table_desc *list_head) while (table_list_head) { table = table_list_head->table; - status = acpi_load_table(table); + status = acpi_load_table(table, NULL); if (ACPI_FAILURE(status)) { if (status == AE_ALREADY_EXISTS) { acpi_os_printf diff --git a/drivers/acpi/acpica/tbxfload.c b/drivers/acpi/acpica/tbxfload.c index ce86e7945e90..0782acf85722 100644 --- a/drivers/acpi/acpica/tbxfload.c +++ b/drivers/acpi/acpica/tbxfload.c @@ -268,6 +268,8 @@ ACPI_EXPORT_SYMBOL_INIT(acpi_install_table) * * PARAMETERS: table - Pointer to a buffer containing the ACPI * table to be loaded. + * table_idx - Pointer to a u32 for storing the table + * index, might be NULL * * RETURN: Status * @@ -278,7 +280,7 @@ ACPI_EXPORT_SYMBOL_INIT(acpi_install_table) * to ensure that the table is not deleted or unmapped. * ******************************************************************************/ -acpi_status acpi_load_table(struct acpi_table_header *table) +acpi_status acpi_load_table(struct acpi_table_header *table, u32 *table_idx) { acpi_status status; u32 table_index; @@ -297,6 +299,10 @@ acpi_status acpi_load_table(struct acpi_table_header *table) status = acpi_tb_install_and_load_table(ACPI_PTR_TO_PHYSADDR(table), ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL, FALSE, &table_index); + if (table_idx) { + *table_idx = table_index; + } + if (ACPI_SUCCESS(status)) { /* Complete the initialization/resolution of new objects */ diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index 69f00f7453a3..0d65cb21519d 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -296,7 +296,7 @@ static __init int efivar_ssdt_load(void) goto free_data; } - ret = acpi_load_table(data); + ret = acpi_load_table(data, NULL); if (ret) { pr_err("failed to load table: %d\n", ret); goto free_data; diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index 109b2f14b6c6..867170049b07 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h @@ -458,7 +458,8 @@ ACPI_EXTERNAL_RETURN_STATUS(acpi_status ACPI_INIT_FUNCTION u8 physical)) ACPI_EXTERNAL_RETURN_STATUS(acpi_status - acpi_load_table(struct acpi_table_header *table)) + acpi_load_table(struct acpi_table_header *table, + u32 *table_idx)) ACPI_EXTERNAL_RETURN_STATUS(acpi_status acpi_unload_table(u32 table_index))