archives/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-03-08 03:04:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branches 'acpi-pm' and 'acpi-cppc'

Browse source 
Merge an ACPI power management update and an ACPI CPPC library update
for 7.0-rc1:

 - Add an unused power resource handling quirk for THUNDEROBOT ZERO (Zhai
   Can)

 - Fix remaining for_each_possible_cpu() in the ACPI CPPC library to use
   online CPUs (Sean V Kelley)

* acpi-pm:
  ACPI: PM: Add unused power resource quirk for THUNDEROBOT ZERO

* acpi-cppc:
  ACPI: CPPC: Fix remaining for_each_possible_cpu() to use online CPUs
This commit is contained in:
Rafael J. Wysocki 2026-02-18 20:17:53 +01:00
commit ca8ee553db
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/acpi/cppc_acpi.c
View file

@ -362,7 +362,7 @@ static int send_pcc_cmd(int pcc_ss_id, u16 cmd)
end:
if (cmd == CMD_WRITE) {
if (unlikely(ret)) {
for_each_possible_cpu(i) {
for_each_online_cpu(i) {
struct cpc_desc *desc = per_cpu(cpc_desc_ptr, i);
if (!desc)
@ -524,7 +524,7 @@ int acpi_get_psd_map(unsigned int cpu, struct cppc_cpudata *cpu_data)
else if (pdomain->coord_type == DOMAIN_COORD_TYPE_SW_ANY)
cpu_data->shared_type = CPUFREQ_SHARED_TYPE_ANY;
for_each_possible_cpu(i) {
for_each_online_cpu(i) {
if (i == cpu)
continue;

13
drivers/acpi/power.c
View file

@ -1113,6 +1113,19 @@ static const struct dmi_system_id dmi_leave_unused_power_resources_on[] = {
DMI_MATCH(DMI_PRODUCT_NAME, "SATELLITE Click Mini L9W-B"),
},
},
{
/*
* THUNDEROBOT ZERO laptop: Due to its SSDT table bug, power
* resource 'PXP' will be shut down on initialization, making
* the NVMe #2 and the NVIDIA dGPU both unavailable (they're
* both controlled by 'PXP').
*/
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "THUNDEROBOT"),
DMI_MATCH(DMI_PRODUCT_NAME, "ZERO"),
}
},
{}
};