Skip to content

Commit ca8ee55

Browse files
committed
Merge branches 'acpi-pm' and 'acpi-cppc'
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
3 parents a8c9753 + cd7ef20 + 56eb0c0 commit ca8ee55

2 files changed

Lines changed: 15 additions & 2 deletions

File tree

drivers/acpi/cppc_acpi.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ static int send_pcc_cmd(int pcc_ss_id, u16 cmd)
362362
end:
363363
if (cmd == CMD_WRITE) {
364364
if (unlikely(ret)) {
365-
for_each_possible_cpu(i) {
365+
for_each_online_cpu(i) {
366366
struct cpc_desc *desc = per_cpu(cpc_desc_ptr, i);
367367

368368
if (!desc)
@@ -524,7 +524,7 @@ int acpi_get_psd_map(unsigned int cpu, struct cppc_cpudata *cpu_data)
524524
else if (pdomain->coord_type == DOMAIN_COORD_TYPE_SW_ANY)
525525
cpu_data->shared_type = CPUFREQ_SHARED_TYPE_ANY;
526526

527-
for_each_possible_cpu(i) {
527+
for_each_online_cpu(i) {
528528
if (i == cpu)
529529
continue;
530530

drivers/acpi/power.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1113,6 +1113,19 @@ static const struct dmi_system_id dmi_leave_unused_power_resources_on[] = {
11131113
DMI_MATCH(DMI_PRODUCT_NAME, "SATELLITE Click Mini L9W-B"),
11141114
},
11151115
},
1116+
{
1117+
/*
1118+
* THUNDEROBOT ZERO laptop: Due to its SSDT table bug, power
1119+
* resource 'PXP' will be shut down on initialization, making
1120+
* the NVMe #2 and the NVIDIA dGPU both unavailable (they're
1121+
* both controlled by 'PXP').
1122+
*/
1123+
.matches = {
1124+
DMI_MATCH(DMI_SYS_VENDOR, "THUNDEROBOT"),
1125+
DMI_MATCH(DMI_PRODUCT_NAME, "ZERO"),
1126+
}
1127+
1128+
},
11161129
{}
11171130
};
11181131

0 commit comments

Comments
 (0)