From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH] x86/faulting: Use formal defines instead of opencoded bits Date: Tue, 25 Feb 2014 11:02:17 +0000 Message-ID: <1393326137-29397-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Xen-devel Cc: Andrew Cooper , Keir Fraser , Jan Beulich List-Id: xen-devel@lists.xenproject.org Signed-off-by: Andrew Cooper CC: Keir Fraser CC: Jan Beulich --- xen/arch/x86/cpu/intel.c | 7 ++++--- xen/include/asm-x86/msr-index.h | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 27fe762..808ed8d 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -21,7 +21,8 @@ static unsigned int probe_intel_cpuid_faulting(void) { uint64_t x; - return !rdmsr_safe(MSR_INTEL_PLATFORM_INFO, x) && (x & (1u<<31)); + return !rdmsr_safe(MSR_INTEL_PLATFORM_INFO, x) && + (x & PLATFORM_INFO_CPUID_FAULTING); } static DEFINE_PER_CPU(bool_t, cpuid_faulting_enabled); @@ -34,9 +35,9 @@ void set_cpuid_faulting(bool_t enable) return; rdmsr(MSR_INTEL_MISC_FEATURES_ENABLES, lo, hi); - lo &= ~1; + lo &= ~MISC_FEATURES_CPUID_FAULTING; if (enable) - lo |= 1; + lo |= MISC_FEATURES_CPUID_FAULTING; wrmsr(MSR_INTEL_MISC_FEATURES_ENABLES, lo, hi); this_cpu(cpuid_faulting_enabled) = enable; diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h index 86b7d64..15a7e13 100644 --- a/xen/include/asm-x86/msr-index.h +++ b/xen/include/asm-x86/msr-index.h @@ -486,7 +486,12 @@ /* Intel cpuid faulting MSRs */ #define MSR_INTEL_PLATFORM_INFO 0x000000ce +#define _PLATFORM_INFO_CPUID_FAULTING 31 +#define PLATFORM_INFO_CPUID_FAULTING (1ULL << _PLATFORM_INFO_CPUID_FAULTING) + #define MSR_INTEL_MISC_FEATURES_ENABLES 0x00000140 +#define _MISC_FEATURES_CPUID_FAULTING 0 +#define MISC_FEATURES_CPUID_FAULTING (1ULL << _MISC_FEATURES_CPUID_FAULTING) /* Geode defined MSRs */ #define MSR_GEODE_BUSCONT_CONF0 0x00001900 -- 1.7.10.4