From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: Re: [PATCH] x86: remove redundancy of MSR_P6_{PERFCTR, EVNTSEL} definitions Date: Wed, 3 Sep 2014 13:30:53 +0100 Message-ID: <540709FD.7090904@citrix.com> References: <5407252E0200007800030433@mail.emea.novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XP9iT-0000vh-1Z for xen-devel@lists.xenproject.org; Wed, 03 Sep 2014 12:31:13 +0000 In-Reply-To: <5407252E0200007800030433@mail.emea.novell.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Jan Beulich , xen-devel Cc: Eddie Dong , Kevin Tian , Keir Fraser , Jun Nakajima List-Id: xen-devel@lists.xenproject.org On 03/09/14 13:26, Jan Beulich wrote: > --- a/xen/include/asm-x86/msr-index.h > +++ b/xen/include/asm-x86/msr-index.h > @@ -112,11 +112,6 @@ > > #define MSR_AMD64_MCx_MASK(x) (MSR_AMD64_MC0_MASK + (x)) > > -#define MSR_P6_PERFCTR0 0x000000c1 > -#define MSR_P6_PERFCTR1 0x000000c2 > -#define MSR_P6_EVNTSEL0 0x00000186 > -#define MSR_P6_EVNTSEL1 0x00000187 > - > /* MSRs & bits used for VMX enabling */ > #define MSR_IA32_VMX_BASIC 0x480 > #define MSR_IA32_VMX_PINBASED_CTLS 0x481 > @@ -329,8 +324,8 @@ > #define MSR_IA32_ENERGY_PERF_BIAS 0x000001b0 > > /* Intel Model 6 */ > -#define MSR_P6_EVNTSEL0 0x00000186 > -#define MSR_P6_EVNTSEL1 0x00000187 > +#define MSR_P6_PERFCTR(n) (0x000000c1 + (n)) > +#define MSR_P6_EVNTSEL(n) (0x00000186 + (n)) > > /* P4/Xeon+ specific */ > #define MSR_IA32_MCG_EAX 0x00000180 > @@ -488,7 +483,4 @@ > #define _MSR_MISC_FEATURES_CPUID_FAULTING 0 > #define MSR_MISC_FEATURES_CPUID_FAULTING (1ULL << _MSR_MISC_FEATURES_CPUID_FAULTING) > > -/* Geode defined MSRs */ > -#define MSR_GEODE_BUSCONT_CONF0 0x00001900 > - Is this geode removal related to the patch? Other than this hunk, Reviewed-by: Andrew Cooper ~Andrew