Mailing List Archive: [PATCH] x86/AMD: use correct shift count when merging model and stepping

[PATCH] x86/AMD: use correct shift count when merging model and stepping

Dec 15, 2011, 3:21 AM

Post #1 of 3 (111 views)

... 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)) &&

Re: [PATCH] x86/AMD: use correct shift count when merging model and stepping [ In reply to ]

keir at xen

Dec 15, 2011, 4:38 AM

Post #2 of 3 (107 views)

Permalink

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

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

Re: [PATCH] x86/AMD: use correct shift count when merging model and stepping [ In reply to ]

wei.huang2 at amd

Dec 15, 2011, 7:50 AM

Post #3 of 3 (108 views)

Permalink

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
>
>

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

Mailing List Archive

Mailing List Archive

Attached Files: