From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754223AbcCVXJM (ORCPT ); Tue, 22 Mar 2016 19:09:12 -0400 Received: from mga01.intel.com ([192.55.52.88]:44170 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751322AbcCVXJE (ORCPT ); Tue, 22 Mar 2016 19:09:04 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,379,1455004800"; d="scan'208";a="929752474" From: Andi Kleen To: acme@kernel.org Cc: peterz@infradead.org, jolsa@kernel.org, eranian@google.com, mingo@kernel.org, linux-kernel@vger.kernel.org, Andi Kleen Subject: [PATCH 04/11] x86, perf: Use new ht_on flag in HT leak workaround Date: Tue, 22 Mar 2016 16:08:50 -0700 Message-Id: <1458688137-5946-5-git-send-email-andi@firstfloor.org> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1458688137-5946-1-git-send-email-andi@firstfloor.org> References: <1458688137-5946-1-git-send-email-andi@firstfloor.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andi Kleen Now that we have a convenient ht_on flag in x86_pmu use it to detect the HT workarounds for older CPUs. Signed-off-by: Andi Kleen --- arch/x86/events/intel/core.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c index ca693b3..d63ddb0 100644 --- a/arch/x86/events/intel/core.c +++ b/arch/x86/events/intel/core.c @@ -3854,16 +3854,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 (x86_pmu.ht_on) { pr_info("PMU erratum BJ122, BV98, HSD29 worked around, HT is on\n"); return 0; } -- 2.5.5