From: tip-bot for Kan Liang <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: dsahern@gmail.com, namhyung@kernel.org, mingo@kernel.org,
jolsa@redhat.com, acme@redhat.com, linux-kernel@vger.kernel.org,
eranian@google.com, hpa@zytor.com, vincent.weaver@maine.edu,
peterz@infradead.org, torvalds@linux-foundation.org,
kan.liang@linux.intel.com, alexander.shishkin@linux.intel.com,
tglx@linutronix.de
Subject: [tip:perf/core] perf/x86/intel: Clean up SNB PEBS quirk
Date: Mon, 11 Feb 2019 02:45:15 -0800 [thread overview]
Message-ID: <tip-a96fff8df28ddd2f6710e5af454a45014c73183c@git.kernel.org> (raw)
In-Reply-To: <1549319013-4522-3-git-send-email-kan.liang@linux.intel.com>
Commit-ID: a96fff8df28ddd2f6710e5af454a45014c73183c
Gitweb: https://git.kernel.org/tip/a96fff8df28ddd2f6710e5af454a45014c73183c
Author: Kan Liang <kan.liang@linux.intel.com>
AuthorDate: Mon, 4 Feb 2019 14:23:31 -0800
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 11 Feb 2019 08:00:40 +0100
perf/x86/intel: Clean up SNB PEBS quirk
Clean up SNB PEBS quirk to use the new facility to check for min
microcode revisions.
Only check the boot CPU, assuming models and features are consistent
over all CPUs.
Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Cc: bp@alien8.de
Link: https://lkml.kernel.org/r/1549319013-4522-3-git-send-email-kan.liang@linux.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/events/intel/core.c | 35 ++++++++++-------------------------
1 file changed, 10 insertions(+), 25 deletions(-)
diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c
index 8fe2afa9c818..87f4ed203c07 100644
--- a/arch/x86/events/intel/core.c
+++ b/arch/x86/events/intel/core.c
@@ -3792,36 +3792,21 @@ static __init void intel_pebs_isolation_quirk(void)
intel_check_pebs_isolation();
}
-static int intel_snb_pebs_broken(int cpu)
-{
- u32 rev = UINT_MAX; /* default to broken for unknown models */
-
- switch (cpu_data(cpu).x86_model) {
- case INTEL_FAM6_SANDYBRIDGE:
- rev = 0x28;
- break;
-
- case INTEL_FAM6_SANDYBRIDGE_X:
- switch (cpu_data(cpu).x86_stepping) {
- case 6: rev = 0x618; break;
- case 7: rev = 0x70c; break;
- }
- }
+static const struct x86_cpu_desc pebs_ucodes[] = {
+ INTEL_CPU_DESC(INTEL_FAM6_SANDYBRIDGE, 7, 0x00000028),
+ INTEL_CPU_DESC(INTEL_FAM6_SANDYBRIDGE_X, 6, 0x00000618),
+ INTEL_CPU_DESC(INTEL_FAM6_SANDYBRIDGE_X, 7, 0x0000070c),
+ {}
+};
- return (cpu_data(cpu).microcode < rev);
+static bool intel_snb_pebs_broken(void)
+{
+ return !x86_cpu_has_min_microcode_rev(pebs_ucodes);
}
static void intel_snb_check_microcode(void)
{
- int pebs_broken = 0;
- int cpu;
-
- for_each_online_cpu(cpu) {
- if ((pebs_broken = intel_snb_pebs_broken(cpu)))
- break;
- }
-
- if (pebs_broken == x86_pmu.pebs_broken)
+ if (intel_snb_pebs_broken() == x86_pmu.pebs_broken)
return;
/*
next prev parent reply other threads:[~2019-02-11 10:45 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-04 22:23 [PATCH V7 1/5] x86/cpufeature: Add facility to check for min microcode revisions kan.liang
2019-02-04 22:23 ` [PATCH V7 2/5] perf/x86/kvm: Avoid unnecessary work in guest filtering kan.liang
2019-02-11 10:44 ` [tip:perf/core] " tip-bot for Andi Kleen
2019-02-04 22:23 ` [PATCH V7 3/5] perf/x86/intel: Clean up SNB pebs quirk kan.liang
2019-02-11 10:45 ` tip-bot for Kan Liang [this message]
2019-02-04 22:23 ` [PATCH V7 4/5] perf/x86/intel: Clean up counter freezing quirk kan.liang
2019-02-11 10:45 ` [tip:perf/core] " tip-bot for Kan Liang
2019-02-04 22:23 ` [PATCH V7 5/5] perf/x86/intel: Add counter freezing quirk for Goldmont kan.liang
2019-02-11 10:46 ` [tip:perf/core] " tip-bot for Kan Liang
2019-02-05 11:46 ` [PATCH V7 1/5] x86/cpufeature: Add facility to check for min microcode revisions Peter Zijlstra
2019-02-05 12:26 ` Borislav Petkov
2019-02-11 10:43 ` [tip:perf/core] " tip-bot for Kan Liang
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=tip-a96fff8df28ddd2f6710e5af454a45014c73183c@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=dsahern@gmail.com \
--cc=eranian@google.com \
--cc=hpa@zytor.com \
--cc=jolsa@redhat.com \
--cc=kan.liang@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=vincent.weaver@maine.edu \
/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).