Commit 030ba6cd authored by Andi Kleen's avatar Andi Kleen Committed by Ingo Molnar

perf/x86/intel: Use new topology_max_smt_threads() in HT leak workaround

Now that we have topology_max_smt_threads() use it
to detect the HT workarounds for older CPUs.
Signed-off-by: default avatarAndi Kleen <>
Signed-off-by: default avatarPeter Zijlstra (Intel) <>
Cc: Alexander Shishkin <>
Cc: Arnaldo Carvalho de Melo <>
Cc: Jiri Olsa <>
Cc: Linus Torvalds <>
Cc: Peter Zijlstra <>
Cc: Stephane Eranian <>
Cc: Thomas Gleixner <>
Cc: Vince Weaver <>
Link: default avatarIngo Molnar <>
parent eb12b8ec
......@@ -3989,16 +3989,14 @@ __init int intel_pmu_init(void)
static __init int fixup_ht_bug(void)
int cpu = smp_processor_id();
int w, c;
int c;
* problem not present on this CPU model, nothing to do
if (!(x86_pmu.flags & PMU_FL_EXCL_ENABLED))
return 0;
w = cpumask_weight(topology_sibling_cpumask(cpu));
if (w > 1) {
if (topology_max_smt_threads() > 1) {
pr_info("PMU erratum BJ122, BV98, HSD29 worked around, HT is on\n");
return 0;
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