From: Andi Kleen <ak@suse.de>
To: "Siddha, Suresh B" <suresh.b.siddha@intel.com>
Cc: Petr Vandrovec <vandrove@vc.cvut.cz>,
linux-kernel@vger.kernel.org, akpm@osdl.org
Subject: Re: [Patch] x86, x86_64: fix cpu model for family 0x6
Date: Sat, 1 Oct 2005 00:02:16 +0200 [thread overview]
Message-ID: <200510010002.16382.ak@suse.de> (raw)
In-Reply-To: <20050930112310.A28092@unix-os.sc.intel.com>
On Friday 30 September 2005 20:23, Siddha, Suresh B wrote:
> On Fri, Sep 30, 2005 at 03:09:46PM +0200, Petr Vandrovec wrote:
> > Siddha, Suresh B wrote:
> > > - if (c->x86 == 0xf) {
> > > + if (c->x86 == 0xf)
> > > c->x86 += (tfms >> 20) & 0xff;
> > > + if (c->x86 == 0x6 || c->x86 == 0xf)
> >
> > Are you sure this is correct? You just incremented c->x86 by extended
> > family, so I believe test should be
> >
> > if (c->x86 == 0x6 || c->x86 >= 0xf)
>
> My bad. Your suggestion might work. But let me just follow what SDM Vol-2a
> says here. New patch appended.
>
> Andi, please apply.
I applied an earlier mix of your original one and Petr's suggestions. Hope
it's ok.
x86-64/i386: Fix CPU model for family 6
From: Suresh Siddha <suresh.b.siddha@intel.com>
According to cpuid instruction in IA32 SDM-Vol2, when computing cpu model,
we need to consider extended model ID for family 0x6 also.
AK: Also added fixes/simplifcation from Petr Vandrovec
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Index: linux/arch/i386/kernel/cpu/common.c
===================================================================
--- linux.orig/arch/i386/kernel/cpu/common.c
+++ linux/arch/i386/kernel/cpu/common.c
@@ -233,10 +233,10 @@ static void __init early_cpu_detect(void
cpuid(0x00000001, &tfms, &misc, &junk, &cap0);
c->x86 = (tfms >> 8) & 15;
c->x86_model = (tfms >> 4) & 15;
- if (c->x86 == 0xf) {
+ if (c->x86 == 0xf)
c->x86 += (tfms >> 20) & 0xff;
+ if (c->x86 >= 0x6)
c->x86_model += ((tfms >> 16) & 0xF) << 4;
- }
c->x86_mask = tfms & 15;
if (cap0 & (1<<19))
c->x86_cache_alignment = ((misc >> 8) & 0xff) * 8;
Index: linux/arch/x86_64/kernel/setup.c
===================================================================
--- linux.orig/arch/x86_64/kernel/setup.c
+++ linux/arch/x86_64/kernel/setup.c
@@ -1059,10 +1059,10 @@ void __cpuinit early_identify_cpu(struct
c->x86 = (tfms >> 8) & 0xf;
c->x86_model = (tfms >> 4) & 0xf;
c->x86_mask = tfms & 0xf;
- if (c->x86 == 0xf) {
+ if (c->x86 == 0xf)
c->x86 += (tfms >> 20) & 0xff;
+ if (c->x86 >= 0xf)
c->x86_model += ((tfms >> 16) & 0xF) << 4;
- }
if (c->x86_capability[0] & (1<<19))
c->x86_clflush_size = ((misc >> 8) & 0xff) * 8;
} else {
next prev parent reply other threads:[~2005-09-30 22:02 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-09-30 2:04 [Patch] x86, x86_64: fix cpu model for family 0x6 Siddha, Suresh B
2005-09-30 8:11 ` Andi Kleen
2005-09-30 13:09 ` Petr Vandrovec
2005-09-30 18:23 ` Siddha, Suresh B
2005-09-30 22:02 ` Andi Kleen [this message]
2005-09-30 22:23 ` Siddha, Suresh B
2005-09-30 22:37 ` Petr Vandrovec
2005-09-30 22:56 ` Dave Jones
2005-09-30 22:46 ` Andi Kleen
2005-10-01 1:37 ` Siddha, Suresh B
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200510010002.16382.ak@suse.de \
--to=ak@suse.de \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=suresh.b.siddha@intel.com \
--cc=vandrove@vc.cvut.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox