From mboxrd@z Thu Jan  1 00:00:00 1970
From: Wei Huang <wei.huang2@amd.com>
Subject: Re: [PATCH] x86/AMD: use correct shift count when
 merging model and stepping
Date: Thu, 15 Dec 2011 09:50:40 -0600
Message-ID: <4EEA1750.5040608@amd.com>
References: <CB0F9AD6.35FE9%keir@xen.org>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"; Format="flowed"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <CB0F9AD6.35FE9%keir@xen.org>
List-Unsubscribe: <http://lists.xensource.com/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: Keir Fraser <keir@xen.org>
Cc: Boris Ostrovsky <boris.ostrovsky@amd.com>, "xen-devel@lists.xensource.com" <xen-devel@lists.xensource.com>, Jan Beulich <JBeulich@suse.com>
List-Id: xen-devel@lists.xenproject.org

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