From: "tip-bot2 for Giovanni Gherdovich" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Giovanni Gherdovich <ggherdovich@suse.cz>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
x86 <x86@kernel.org>, LKML <linux-kernel@vger.kernel.org>
Subject: [tip: sched/urgent] x86, sched: Move check for CPU type to caller function
Date: Wed, 22 Apr 2020 21:20:47 -0000 [thread overview]
Message-ID: <158759044762.28353.12681151703116026868.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20200416054745.740-5-ggherdovich@suse.cz>
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: db441bd9f630329c402d5cdd319f11bfcf509fb6
Gitweb: https://git.kernel.org/tip/db441bd9f630329c402d5cdd319f11bfcf509fb6
Author: Giovanni Gherdovich <ggherdovich@suse.cz>
AuthorDate: Thu, 16 Apr 2020 07:47:45 +02:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Wed, 22 Apr 2020 23:10:13 +02:00
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
---
arch/x86/kernel/smpboot.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index dd8e15f..8c89e4d 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1877,9 +1877,6 @@ static bool knl_set_max_freq_ratio(u64 *base_freq, u64 *turbo_freq,
int err, i;
u64 msr;
- if (!x86_match_cpu(has_knl_turbo_ratio_limits))
- return false;
-
err = rdmsrl_safe(MSR_PLATFORM_INFO, base_freq);
if (err)
return false;
@@ -1977,7 +1974,8 @@ static bool intel_set_max_freq_ratio(void)
skx_set_max_freq_ratio(&base_freq, &turbo_freq, 1))
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;
if (x86_match_cpu(has_skx_turbo_ratio_limits) &&
next prev parent reply other threads:[~2020-04-22 21:21 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-16 5:47 [PATCH 0/4] Frequency invariance fixes for x86 Giovanni Gherdovich
2020-04-16 5:47 ` [PATCH 1/4] x86, sched: Bail out of frequency invariance if base frequency is unknown Giovanni Gherdovich
2020-04-16 6:41 ` Giovanni Gherdovich
2020-04-16 15:41 ` Rafael J. Wysocki
2020-04-22 17:15 ` Ricardo Neri
2020-04-23 8:06 ` Giovanni Gherdovich
2020-04-24 1:32 ` Ricardo Neri
2020-04-24 5:53 ` Giovanni Gherdovich
2020-04-22 21:20 ` [tip: sched/urgent] " tip-bot2 for Giovanni Gherdovich
2020-04-16 5:47 ` [PATCH 2/4] x86, sched: Account for CPUs with less than 4 cores in freq. invariance Giovanni Gherdovich
2020-04-16 15:26 ` Dave Kleikamp
2020-04-22 21:20 ` [tip: sched/urgent] " tip-bot2 for Giovanni Gherdovich
2020-04-16 5:47 ` [PATCH 3/4] x86, sched: Don't enable static key when starting secondary CPUs Giovanni Gherdovich
2020-04-22 21:20 ` [tip: sched/urgent] " tip-bot2 for Peter Zijlstra (Intel)
2020-04-16 5:47 ` [PATCH 4/4] x86, sched: Move check for CPU type to caller function Giovanni Gherdovich
2020-04-22 21:20 ` tip-bot2 for Giovanni Gherdovich [this message]
2020-04-16 7:20 ` [PATCH 0/4] Frequency invariance fixes for x86 Peter Zijlstra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=158759044762.28353.12681151703116026868.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=ggherdovich@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=rafael.j.wysocki@intel.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).