ACPI: scan: Avoid enumerating devices with clearly invalid _STA values
PATCH v2 1/1 ACPI: scan: Avoid enumerating devices with clearly invalid _STA values
From: Rafael J. Wysocki <[email protected]>
The return value of _STA with the "present" bit unset and the "enabled" bit set is clearly invalid as per the ACPI specification, Section 6.3.7 "_STA (Device Status)", so make the ACPI device enumeration code disregard devices with such _STA return values.
Also, because this implies that status.enabled will only be set if status.present is set too, acpi_device_is_enabled() can be modified to simply return the value of the former.
---
v1 -> v2:
* Fix a confusing comment.
* Add R-by from Jonathan (thank you!)
--- drivers/acpi/bus.c | 11 +++++++++++ drivers/acpi/scan.c | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-)
drivers/acpi/bus.c +11 -0
@@ -112,6 +112,17 @@ int acpi_bus_get_status(struct acpi_deviif (ACPI_FAILURE (status))return -ENODEV ; +if (!device->status.present && device->status.enabled) { +pr_info (FW_BUG "Device [%s] status [%08x]: not present and enabled\n" , + device->pnp.bus_id, (u32 )sta); + device->status.enabled =0 ; +/* +* The status is clearly invalid, so clear the functional bit as +* well to avoid attempting to use the device. +*/ + device->status.functional =0 ; + } +acpi_set_device_status (device, sta);if (device->status.functional && !device->status.present) {
drivers/acpi/scan.c +1 -1
@@ -1962,7 +1962,7 @@ bool acpi_device_is_present(const structbool acpi_device_is_enabled (const struct acpi_device *adev) { -return adev->status.present && adev->status.enabled; +return adev->status.enabled; } static bool acpi_scan_handler_matching(struct acpi_scan_handler *handler,
Quoted 11 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
The return value of
_STAwith the "present" bit unset and the "enabled" bit set is clearly invalid as per the ACPI specification, Section 6.3.7 "_STA(Device Status)", so make the ACPI device enumeration code disregard devices with such_STAreturn values.Also, because this implies that status.enabled will only be set if status.present is set too,
acpi_device_is_enabled()can be modified to simply return the value of the former.
Nice!
FWIW,
--
Regards,
Sudeep
Quoted 11 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
The return value of
_STAwith the "present" bit unset and the "enabled" bit set is clearly invalid as per the ACPI specification, Section 6.3.7 "_STA(Device Status)", so make the ACPI device enumeration code disregard devices with such_STAreturn values.Also, because this implies that status.enabled will only be set if status.present is set too,
acpi_device_is_enabled()can be modified to simply return the value of the former.
Quoted 6 lines
Suggested-by Salil Mehta <[email protected]>Signed-off-by Rafael J. Wysocki <[email protected]>Reviewed-by Jonathan Cameron <[email protected]>---
Quoted 15 lines
v1 -> v2:
* Fix a confusing comment.
* Add R-by from Jonathan (thank you!)--- drivers/acpi/bus.c | 11 +++++++++++ drivers/acpi/scan.c | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-)Index:
linux-pm/drivers/acpi/bus.c
===================================================================
drivers/acpi/bus.c int acpi_bus_get_status(struct acpi_devi · line 117
Quoted 6 lines
drivers/acpi/bus.c +3
-0@@ -112,6 +112,17 @@ int acpi_bus_get_status(struct acpi_deviif (ACPI_FAILURE (status))return -ENODEV ; +if (!device->status.present && device->status.enabled) { +pr_info (FW_BUG "Device [%s] status [%08x]: not present and enabled\n" , + device->pnp.bus_id, (u32 )sta);
Nit: Do you think it should be pr_warn ?
Quoted 28 lines
drivers/acpi/bus.c +8
-0+ device->status.enabled =0 ; +/* +* The status is clearly invalid, so clear the functional bit as +* well to avoid attempting to use the device. +*/ + device->status.functional =0 ; + } +acpi_set_device_status (device, sta);if (device->status.functional && !device->status.present) {Index:
linux-pm/drivers/acpi/scan.c
===================================================================drivers/acpi/scan.c +1
-1@@ -1962,7 +1962,7 @@ bool acpi_device_is_present(const structbool acpi_device_is_enabled (const struct acpi_device *adev) { -return adev->status.present && adev->status.enabled; +return adev->status.enabled; } static bool acpi_scan_handler_matching(struct acpi_scan_handler *handler,
Signature · 2 lines
Sathyanarayanan Kuppuswamy Linux Kernel Developer