Commit ca8ee553 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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
parents a8c97530 cd7ef20b 56eb0c0e

drivers/acpi/cppc_acpi.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/acpi/power.c

+13 −0
Original line number Diff line number Diff line
@@ -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"),

		}



	},

	{}

};