From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752433AbdATNXZ (ORCPT ); Fri, 20 Jan 2017 08:23:25 -0500 Received: from mga11.intel.com ([192.55.52.93]:12648 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752408AbdATNXX (ORCPT ); Fri, 20 Jan 2017 08:23:23 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,258,1477983600"; d="scan'208";a="1096695951" From: Grzegorz Andrejczuk To: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, x86@kernel.org Cc: linux-kernel@vger.kernel.org, Piotr.Luc@intel.com, dave.hansen@linux.intel.com, Piotr Luc Subject: [PATCH v12 5/5] x86/cpufeature: enable RING3MWAIT for Knights Mill Date: Fri, 20 Jan 2017 14:22:37 +0100 Message-Id: <1484918557-15481-6-git-send-email-grzegorz.andrejczuk@intel.com> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1484918557-15481-1-git-send-email-grzegorz.andrejczuk@intel.com> References: <1484918557-15481-1-git-send-email-grzegorz.andrejczuk@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Piotr Luc Enable ring 3 MONITOR/MWAIT for Intel Xeon Phi codenamed Knights Mill. We can't guarantee that this (KNM) will be the last CPU model that needs this hack. But, we do recognize that this is far from optimal, and there is an effort to ensure we don't keep doing extending this hack forever. Signed-off-by: Piotr Luc --- arch/x86/kernel/cpu/intel.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index 213cbf0..b1b1af5 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -79,7 +79,9 @@ static void probe_xeon_phi_r3mwait(struct cpuinfo_x86 *c) * Ring 3 MONITOR/MWAIT feature cannot be detected without * cpu model and family comparison. */ - if (c->x86 != 6 || c->x86_model != INTEL_FAM6_XEON_PHI_KNL) + if (c->x86 != 6 || + (c->x86_model != INTEL_FAM6_XEON_PHI_KNL && + c->x86_model != INTEL_FAM6_XEON_PHI_KNM)) return; if (ring3mwait_disabled) { -- 2.5.1