leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'acpi-pm'

Browse Source 
* acpi-pm:
  ACPI: PM: Add ACPI ID of Alder Lake Fan
  Revert "Revert "ACPI: scan: Turn off unused power resources during initialization""
This commit is contained in:
Rafael J. Wysocki 2021-05-13 20:39:58 +02:00
commit fd38651716
5 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/acpi/device_pm.c
View File

@ -1313,6 +1313,7 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)
{"PNP0C0B", }, /* Generic ACPI fan */ {"PNP0C0B", }, /* Generic ACPI fan */
{"INT3404", }, /* Fan */ {"INT3404", }, /* Fan */
{"INTC1044", }, /* Fan for Tiger Lake generation */ {"INTC1044", }, /* Fan for Tiger Lake generation */
{"INTC1048", }, /* Fan for Alder Lake generation */
{} {}
}; };
struct acpi_device *adev = ACPI_COMPANION(dev); struct acpi_device *adev = ACPI_COMPANION(dev);

1
drivers/acpi/internal.h
View File

@ -142,6 +142,7 @@ 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

@ -995,6 +995,7 @@ 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)
{ {
@ -1015,4 +1016,3 @@ 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,6 +2360,8 @@ 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,7 +8,6 @@ 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)
{ {