[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20260107062453.10893-1-kkartik@nvidia.com>
Date: Wed, 7 Jan 2026 11:54:52 +0530
From: Kartik Rajput <kkartik@...dia.com>
To: <lenb@...nel.org>, <sakari.ailus@...ux.intel.com>,
<mika.westerberg@...ux.intel.com>, <andriy.shevchenko@...ux.intel.com>,
<thierry.reding@...il.com>, <jonathanh@...dia.com>,
<linux-acpi@...r.kernel.org>, <linux-kernel@...r.kernel.org>
CC: Kartik Rajput <kkartik@...dia.com>, <stable@...r.kernel.org>
Subject: [PATCH] ACPI: bus: Use OF match data for PRP0001 matched devices
When a device is matched via PRP0001, the driver's OF (DT) match table
must be used to obtain the device match data. If a driver provides both
an acpi_match_table and an of_match_table, the current
acpi_device_get_match_data() path consults the driver's acpi_match_table
and returns NULL (no ACPI ID matches).
Explicitly detect PRP0001 and fetch match data from the driver's
of_match_table via acpi_of_device_get_match_data().
Fixes: 886ca88be6b3 ("ACPI / bus: Respect PRP0001 when retrieving device match data")
Cc: stable@...r.kernel.org
Signed-off-by: Kartik Rajput <kkartik@...dia.com>
---
drivers/acpi/bus.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 5e110badac7b..4cd425fffa97 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -1031,8 +1031,9 @@ const void *acpi_device_get_match_data(const struct device *dev)
{
const struct acpi_device_id *acpi_ids = dev->driver->acpi_match_table;
const struct acpi_device_id *match;
+ struct acpi_device = ACPI_COMPANION(dev);
- if (!acpi_ids)
+ if (!strcmp(ACPI_DT_NAMESPACE_HID, acpi_device_hid(adev))
return acpi_of_device_get_match_data(dev);
match = acpi_match_device(acpi_ids, dev);
--
2.43.0
Powered by blists - more mailing lists