Jan Beulich
2011-Dec-15 11:21 UTC
[PATCH] x86/AMD: use correct shift count when merging model and stepping
... for legacy errata matching.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/arch/x86/cpu/amd.c
+++ b/xen/arch/x86/cpu/amd.c
@@ -216,7 +216,7 @@ int cpu_has_amd_erratum(const struct cpu
}
/* OSVW unavailable or ID unknown, match family-model-stepping range */
- ms = (cpu->x86_model << 8) | cpu->x86_mask;
+ ms = (cpu->x86_model << 4) | cpu->x86_mask;
while ((range = va_arg(ap, int))) {
if ((cpu->x86 == AMD_MODEL_RANGE_FAMILY(range)) &&
(ms >= AMD_MODEL_RANGE_START(range)) &&
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
Keir Fraser
2011-Dec-15 12:38 UTC
Re: [PATCH] x86/AMD: use correct shift count when merging model and stepping
On 15/12/2011 11:21, "Jan Beulich" <JBeulich@suse.com> wrote:> ... for legacy errata matching. > > Signed-off-by: Jan Beulich <jbeulich@suse.com>Acked-by: Keir Fraser <keir@xen.org>> --- a/xen/arch/x86/cpu/amd.c > +++ b/xen/arch/x86/cpu/amd.c > @@ -216,7 +216,7 @@ int cpu_has_amd_erratum(const struct cpu > } > > /* OSVW unavailable or ID unknown, match family-model-stepping range */ > - ms = (cpu->x86_model << 8) | cpu->x86_mask; > + ms = (cpu->x86_model << 4) | cpu->x86_mask; > while ((range = va_arg(ap, int))) { > if ((cpu->x86 == AMD_MODEL_RANGE_FAMILY(range)) && > (ms >= AMD_MODEL_RANGE_START(range)) && > > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xensource.com > http://lists.xensource.com/xen-devel
Wei Huang
2011-Dec-15 15:50 UTC
Re: [PATCH] x86/AMD: use correct shift count when merging model and stepping
Good catch. Could you please apply it to xen-4.0 and xen-4.1 trees too? Acked-by: Wei Huang <wei.huang2@amd.com> -Wei On 12/15/2011 06:38 AM, Keir Fraser wrote:> On 15/12/2011 11:21, "Jan Beulich"<JBeulich@suse.com> wrote: > >> ... for legacy errata matching. >> >> Signed-off-by: Jan Beulich<jbeulich@suse.com> > Acked-by: Keir Fraser<keir@xen.org> > >> --- a/xen/arch/x86/cpu/amd.c >> +++ b/xen/arch/x86/cpu/amd.c >> @@ -216,7 +216,7 @@ int cpu_has_amd_erratum(const struct cpu >> } >> >> /* OSVW unavailable or ID unknown, match family-model-stepping range */ >> - ms = (cpu->x86_model<< 8) | cpu->x86_mask; >> + ms = (cpu->x86_model<< 4) | cpu->x86_mask; >> while ((range = va_arg(ap, int))) { >> if ((cpu->x86 == AMD_MODEL_RANGE_FAMILY(range))&& >> (ms>= AMD_MODEL_RANGE_START(range))&& >> >> >> >> _______________________________________________ >> Xen-devel mailing list >> Xen-devel@lists.xensource.com >> http://lists.xensource.com/xen-devel > >