提交 a96fff8d 编写于 作者: K Kan Liang 提交者: Ingo Molnar

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: NKan Liang <kan.liang@linux.intel.com>
Signed-off-by: NPeter 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.comSigned-off-by: NIngo Molnar <mingo@kernel.org>
上级 9b545c04
...@@ -3792,36 +3792,21 @@ static __init void intel_pebs_isolation_quirk(void) ...@@ -3792,36 +3792,21 @@ static __init void intel_pebs_isolation_quirk(void)
intel_check_pebs_isolation(); intel_check_pebs_isolation();
} }
static int intel_snb_pebs_broken(int cpu) static const struct x86_cpu_desc pebs_ucodes[] = {
{ INTEL_CPU_DESC(INTEL_FAM6_SANDYBRIDGE, 7, 0x00000028),
u32 rev = UINT_MAX; /* default to broken for unknown models */ INTEL_CPU_DESC(INTEL_FAM6_SANDYBRIDGE_X, 6, 0x00000618),
INTEL_CPU_DESC(INTEL_FAM6_SANDYBRIDGE_X, 7, 0x0000070c),
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;
}
}
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) static void intel_snb_check_microcode(void)
{ {
int pebs_broken = 0; if (intel_snb_pebs_broken() == x86_pmu.pebs_broken)
int cpu;
for_each_online_cpu(cpu) {
if ((pebs_broken = intel_snb_pebs_broken(cpu)))
break;
}
if (pebs_broken == x86_pmu.pebs_broken)
return; return;
/* /*
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册