Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933929AbcLTNtz (ORCPT ); Tue, 20 Dec 2016 08:49:55 -0500 Received: from mga09.intel.com ([134.134.136.24]:63741 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1764154AbcLTNtA (ORCPT ); Tue, 20 Dec 2016 08:49:00 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,378,1477983600"; d="scan'208";a="45167574" 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 v11 5/5] x86/cpufeature: enable RING3MWAIT for Knights Mill Date: Tue, 20 Dec 2016 14:48:46 +0100 Message-Id: <1482241726-27310-6-git-send-email-grzegorz.andrejczuk@intel.com> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1482241726-27310-1-git-send-email-grzegorz.andrejczuk@intel.com> References: <1482241726-27310-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 Content-Length: 1048 Lines: 31 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 9d07bee..a1c28ea 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -78,7 +78,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