p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

x86, sched: Move check for CPU type to caller function 

Improve readability of the function intel_set_max_freq_ratio() by moving
the check for KNL CPUs there, together with checks for GLM and SKX.

Signed-off-by: Giovanni Gherdovich <ggherdovich@suse.cz>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://lkml.kernel.org/r/20200416054745.740-5-ggherdovich@suse.cz
This commit is contained in:
Giovanni Gherdovich 2020-04-16 07:47:45 +02:00 committed by Peter Zijlstra
parent b56e7d45e8
commit db441bd9f6
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/kernel/smpboot.c
View File

@ -1877,9 +1877,6 @@ static bool knl_set_max_freq_ratio(u64 *base_freq, u64 *turbo_freq,
int err, i; int err, i;
u64 msr; u64 msr;
if (!x86_match_cpu(has_knl_turbo_ratio_limits))
return false;
err = rdmsrl_safe(MSR_PLATFORM_INFO, base_freq); err = rdmsrl_safe(MSR_PLATFORM_INFO, base_freq);
if (err) if (err)
return false; return false;
@ -1977,7 +1974,8 @@ static bool intel_set_max_freq_ratio(void)
skx_set_max_freq_ratio(&base_freq, &turbo_freq, 1)) skx_set_max_freq_ratio(&base_freq, &turbo_freq, 1))
goto out; goto out;
if (knl_set_max_freq_ratio(&base_freq, &turbo_freq, 1)) if (x86_match_cpu(has_knl_turbo_ratio_limits) &&
knl_set_max_freq_ratio(&base_freq, &turbo_freq, 1))
goto out; goto out;
if (x86_match_cpu(has_skx_turbo_ratio_limits) && if (x86_match_cpu(has_skx_turbo_ratio_limits) &&