Xen devel - Feb 2012 - [PATCH] x86: add Ivy Bridge model numbers to model specific MSR handling

On 06/02/2012 16:29, "Jan Beulich" <JBeulich@suse.com> wrote:
> This is model 0x3a (decimal 58) as per the most recent SDM.
> 
> In vPMU code, also add a forgotten earlier model.
> 
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
Fine by me with an appropriate Ack from Intel.

 K.
> --- a/xen/arch/x86/acpi/cpu_idle.c
> +++ b/xen/arch/x86/acpi/cpu_idle.c
> @@ -106,6 +106,8 @@ static void do_get_hw_residencies(void *
>  
>      switch ( c->x86_model )
>      {
> +    /* Ivy bridge */
> +    case 0x3A:
>      /* Sandy bridge */
>      case 0x2A:
>      case 0x2D:
> --- a/xen/arch/x86/hvm/vmx/vmx.c
> +++ b/xen/arch/x86/hvm/vmx/vmx.c
> @@ -1751,6 +1751,8 @@ static const struct lbr_info *last_branc
>          case 37: case 44: case 47:
>          /* Sandy Bridge */
>          case 42: case 45:
> +        /* Ivy Bridge */
> +        case 58:
>              return nh_lbr;
>              break;
>          /* Atom */
> --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c
> +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c
> @@ -623,8 +623,10 @@ int vmx_vpmu_initialise(struct vcpu *v)
>          case 26:
>          case 29:
>          case 42:
> +        case 45:
>          case 46:
>          case 47:
> +        case 58:
>              vpmu->arch_vpmu_ops = &core2_vpmu_ops;
>              return 0;
>          }
> 
> 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xensource.com
> http://lists.xensource.com/xen-devel

This is model 0x3a (decimal 58) as per the most recent SDM.

In vPMU code, also add a forgotten earlier model.

Signed-off-by: Jan Beulich <jbeulich@suse.com>

--- a/xen/arch/x86/acpi/cpu_idle.c
+++ b/xen/arch/x86/acpi/cpu_idle.c
@@ -106,6 +106,8 @@ static void do_get_hw_residencies(void *
 
     switch ( c->x86_model )
     {
+    /* Ivy bridge */
+    case 0x3A:
     /* Sandy bridge */
     case 0x2A:
     case 0x2D:
--- a/xen/arch/x86/hvm/vmx/vmx.c
+++ b/xen/arch/x86/hvm/vmx/vmx.c
@@ -1751,6 +1751,8 @@ static const struct lbr_info *last_branc
         case 37: case 44: case 47:
         /* Sandy Bridge */
         case 42: case 45:
+        /* Ivy Bridge */
+        case 58:
             return nh_lbr;
             break;
         /* Atom */
--- a/xen/arch/x86/hvm/vmx/vpmu_core2.c
+++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c
@@ -623,8 +623,10 @@ int vmx_vpmu_initialise(struct vcpu *v)
         case 26:
         case 29:
         case 42:
+        case 45:
         case 46:
         case 47:
+        case 58:
             vpmu->arch_vpmu_ops = &core2_vpmu_ops;
             return 0;
         }





_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

Also Fine to Intel, Thanks!
    Acked-by: Xiantao Zhang<xiantao.zhang@intel.com> 
Xiantao
> -----Original Message-----
> From: xen-devel-bounces@lists.xensource.com [mailto:xen-devel-
> bounces@lists.xensource.com] On Behalf Of Keir Fraser
> Sent: Monday, February 06, 2012 4:36 PM
> To: Jan Beulich; xen-devel@lists.xensource.com
> Cc: Dugger, Donald D; Nakajima, Jun
> Subject: Re: [Xen-devel] [PATCH] x86: add Ivy Bridge model numbers to
> model specific MSR handling
> 
> On 06/02/2012 16:29, "Jan Beulich" <JBeulich@suse.com>
wrote:
> 
> > This is model 0x3a (decimal 58) as per the most recent SDM.
> >
> > In vPMU code, also add a forgotten earlier model.
> >
> > Signed-off-by: Jan Beulich <jbeulich@suse.com>
> 
> Fine by me with an appropriate Ack from Intel.
> 
>  K.
> 
> > --- a/xen/arch/x86/acpi/cpu_idle.c
> > +++ b/xen/arch/x86/acpi/cpu_idle.c
> > @@ -106,6 +106,8 @@ static void do_get_hw_residencies(void *
> >
> >      switch ( c->x86_model )
> >      {
> > +    /* Ivy bridge */
> > +    case 0x3A:
> >      /* Sandy bridge */
> >      case 0x2A:
> >      case 0x2D:
> > --- a/xen/arch/x86/hvm/vmx/vmx.c
> > +++ b/xen/arch/x86/hvm/vmx/vmx.c
> > @@ -1751,6 +1751,8 @@ static const struct lbr_info *last_branc
> >          case 37: case 44: case 47:
> >          /* Sandy Bridge */
> >          case 42: case 45:
> > +        /* Ivy Bridge */
> > +        case 58:
> >              return nh_lbr;
> >              break;
> >          /* Atom */
> > --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c
> > +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c
> > @@ -623,8 +623,10 @@ int vmx_vpmu_initialise(struct vcpu *v)
> >          case 26:
> >          case 29:
> >          case 42:
> > +        case 45:
> >          case 46:
> >          case 47:
> > +        case 58:
> >              vpmu->arch_vpmu_ops = &core2_vpmu_ops;
> >              return 0;
> >          }
> >
> >
> >
> > _______________________________________________
> > Xen-devel mailing list
> > Xen-devel@lists.xensource.com
> > http://lists.xensource.com/xen-devel
> 
> 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xensource.com
> http://lists.xensource.com/xen-devel