* [PATCH] x86/AMD: use correct shift count when merging model and stepping
@ 2011-12-15 11:21 Jan Beulich
2011-12-15 12:38 ` Keir Fraser
0 siblings, 1 reply; 3+ messages in thread
From: Jan Beulich @ 2011-12-15 11:21 UTC (permalink / raw)
To: xen-devel@lists.xensource.com; +Cc: Boris Ostrovsky, wei.huang2
[-- Attachment #1: Type: text/plain, Size: 532 bytes --]
... 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)) &&
[-- Attachment #2: amd-errata-model-shift.patch --]
[-- Type: text/plain, Size: 594 bytes --]
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)) &&
[-- Attachment #3: Type: text/plain, Size: 138 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] x86/AMD: use correct shift count when merging model and stepping
2011-12-15 11:21 [PATCH] x86/AMD: use correct shift count when merging model and stepping Jan Beulich
@ 2011-12-15 12:38 ` Keir Fraser
2011-12-15 15:50 ` Wei Huang
0 siblings, 1 reply; 3+ messages in thread
From: Keir Fraser @ 2011-12-15 12:38 UTC (permalink / raw)
To: Jan Beulich, xen-devel@lists.xensource.com; +Cc: Boris Ostrovsky, wei.huang2
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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] x86/AMD: use correct shift count when merging model and stepping
2011-12-15 12:38 ` Keir Fraser
@ 2011-12-15 15:50 ` Wei Huang
0 siblings, 0 replies; 3+ messages in thread
From: Wei Huang @ 2011-12-15 15:50 UTC (permalink / raw)
To: Keir Fraser; +Cc: Boris Ostrovsky, xen-devel@lists.xensource.com, Jan Beulich
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
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-12-15 15:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-15 11:21 [PATCH] x86/AMD: use correct shift count when merging model and stepping Jan Beulich
2011-12-15 12:38 ` Keir Fraser
2011-12-15 15:50 ` Wei Huang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.