Skip to contentSkip to conversation

acpi-cpufreq: Honor _PSD table setting in CPU frequency control

PATCH Applied Wei Huang 2 participants 2 messages Oct 19, 2020 CPU frequency scaling framework

lore
Share & tools
lore

Wei Huang

author
#0 lore raw

PATCH v2 1/1 acpi-cpufreq: Honor _PSD table setting in CPU frequency control

acpi-cpufreq has a old quirk that overrides the _PSD table supplied by BIOS on AMD CPUs. However the _PSD table of new AMD CPUs (Family 19h+) now accurately reports the P-state dependency of CPU cores. Hence this quirk needs to be fixed in order to support new CPUs' frequency control.

Fixes acd316248205 ("acpi-cpufreq: Add quirk to disable _PSD usage on all AMD CPUs")
---
 drivers/cpufreq/acpi-cpufreq.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/cpufreq/acpi-cpufreq.c +2 -1
index e4ff681faaaa..1e4fbb002a31 100644
@@ -691,7 +691,8 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
 		cpumask_copy(policy->cpus, topology_core_cpumask(cpu));
 	}
 
-	if (check_amd_hwpstate_cpu(cpu) && !acpi_pstate_strict) {
+	if (check_amd_hwpstate_cpu(cpu) && boot_cpu_data.x86 < 0x19 &&
+	    !acpi_pstate_strict) {
 		cpumask_clear(policy->cpus);
 		cpumask_set_cpu(cpu, policy->cpus);
 		cpumask_copy(data->freqdomain_cpus,
Signature · 1 line
2.24.1
maintainer Applied
#1 lore raw
Quoted 17 lines · Wei Huang

acpi-cpufreq has a old quirk that overrides the _PSD table supplied by BIOS on AMD CPUs. However the _PSD table of new AMD CPUs (Family 19h+) now accurately reports the P-state dependency of CPU cores. Hence this quirk needs to be fixed in order to support new CPUs' frequency control.

Fixes acd316248205 ("acpi-cpufreq: Add quirk to disable _PSD usage on all AMD CPUs")
---
 drivers/cpufreq/acpi-cpufreq.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/cpufreq/acpi-cpufreq.c +0 -0
index e4ff681faaaa..1e4fbb002a31 100644

drivers/cpufreq/acpi-cpufreq.c static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)

Quoted 10 lines
drivers/cpufreq/acpi-cpufreq.c +2 -2
@@ -691,7 +691,8 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
                cpumask_copy(policy->cpus, topology_core_cpumask(cpu));
        }
 
-       if (check_amd_hwpstate_cpu(cpu) && !acpi_pstate_strict) {
+       if (check_amd_hwpstate_cpu(cpu) && boot_cpu_data.x86 < 0x19 &&
+           !acpi_pstate_strict) {
                cpumask_clear(policy->cpus);
                cpumask_set_cpu(cpu, policy->cpus);
                cpumask_copy(data->freqdomain_cpus,
--

Applied as 5.10-rc material under edited subject, thanks!