Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759790AbcJRKDY (ORCPT ); Tue, 18 Oct 2016 06:03:24 -0400 Received: from mga04.intel.com ([192.55.52.120]:61634 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759676AbcJRKDL (ORCPT ); Tue, 18 Oct 2016 06:03:11 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,361,1473145200"; d="scan'208";a="20739244" From: Grzegorz Andrejczuk To: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, x86@kernel.org Cc: bp@suse.de, dave.hansen@linux.intel.com, linux-kernel@vger.kernel.org, lukasz.daniluk@intel.com, james.h.cownie@intel.com, jacob.jun.pan@intel.com, Grzegorz Andrejczuk Subject: [PATCH v4 4/4] x86/phi: Add R3MWAIT to CPU features Date: Tue, 18 Oct 2016 12:02:51 +0200 Message-Id: <1476784971-23872-5-git-send-email-grzegorz.andrejczuk@intel.com> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1476784971-23872-1-git-send-email-grzegorz.andrejczuk@intel.com> References: <1476784971-23872-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: 1577 Lines: 46 Add cpu feature for ring 3 monitor/mwait. Set HWCAP2 1st bit during init. Signed-off-by: Grzegorz Andrejczuk --- arch/x86/include/asm/cpufeatures.h | 2 ++ arch/x86/kernel/cpu/intel.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h index 92a8308..d430200 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -71,6 +71,8 @@ #define X86_FEATURE_RECOVERY ( 2*32+ 0) /* CPU in recovery mode */ #define X86_FEATURE_LONGRUN ( 2*32+ 1) /* Longrun power control */ #define X86_FEATURE_LRTI ( 2*32+ 3) /* LongRun table interface */ +/* Xeon Phi x200 ring 3 MONITOR/MWAIT enabled */ +#define X86_FEATURE_PHIR3MWAIT ( 2*32+ 4) /* Other features, Linux-defined mapping, word 3 */ /* This range is used for feature bits which conflict or are synthesized */ diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index 1134dca..a2ea905 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -14,6 +14,8 @@ #include #include #include +#include +#include #ifdef CONFIG_X86_64 #include @@ -87,6 +89,8 @@ static void probe_xeon_phi_r3mwait(struct cpuinfo_x86 *c) rdmsrl(MSR_PHI_MISC_THD_FEATURE, msr); msr |= MSR_PHI_MISC_THD_FEATURE_R3MWAIT; wrmsrl(MSR_PHI_MISC_THD_FEATURE, msr); + set_cpu_cap(c, X86_FEATURE_PHIR3MWAIT); + ELF_HWCAP2 |= HWCAP2_PHIR3MWAIT; } } -- 2.5.1