ACPI: bus: Align acpi_device_get_match_data() with driver match order
PATCH v4 1/1 ACPI: bus: Align acpi_device_get_match_data() with driver match order
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.
Make acpi_device_get_match_data() use the same precedence as driver matching by using __acpi_match_device(). Return match data from the acpi_id or of_id that was actually matched.
Remove now-unused acpi_of_device_get_match_data().
---
Changes in v4:
* Use __acpi_match_device to get the match data.
* Remove now unused function acpi_of_device_get_match_data().
* Update commit message.
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 | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-)
drivers/acpi/bus.c +12 -18
@@ -1016,30 +1016,24 @@ const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids, }EXPORT_SYMBOL_GPL (acpi_match_device); -static const void *acpi_of_device_get_match_data (const struct device *dev) -{ -struct acpi_device *adev =ACPI_COMPANION (dev); -const struct of_device_id *match =NULL ; - -if (!acpi_of_match_device (adev, dev->driver->of_match_table, &match)) -return NULL ; - -return match->data; -} -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; +const struct of_device_id *of_ids = dev->driver->of_match_table; +const struct acpi_device *adev =acpi_companion_match (dev); +const struct acpi_device_id *acpi_id =NULL ; +const struct of_device_id *of_id =NULL ; -if (!acpi_ids) -return acpi_of_device_get_match_data (dev); - - match =acpi_match_device (acpi_ids, dev); -if (!match) +if (!__acpi_match_device (adev, acpi_ids, of_ids, &acpi_id, &of_id))return NULL ; -return (const void *)match->driver_data; +if (acpi_id) +return (const void *)acpi_id->driver_data; + +if (of_id) +return of_id->data; + +return NULL ; }EXPORT_SYMBOL_GPL (acpi_device_get_match_data);
Signature · 1 line
2.43.0
Quoted 11 lines · Kartik Rajput
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.
Quoted 5 lines
Make
acpi_device_get_match_data()use the same precedence as driver matching by using__acpi_match_device(). Return match data from theacpi_idorof_idthat was actually matched.Remove now-unused
acpi_of_device_get_match_data().
LGTM,
Signature · 2 lines
With Best Regards, Andy Shevchenko
Hi Kartik,
Quoted 11 lines · Kartik Rajput
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.
Quoted 7 lines
Make
acpi_device_get_match_data()use the same precedence as driver matching by using__acpi_match_device(). Return match data from theacpi_idorof_idthat was actually matched.Remove now-unused
acpi_of_device_get_match_data().Signed-off-by Kartik Rajput <[email protected]>
Thank you for the update, this looks really nice now.
Signature · 1 line
Sakari Ailus
Quoted 19 lines · Sakari Ailus
Hi Kartik,
Quoted 15 lines · Kartik Rajput
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.
Make
acpi_device_get_match_data()use the same precedence as driver matching by using__acpi_match_device(). Return match data from theacpi_idorof_idthat was actually matched.
Quoted 7 lines
Quoted 3 lines
Remove now-unused
acpi_of_device_get_match_data().Signed-off-by Kartik Rajput <[email protected]>Thank you for the update, this looks really nice now.
Reviewed-by Sakari Ailus <[email protected]>
Applied as 6.20 material, thanks!