From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-acpi@vger.kernel.org
Cc: John Ogness <john.ogness@linutronix.de>,
rafael@kernel.org, mika.westerberg@linux.intel.com
Subject: [PATCH 2/3] ACPI: Get acpi_device's parent from the parent field
Date: Wed, 3 Nov 2021 15:34:05 +0200 [thread overview]
Message-ID: <20211103133406.659542-3-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <20211103133406.659542-1-sakari.ailus@linux.intel.com>
Printk modifier %pfw is used to print the full path of the device name.
This is obtained device by device until a device no longer has a parent.
On ACPI getting the parent fwnode is done by calling acpi_get_parent()
which tries to down() a semaphore. But local IRQs are now disabled in
vprintk_store() before the mutex is acquired. This is obviously a problem.
Luckily struct acpi_device has a parent field already. Use that field to
get the parent instead of relying on acpi_get_parent().
Fixes: 002eb6ad0751 ("printk: track/limit recursion")
Cc: stable@vger.kernel.org # v5.15 and up
Depends-on: ("ACPI: Make acpi_fwnode_handle safer")
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
drivers/acpi/property.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c
index e312ebaed8db4..7403ee2816eb8 100644
--- a/drivers/acpi/property.c
+++ b/drivers/acpi/property.c
@@ -1089,16 +1089,12 @@ struct fwnode_handle *acpi_node_get_parent(const struct fwnode_handle *fwnode)
if (is_acpi_data_node(fwnode)) {
/* All data nodes have parent pointer so just return that */
return to_acpi_data_node(fwnode)->parent;
- } else if (is_acpi_device_node(fwnode)) {
- acpi_handle handle, parent_handle;
+ }
- handle = to_acpi_device_node(fwnode)->handle;
- if (ACPI_SUCCESS(acpi_get_parent(handle, &parent_handle))) {
- struct acpi_device *adev;
+ if (is_acpi_device_node(fwnode)) {
+ struct acpi_device *device = to_acpi_device_node(fwnode);
- if (!acpi_bus_get_device(parent_handle, &adev))
- return acpi_fwnode_handle(adev);
- }
+ return acpi_fwnode_handle(device->parent);
}
return NULL;
--
2.30.2
next prev parent reply other threads:[~2021-11-03 13:33 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-03 13:34 [PATCH 0/3] Get device's parent from parent field, fix sleeping IRQs disabled Sakari Ailus
2021-11-03 13:34 ` [PATCH 1/3] ACPI: Make acpi_fwnode_handle safer Sakari Ailus
2021-11-03 16:58 ` Andy Shevchenko
2021-11-03 17:55 ` Rafael J. Wysocki
2021-11-04 12:48 ` Sakari Ailus
2021-11-04 13:16 ` Sakari Ailus
2021-11-03 13:34 ` Sakari Ailus [this message]
2021-11-03 17:01 ` [PATCH 2/3] ACPI: Get acpi_device's parent from the parent field Andy Shevchenko
2021-11-03 17:48 ` Rafael J. Wysocki
2021-11-04 12:52 ` Sakari Ailus
2021-11-03 13:34 ` [PATCH 3/3] ACPI: Make acpi_node_get_parent() local Sakari Ailus
2021-11-03 17:02 ` Andy Shevchenko
2021-11-04 13:09 ` Sakari Ailus
2021-11-03 14:44 ` [PATCH 0/3] Get device's parent from parent field, fix sleeping IRQs disabled John Ogness
2021-11-03 15:47 ` Petr Mladek
2021-11-03 17:07 ` Andy Shevchenko
2021-11-04 12:45 ` Sakari Ailus
2021-11-03 15:49 ` Petr Mladek
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=20211103133406.659542-3-sakari.ailus@linux.intel.com \
--to=sakari.ailus@linux.intel.com \
--cc=john.ogness@linutronix.de \
--cc=linux-acpi@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=rafael@kernel.org \
/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