[RFC,1/3] ACPI/Power: Add state_lock to mutex power resource's _ON, _OFF and _STA

Commit Message

lan,Tianyu Oct. 15, 2013, 3:04 p.m. UTC

According commit d0515d9f, power resource's _ON, _OFF and _STA should
be mutexed. This patch is to add state_lock to do this instead of
using resource_lock.

Signed-off-by: Lan Tianyu <[e-mail]>
---
 drivers/acpi/power.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

Patch

diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 0c1c3ec..fa89d16 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -75,6 +75,7 @@  struct acpi_power_resource {
 	unsigned int ref_count;
 	bool wakeup_enabled;
 	struct mutex resource_lock;
+	struct mutex state_lock;
 };
 
 struct acpi_power_resource_entry {
@@ -216,9 +217,9 @@  static int acpi_power_get_list_state(struct list_head *list, int *state)
 		acpi_handle handle = resource->device.handle;
 		int result;
 
-		mutex_lock(&resource->resource_lock);
+		mutex_lock(&resource->state_lock);
 		result = acpi_power_get_state(handle, &cur_state);
-		mutex_unlock(&resource->resource_lock);
+		mutex_unlock(&resource->state_lock);
 		if (result)
 			return result;
 
@@ -263,7 +264,10 @@  static int __acpi_power_on(struct acpi_power_resource *resource)
 {
 	acpi_status status = AE_OK;
 
+	mutex_lock(&resource->state_lock);
 	status = acpi_evaluate_object(resource->device.handle, "_ON", NULL, NULL);
+	mutex_unlock(&resource->state_lock);
+
 	if (ACPI_FAILURE(status))
 		return -ENODEV;
 
@@ -309,8 +313,11 @@  static int __acpi_power_off(struct acpi_power_resource *resource)
 {
 	acpi_status status;
 
+	mutex_lock(&resource->state_lock);
 	status = acpi_evaluate_object(resource->device.handle, "_OFF",
 				      NULL, NULL);
+	mutex_unlock(&resource->state_lock);
+
 	if (ACPI_FAILURE(status))
 		return -ENODEV;
 
@@ -564,7 +571,9 @@  int acpi_power_wakeup_list_init(struct list_head *list, int *system_level_p)
 
 		mutex_lock(&resource->resource_lock);
 
+		mutex_lock(&resource->state_lock);
 		result = acpi_power_get_state(handle, &state);
+		mutex_unlock(&resource->state_lock);
 		if (result) {
 			mutex_unlock(&resource->resource_lock);
 			return result;
@@ -881,6 +890,7 @@  int acpi_add_power_resource(acpi_handle handle)
 	device = &resource->device;
 	acpi_init_device_object(device, handle, ACPI_BUS_TYPE_POWER,
 				ACPI_STA_DEFAULT);
+	mutex_init(&resource->state_lock);
 	mutex_init(&resource->resource_lock);
 	INIT_LIST_HEAD(&resource->dependent);
 	INIT_LIST_HEAD(&resource->list_node);
@@ -935,7 +945,10 @@  void acpi_resume_power_resources(void)
 
 		mutex_lock(&resource->resource_lock);
 
+		mutex_lock(&resource->state_lock);
 		result = acpi_power_get_state(resource->device.handle, &state);
+		mutex_unlock(&resource->state_lock);
+
 		if (result) {
 			mutex_unlock(&resource->resource_lock);
 			continue;