nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

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

Browse source 
Revert commit 4b9ee772ea ("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>
This commit is contained in:
Rafael J. Wysocki 2021-04-30 15:32:22 +02:00
parent 7e4fdeafa6
commit 5db91e9cb5
4 changed files with 2 additions and 4 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/acpi/internal.h
View file

@ -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_get_inferred_state(struct acpi_device *device, int *state);
int acpi_power_on_resources(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); int acpi_power_transition(struct acpi_device *device, int state);
void acpi_turn_off_unused_power_resources(void);
/* -------------------------------------------------------------------------- /* --------------------------------------------------------------------------
Device Power Management Device Power Management

2
drivers/acpi/power.c
View file

@ -996,7 +996,6 @@ void acpi_resume_power_resources(void)
mutex_unlock(&power_resource_list_lock); mutex_unlock(&power_resource_list_lock);
} }
#endif
void acpi_turn_off_unused_power_resources(void) 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); mutex_unlock(&power_resource_list_lock);
} }
#endif

2
drivers/acpi/scan.c
View file

@ -2360,8 +2360,6 @@ int __init acpi_scan_init(void)
} }
} }
acpi_turn_off_unused_power_resources();
acpi_scan_initialized = true; acpi_scan_initialized = true;
out: out:

1
drivers/acpi/sleep.h
View file

@ -8,6 +8,7 @@ extern struct list_head acpi_wakeup_device_list;
extern struct mutex acpi_device_lock; extern struct mutex acpi_device_lock;
extern void acpi_resume_power_resources(void); 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) static inline acpi_status acpi_set_waking_vector(u32 wakeup_address)
{ {