Revert "ACPI: scan: Turn off unused power resources during initialization"

rafaeljw · rafaeljw · commit 5db91e9cb5b3 · 2021-04-30T15:32:22.000+02:00
Revert commit 4b9ee77 ("ACPI: scan: Turn off unused power resources during initialization") that is reported to cause initialization issues to occur. Reported-by: Shujun Wang <wsj20369@163.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
@@ -139,7 +139,6 @@ int acpi_device_sleep_wake(struct acpi_device *dev,
 int acpi_power_get_inferred_state(struct acpi_device *device, int *state);
 int acpi_power_on_resources(struct acpi_device *device, int state);
 int acpi_power_transition(struct acpi_device *device, int state);
-void acpi_turn_off_unused_power_resources(void);
 
 /* --------------------------------------------------------------------------
                               Device Power Management
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
@@ -996,7 +996,6 @@ void acpi_resume_power_resources(void)
 
 	mutex_unlock(&power_resource_list_lock);
 }
-#endif
 
 void acpi_turn_off_unused_power_resources(void)
 {
@@ -1017,3 +1016,4 @@ void acpi_turn_off_unused_power_resources(void)
 
 	mutex_unlock(&power_resource_list_lock);
 }
+#endif
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
@@ -2360,8 +2360,6 @@ int __init acpi_scan_init(void)
 		}
 	}
 
-	acpi_turn_off_unused_power_resources();
-
 	acpi_scan_initialized = true;
 
  out:
diff --git a/drivers/acpi/sleep.h b/drivers/acpi/sleep.h
@@ -8,6 +8,7 @@ extern struct list_head acpi_wakeup_device_list;
 extern struct mutex acpi_device_lock;
 
 extern void acpi_resume_power_resources(void);
+extern void acpi_turn_off_unused_power_resources(void);
 
 static inline acpi_status acpi_set_waking_vector(u32 wakeup_address)
 {

Original file line number	Diff line number	Diff line change
`@@ -996,7 +996,6 @@ void acpi_resume_power_resources(void)`
`996`	`996`
`997`	`997`	`mutex_unlock(&power_resource_list_lock);`
`998`	`998`	`}`
`999`		`-#endif`
`1000`	`999`
`1001`	`1000`	`void acpi_turn_off_unused_power_resources(void)`
`1002`	`1001`	`{`
`@@ -1017,3 +1016,4 @@ void acpi_turn_off_unused_power_resources(void)`
`1017`	`1016`
`1018`	`1017`	`mutex_unlock(&power_resource_list_lock);`
`1019`	`1018`	`}`
	`1019`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -2360,8 +2360,6 @@ int __init acpi_scan_init(void)`
`2360`	`2360`	`}`
`2361`	`2361`	`}`
`2362`	`2362`
`2363`		`- acpi_turn_off_unused_power_resources();`
`2364`		`-`
`2365`	`2363`	`acpi_scan_initialized = true;`
`2366`	`2364`
`2367`	`2365`	`out:`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ extern struct list_head acpi_wakeup_device_list;`
`8`	`8`	`extern struct mutex acpi_device_lock;`
`9`	`9`
`10`	`10`	`extern void acpi_resume_power_resources(void);`
	`11`	`+extern void acpi_turn_off_unused_power_resources(void);`
`11`	`12`
`12`	`13`	`static inline acpi_status acpi_set_waking_vector(u32 wakeup_address)`
`13`	`14`	`{`