V2: Added a check to the power state, make sure it's valid before executing the _PSx control method. V1: Per the acpi spec, for OSPM to put the device in the Dx device state, the following must occur: 1. All Power Resources referenced by elements 1 through N must be in the ON state. 2. All Power Resources no longer referenced by any device in the system must be in the OFF state. 3. If present, the _PSx control method is executed to set the device into the Dx device state. This patch adds support for the execution of _PSx control method during device power init phase. This could also solves the problem I encountered, please see: http://marc.info/?l=linux-acpi&m=130579961021505&w=2 --- drivers/acpi/bus.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 9749980..ea4eb64 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -337,8 +337,22 @@ int acpi_bus_init_power(struct acpi_device *device) if (result) return result; - if (device->power.flags.power_resources) + if (device->power.flags.power_resources) { result = acpi_power_on_resources(device, state); + if (result) + return result; + } + + /* if state is valid and _PSx exists, execute it */ + if (state >= ACPI_STATE_D0 && state <= ACPI_STATE_D3 && + device->power.states[state].flags.explicit_set) { + acpi_status status; + char object_name[5] = { '_', 'P', 'S', '0' + state, '\0' }; + status = acpi_evaluate_object(device->handle, object_name, + NULL, NULL); + if (ACPI_FAILURE(status)) + result = -ENODEV; + } if (!result) device->power.state = state; -- 1.7.4.4 -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
