From: Nikolaus Voss <nikolaus.voss@loewensteinmedical.de>
To: "Shevchenko, Andriy" <andriy.shevchenko@intel.com>,
"Schmauss, Erik" <erik.schmauss@intel.com>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
"Moore, Robert" <robert.moore@intel.com>
Cc: Len Brown <lenb@kernel.org>,
Jacek Anaszewski <jacek.anaszewski@gmail.com>,
Pavel Machek <pavel@ucw.cz>, Dan Murphy <dmurphy@ti.com>,
linux-acpi@vger.kernel.org, devel@acpica.org,
linux-kernel@vger.kernel.org, nv@vosn.de,
Nikolaus Voss <nikolaus.voss@loewensteinmedical.de>
Subject: [PATCH] ACPICA: make acpi_load_table() return table index
Date: Thu, 12 Sep 2019 10:07:42 +0200 [thread overview]
Message-ID: <20190912080742.24642-1-nikolaus.voss@loewensteinmedical.de> (raw)
In-Reply-To: <20190906174605.GY2680@smile.fi.intel.com>
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.
Reported-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Fixes: d06c47e3dd07f ("ACPI: configfs: Resolve objects on host-directed table loads")
Signed-off-by: Nikolaus Voss <nikolaus.voss@loewensteinmedical.de>
---
drivers/acpi/acpi_configfs.c | 2 +-
drivers/acpi/acpica/dbfileio.c | 2 +-
drivers/acpi/acpica/tbxfload.c | 8 ++++++--
drivers/firmware/efi/efi.c | 2 +-
include/acpi/acpixf.h | 3 ++-
5 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/drivers/acpi/acpi_configfs.c b/drivers/acpi/acpi_configfs.c
index 57d9d574d4dde..77f81242a28e6 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 c6e25734dc5cd..e1b6e54a96ac1 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 86f1693f6d29a..d08cd8ffcbdb6 100644
--- a/drivers/acpi/acpica/tbxfload.c
+++ b/drivers/acpi/acpica/tbxfload.c
@@ -268,7 +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
*
* DESCRIPTION: Dynamically load an ACPI table from the caller's buffer. Must
@@ -278,7 +279,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 +298,9 @@ 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 ad3b1f4866b35..9773e4212baef 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -308,7 +308,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 3845c8fcc94e5..c90bbdc4146a6 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -452,7 +452,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_parent_table(acpi_handle object))
--
2.17.1
next prev parent reply other threads:[~2019-09-12 8:07 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-29 12:18 [PATCH 0/3] PWM framework: add support referencing PWMs from ACPI Nikolaus Voss
2019-05-29 12:18 ` [PATCH 1/3] ACPI: Resolve objects on host-directed table loads Nikolaus Voss
2019-05-30 14:42 ` Dan Murphy
2019-05-31 12:23 ` Pavel Machek
2019-05-31 12:45 ` Dan Murphy
2019-05-31 12:46 ` Dan Murphy
2019-06-03 9:12 ` Nikolaus Voss
2019-08-14 18:50 ` Andy Shevchenko
2019-08-14 20:27 ` Schmauss, Erik
2019-08-16 11:57 ` Nikolaus Voss
2019-08-30 14:53 ` Shevchenko, Andriy
2019-09-04 7:20 ` Nikolaus Voss
2019-09-06 17:46 ` Shevchenko, Andriy
2019-09-12 8:05 ` Nikolaus Voss
2019-09-12 8:07 ` Nikolaus Voss [this message]
2019-09-12 14:19 ` [PATCH] ACPICA: make acpi_load_table() return table index Moore, Robert
2019-09-12 19:36 ` Ferry Toth
2019-09-25 18:13 ` Schmauss, Erik
2019-09-26 8:09 ` Shevchenko, Andriy
2019-09-13 7:44 ` Nikolaus Voss
2019-09-13 14:20 ` Moore, Robert
2019-09-13 15:12 ` Shevchenko, Andriy
2019-09-13 16:48 ` Ferry Toth
2019-09-13 16:48 ` Ferry Toth
2019-09-13 17:40 ` Moore, Robert
2019-09-13 19:56 ` Rafael J. Wysocki
2019-09-16 9:46 ` Nikolaus Voss
2019-09-18 14:13 ` Moore, Robert
2019-09-18 14:31 ` Nikolaus Voss
2019-09-19 17:05 ` Moore, Robert
2019-09-23 9:05 ` Nikolaus Voss
2019-09-24 19:41 ` Moore, Robert
2019-09-25 10:18 ` Nikolaus Voss
2019-09-25 10:53 ` Shevchenko, Andriy
2019-09-19 8:13 ` Rafael J. Wysocki
2019-09-23 9:08 ` Nikolaus Voss
2019-09-23 9:47 ` [PATCH] ACPICA: Introduce acpi_load_table_with_index() Nikolaus Voss
2019-09-24 12:07 ` Shevchenko, Andriy
2019-09-24 12:08 ` Shevchenko, Andriy
2019-09-25 10:20 ` Nikolaus Voss
2019-09-24 15:11 ` Andy Shevchenko
2019-09-25 10:22 ` Nikolaus Voss
2019-09-26 16:09 ` [PATCH] ACPICA: make acpi_load_table() return table index Schmauss, Erik
2019-09-26 16:35 ` Shevchenko, Andriy
2019-09-26 16:51 ` Schmauss, Erik
2019-09-26 17:47 ` Shevchenko, Andriy
2019-09-26 18:44 ` Nikolaus Voss
2019-09-26 19:26 ` Rafael J. Wysocki
2019-09-26 19:41 ` Schmauss, Erik
2019-09-26 18:43 ` Nikolaus Voss
2019-05-29 12:18 ` [PATCH 2/3] PWM framework: add support referencing PWMs from ACPI Nikolaus Voss
2019-05-30 14:54 ` Dan Murphy
2019-05-31 12:24 ` Pavel Machek
2019-06-03 9:27 ` Nikolaus Voss
2019-05-29 12:18 ` [PATCH 3/3] leds-pwm.c: support ACPI via firmware-node framework Nikolaus Voss
2019-05-30 15:14 ` Dan Murphy
2019-06-03 9:44 ` Nikolaus Voss
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190912080742.24642-1-nikolaus.voss@loewensteinmedical.de \
--to=nikolaus.voss@loewensteinmedical.de \
--cc=andriy.shevchenko@intel.com \
--cc=devel@acpica.org \
--cc=dmurphy@ti.com \
--cc=erik.schmauss@intel.com \
--cc=jacek.anaszewski@gmail.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nv@vosn.de \
--cc=pavel@ucw.cz \
--cc=rjw@rjwysocki.net \
--cc=robert.moore@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).