[RHEL8.4 bz1886943] acpi-cpufreq: Honor _PSD table setting on new AMD CPUs

* [RHEL8.4 bz1886943] acpi-cpufreq: Honor _PSD table setting on new AMD CPUs
@ 2020-12-17 21:01 Terry Bowman
  2020-12-18  0:02 ` Prarit Bhargava
  2020-12-20  2:55 ` kernel-ci-list
  0 siblings, 2 replies; 3+ messages in thread
From: Terry Bowman @ 2020-12-17 21:01 UTC (permalink / raw)
  To: ahs3, lszubowi, prarit, darcari, WeHuang
  Cc: rhkernel-list, Wei Huang, 3 . 10+, Rafael J . Wysocki, Terry Bowman

Bugzilla: http://bugzilla.redhat.com/1886943
Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=33761621
Upstream: 5.10-rc, https://lkml.org/lkml/2020/10/19/488
Test: Manual testing looking for PSD override in dmesg.
Using amd-daytona-01.khw1.lab.eng.bos.redhat.com, EPYC Milan

commit 5368512abe08 ("acpi-cpufreq: Honor _PSD table setting on new AMD CPUs")
Author: Wei Huang <wei.huang2@amd.com>
Date:   Sun Oct 18 22:57:41 2020 -0500

    acpi-cpufreq: Honor _PSD table setting on new AMD CPUs

    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")
Signed-off-by: Wei Huang <wei.huang2@amd.com>
[ rjw: Subject edit ]
Cc: 3.10+ <stable@vger.kernel.org> # 3.10+
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
[ tb: reformat for checkpatch ]
Signed-off-by: Terry Bowman <tbowman@redhat.com>

Cc: Al Stone <ahs3@redhat.com> 
Cc: Lenny Szubowicz <lszubowi@redhat.com> 
Cc: Prarit Bhargava <prarit@redhat.com> 
Cc: David Arcari <darcari@redhat.com> 
---
 drivers/cpufreq/acpi-cpufreq.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
index 2705b4c86a83..3a4efb282807 100644
--- a/drivers/cpufreq/acpi-cpufreq.c
+++ b/drivers/cpufreq/acpi-cpufreq.c
@@ -686,7 +686,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,
-- 
2.27.0


^ permalink raw reply related	[flat|nested] 3+ messages in thread