UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ACPI / scan: Initialize status to ACPI_STA_DEFAULT 

Since commit 63347db0af "ACPI / scan: Use acpi_bus_get_status() to
initialize ACPI_TYPE_DEVICE devs" the status field of normal acpi_devices
gets set to 0 by acpi_bus_type_and_status() and filled with its actual
value later when acpi_add_single_object() calls acpi_bus_get_status().

This means that any acpi_match_device_ids() calls in between will always
fail with -ENOENT.

We already have a workaround for this, which temporary forces status to
ACPI_STA_DEFAULT in drivers/acpi/x86/utils.c: acpi_device_always_present()
and the next commit in this series adds another acpi_match_device_ids()
call between status being initialized as 0 and the acpi_bus_get_status()
call.

Rather then adding another workaround, this commit makes
acpi_bus_type_and_status() initialize status to ACPI_STA_DEFAULT, this is
safe to do as the only code looking at status between the initialization
and the acpi_bus_get_status() call is those acpi_match_device_ids() calls.

Note this does mean that we need to (re)set status to 0 in case the
acpi_bus_get_status() call fails.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Hans de Goede 2018-08-08 10:30:03 +02:00 committed by Rafael J. Wysocki
parent a6f0729508
commit 5971b0c159
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/acpi/scan.c
View File

@ -1612,7 +1612,8 @@ static int acpi_add_single_object(struct acpi_device **child,
* Note this must be done before the get power-/wakeup_dev-flags calls. * Note this must be done before the get power-/wakeup_dev-flags calls.
*/ */
if (type == ACPI_BUS_TYPE_DEVICE) if (type == ACPI_BUS_TYPE_DEVICE)
acpi_bus_get_status(device); if (acpi_bus_get_status(device) < 0)
acpi_set_device_status(device, 0);
acpi_bus_get_power_flags(device); acpi_bus_get_power_flags(device);
acpi_bus_get_wakeup_device_flags(device); acpi_bus_get_wakeup_device_flags(device);
@ -1690,7 +1691,7 @@ static int acpi_bus_type_and_status(acpi_handle handle, int *type,
* acpi_add_single_object updates this once we've an acpi_device * acpi_add_single_object updates this once we've an acpi_device
* so that acpi_bus_get_status' quirk handling can be used. * so that acpi_bus_get_status' quirk handling can be used.
*/ */
*sta = 0; *sta = ACPI_STA_DEFAULT;
break; break;
case ACPI_TYPE_PROCESSOR: case ACPI_TYPE_PROCESSOR:
*type = ACPI_BUS_TYPE_PROCESSOR; *type = ACPI_BUS_TYPE_PROCESSOR;