From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751516AbdBDQdH (ORCPT ); Sat, 4 Feb 2017 11:33:07 -0500 Received: from terminus.zytor.com ([65.50.211.136]:57250 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750890AbdBDQdG (ORCPT ); Sat, 4 Feb 2017 11:33:06 -0500 Date: Sat, 4 Feb 2017 08:32:54 -0800 From: tip-bot for Piotr Luc Message-ID: Cc: piotr.luc@intel.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org Reply-To: piotr.luc@intel.com, hpa@zytor.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, mingo@kernel.org In-Reply-To: <1484918557-15481-6-git-send-email-grzegorz.andrejczuk@intel.com> References: <1484918557-15481-6-git-send-email-grzegorz.andrejczuk@intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/cpufeature] x86/cpufeature: Enable RING3MWAIT for Knights Mill Git-Commit-ID: 2fc70d88d85d55e85bad7fde0ee71f79e22bfa3f X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 2fc70d88d85d55e85bad7fde0ee71f79e22bfa3f Gitweb: http://git.kernel.org/tip/2fc70d88d85d55e85bad7fde0ee71f79e22bfa3f Author: Piotr Luc AuthorDate: Fri, 20 Jan 2017 14:22:37 +0100 Committer: Thomas Gleixner CommitDate: Sat, 4 Feb 2017 08:51:10 +0100 x86/cpufeature: Enable RING3MWAIT for Knights Mill 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 Cc: Piotr.Luc@intel.com Cc: dave.hansen@linux.intel.com Link: http://lkml.kernel.org/r/1484918557-15481-6-git-send-email-grzegorz.andrejczuk@intel.com Signed-off-by: Thomas Gleixner --- arch/x86/kernel/cpu/intel.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index da2401a..74f30f9 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -79,8 +79,15 @@ 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) return; + switch (c->x86_model) { + case INTEL_FAM6_XEON_PHI_KNL: + case INTEL_FAM6_XEON_PHI_KNM: + break: + default: + return; + } if (ring3mwait_disabled) { msr_clear_bit(MSR_MISC_FEATURE_ENABLES,