From: Kartik Rajput <kkartik@nvidia.com>
To: <lenb@kernel.org>, <sakari.ailus@linux.intel.com>,
<mika.westerberg@linux.intel.com>,
<andriy.shevchenko@linux.intel.com>, <thierry.reding@gmail.com>,
<jonathanh@nvidia.com>, <linux-acpi@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Cc: Kartik Rajput <kkartik@nvidia.com>
Subject: [PATCH v3] ACPI: bus: Use OF match data for PRP0001 matched devices
Date: Fri, 9 Jan 2026 15:23:58 +0530 [thread overview]
Message-ID: <20260109095358.24265-1-kkartik@nvidia.com> (raw)
During pre-production development, drivers may provide both ACPI and OF
match tables while a formal ACPI HID for the device is not yet
allocated. Such devices are enumerated via PRP0001. In this case,
acpi_device_get_match_data() consults only the driver’s ACPI match table
and returns NULL, even though the device was successfully matched via
PRP0001.
This behavior also risks breaking existing PRP0001 setups if a driver
later gains an ACPI HID, as the presence of an ACPI match table changes
the match-data lookup path.
Explicitly detect PRP0001 and fetch match data from the driver's
OF match table via acpi_of_device_get_match_data().
Signed-off-by: Kartik Rajput <kkartik@nvidia.com>
---
Changes in v3:
* Swap arguments while comparing HID against PRP0001.
* Check value of adev against NULL.
* Declare variables in reversed xmas tree order.
* Update commit message.
Changes in v2:
* Fix build errors.
---
drivers/acpi/bus.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 5e110badac7b..e960df2fcea7 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -1030,9 +1030,13 @@ static const void *acpi_of_device_get_match_data(const struct device *dev)
const void *acpi_device_get_match_data(const struct device *dev)
{
const struct acpi_device_id *acpi_ids = dev->driver->acpi_match_table;
+ struct acpi_device *adev = ACPI_COMPANION(dev);
const struct acpi_device_id *match;
- if (!acpi_ids)
+ if (!adev)
+ return NULL;
+
+ if (!strcmp(acpi_device_hid(adev), ACPI_DT_NAMESPACE_HID))
return acpi_of_device_get_match_data(dev);
match = acpi_match_device(acpi_ids, dev);
--
2.43.0
next reply other threads:[~2026-01-09 9:54 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-09 9:53 Kartik Rajput [this message]
2026-01-09 10:13 ` [PATCH v3] ACPI: bus: Use OF match data for PRP0001 matched devices Mika Westerberg
2026-01-09 11:05 ` Andy Shevchenko
2026-01-09 11:29 ` Sakari Ailus
2026-01-09 17:02 ` Andy Shevchenko
2026-01-09 21:11 ` Rafael J. Wysocki
2026-01-11 22:01 ` Sakari Ailus
2026-01-12 8:42 ` Kartik Rajput
2026-01-12 8:55 ` Andy Shevchenko
2026-01-12 9:11 ` Sakari Ailus
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=20260109095358.24265-1-kkartik@nvidia.com \
--to=kkartik@nvidia.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=jonathanh@nvidia.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=sakari.ailus@linux.intel.com \
--cc=thierry.reding@gmail.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