Commit 23ccee22 authored by Giovanni Gherdovich's avatar Giovanni Gherdovich Committed by Peter Zijlstra

x86, sched: Account for CPUs with less than 4 cores in freq. invariance

If a CPU has less than 4 physical cores, MSR_TURBO_RATIO_LIMIT will
rightfully report that the 4C turbo ratio is zero. In such cases, use the
1C turbo ratio instead for frequency invariance calculations.

Fixes: 1567c3e3 ("x86, sched: Add support for frequency invariance")
Reported-by: default avatarLike Xu <like.xu@linux.intel.com>
Reported-by: default avatarNeil Rickert <nwr10cst-oslnx@yahoo.com>
Signed-off-by: default avatarGiovanni Gherdovich <ggherdovich@suse.cz>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tested-by: default avatarDave Kleikamp <dave.kleikamp@oracle.com>
Link: https://lkml.kernel.org/r/20200416054745.740-3-ggherdovich@suse.cz
parent 9a6c2c3c
...@@ -1945,18 +1945,23 @@ static bool skx_set_max_freq_ratio(u64 *base_freq, u64 *turbo_freq, int size) ...@@ -1945,18 +1945,23 @@ static bool skx_set_max_freq_ratio(u64 *base_freq, u64 *turbo_freq, int size)
static bool core_set_max_freq_ratio(u64 *base_freq, u64 *turbo_freq) static bool core_set_max_freq_ratio(u64 *base_freq, u64 *turbo_freq)
{ {
u64 msr;
int err; int err;
err = rdmsrl_safe(MSR_PLATFORM_INFO, base_freq); err = rdmsrl_safe(MSR_PLATFORM_INFO, base_freq);
if (err) if (err)
return false; return false;
err = rdmsrl_safe(MSR_TURBO_RATIO_LIMIT, turbo_freq); err = rdmsrl_safe(MSR_TURBO_RATIO_LIMIT, &msr);
if (err) if (err)
return false; return false;
*base_freq = (*base_freq >> 8) & 0xFF; /* max P state */ *base_freq = (*base_freq >> 8) & 0xFF; /* max P state */
*turbo_freq = (*turbo_freq >> 24) & 0xFF; /* 4C turbo */ *turbo_freq = (msr >> 24) & 0xFF; /* 4C turbo */
/* The CPU may have less than 4 cores */
if (!*turbo_freq)
*turbo_freq = msr & 0xFF; /* 1C turbo */
return true; return true;
} }
......
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