Commit 3743d55b authored by Huang Rui's avatar Huang Rui Committed by Ingo Molnar

x86, sched: Fix the AMD CPPC maximum performance value on certain AMD Ryzen generations

Some AMD Ryzen generations has different calculation method on maximum
performance. 255 is not for all ASICs, some specific generations should use 166
as the maximum performance. Otherwise, it will report incorrect frequency value
like below:

  ~ → lscpu | grep MHz
  CPU MHz:                         3400.000
  CPU max MHz:                     7228.3198
  CPU min MHz:                     2200.0000

[ mingo: Tidied up whitespace use. ]
[ Alexander Monakov <amonakov@ispras.ru>: fix 225 -> 255 typo. ]

Fixes: 41ea6672 ("x86, sched: Calculate frequency invariance for AMD systems")
Fixes: 3c55e94c ("cpufreq: ACPI: Extend frequency tables to cover boost frequencies")
Reported-by: default avatarJason Bagavatsingham <jason.bagavatsingham@gmail.com>
Fixed-by: default avatarAlexander Monakov <amonakov@ispras.ru>
Reviewed-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Tested-by: default avatarJason Bagavatsingham <jason.bagavatsingham@gmail.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20210425073451.2557394-1-ray.huang@amd.com
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=211791Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 02dbb724
...@@ -787,8 +787,10 @@ DECLARE_PER_CPU(u64, msr_misc_features_shadow); ...@@ -787,8 +787,10 @@ DECLARE_PER_CPU(u64, msr_misc_features_shadow);
#ifdef CONFIG_CPU_SUP_AMD #ifdef CONFIG_CPU_SUP_AMD
extern u32 amd_get_nodes_per_socket(void); extern u32 amd_get_nodes_per_socket(void);
extern u32 amd_get_highest_perf(void);
#else #else
static inline u32 amd_get_nodes_per_socket(void) { return 0; } static inline u32 amd_get_nodes_per_socket(void) { return 0; }
static inline u32 amd_get_highest_perf(void) { return 0; }
#endif #endif
static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves) static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves)
......
...@@ -1165,3 +1165,19 @@ void set_dr_addr_mask(unsigned long mask, int dr) ...@@ -1165,3 +1165,19 @@ void set_dr_addr_mask(unsigned long mask, int dr)
break; break;
} }
} }
u32 amd_get_highest_perf(void)
{
struct cpuinfo_x86 *c = &boot_cpu_data;
if (c->x86 == 0x17 && ((c->x86_model >= 0x30 && c->x86_model < 0x40) ||
(c->x86_model >= 0x70 && c->x86_model < 0x80)))
return 166;
if (c->x86 == 0x19 && ((c->x86_model >= 0x20 && c->x86_model < 0x30) ||
(c->x86_model >= 0x40 && c->x86_model < 0x70)))
return 166;
return 255;
}
EXPORT_SYMBOL_GPL(amd_get_highest_perf);
...@@ -2043,7 +2043,7 @@ static bool amd_set_max_freq_ratio(void) ...@@ -2043,7 +2043,7 @@ static bool amd_set_max_freq_ratio(void)
return false; return false;
} }
highest_perf = perf_caps.highest_perf; highest_perf = amd_get_highest_perf();
nominal_perf = perf_caps.nominal_perf; nominal_perf = perf_caps.nominal_perf;
if (!highest_perf || !nominal_perf) { if (!highest_perf || !nominal_perf) {
......
...@@ -646,7 +646,11 @@ static u64 get_max_boost_ratio(unsigned int cpu) ...@@ -646,7 +646,11 @@ static u64 get_max_boost_ratio(unsigned int cpu)
return 0; return 0;
} }
highest_perf = perf_caps.highest_perf; if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
highest_perf = amd_get_highest_perf();
else
highest_perf = perf_caps.highest_perf;
nominal_perf = perf_caps.nominal_perf; nominal_perf = perf_caps.nominal_perf;
if (!highest_perf || !nominal_perf) { if (!highest_perf || !nominal_perf) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment