From: Patrick S. <lin...@ne...> - 2010-09-08 14:56:44
|
This patch adds CPU type detection for the Intel Celeron 540, which is part of the Core 2 family according to Wikipedia; the family and ID pair is absent from the Volume 3B table referenced in the source code comments. I have tested this patch on an Intel Celeron 540 machine reporting itself as Family 6 Model 22, and OProfile runs on the machine without issue. The patch was made against Linux version 2.6.35.4 but is so trivial that it should apply cleanly to anything relevant. Please CC me with any comments or questions as I am not subscribed to the list. --Patrick Signed-off-by: Patrick Simmons <lin...@ne...> --- linux/arch/x86/oprofile/nmi_int.c.orig 2010-09-08 08:01:56.000000000 -0600 +++ linux/arch/x86/oprofile/nmi_int.c 2010-09-08 05:57:18.000000000 -0600 @@ -664,7 +664,7 @@ static int __init ppro_init(char **cpu_t case 14: *cpu_type = "i386/core"; break; - case 15: case 23: + case 15: case 22: case 23: *cpu_type = "i386/core_2"; break; case 0x1a: |
From: Robert R. <rob...@am...> - 2010-09-08 15:09:40
|
On 08.09.10 10:34:28, Patrick Simmons wrote: > This patch adds CPU type detection for the Intel Celeron 540, which is > part of the Core 2 family according to Wikipedia; the family and ID pair > is absent from the Volume 3B table referenced in the source code > comments. I have tested this patch on an Intel Celeron 540 machine > reporting itself as Family 6 Model 22, and OProfile runs on the machine > without issue. The patch was made against Linux version 2.6.35.4 but is > so trivial that it should apply cleanly to anything relevant. Please CC > me with any comments or questions as I am not subscribed to the list. > > --Patrick > > Signed-off-by: Patrick Simmons <lin...@ne...> Andi, please ack. Thanks, -Robert > > --- linux/arch/x86/oprofile/nmi_int.c.orig 2010-09-08 > 08:01:56.000000000 -0600 > +++ linux/arch/x86/oprofile/nmi_int.c 2010-09-08 05:57:18.000000000 -0600 > @@ -664,7 +664,7 @@ static int __init ppro_init(char **cpu_t > case 14: > *cpu_type = "i386/core"; > break; > - case 15: case 23: > + case 15: case 22: case 23: > *cpu_type = "i386/core_2"; > break; > case 0x1a: > > -- Advanced Micro Devices, Inc. Operating System Research Center |
From: John V. <jvi...@re...> - 2010-09-08 15:55:38
|
Robert Richter said the following on 09/08/10 11:07: > On 08.09.10 10:34:28, Patrick Simmons wrote: >> This patch adds CPU type detection for the Intel Celeron 540, which is >> part of the Core 2 family according to Wikipedia; the family and ID pair >> is absent from the Volume 3B table referenced in the source code >> comments. I have tested this patch on an Intel Celeron 540 machine >> reporting itself as Family 6 Model 22, and OProfile runs on the machine >> without issue. The patch was made against Linux version 2.6.35.4 but is >> so trivial that it should apply cleanly to anything relevant. Please CC >> me with any comments or questions as I am not subscribed to the list. >> >> --Patrick >> >> Signed-off-by: Patrick Simmons<lin...@ne...> As an FYI: The 06:16 (aka 06 22 decimal) processors are Conroe and Merom processors, I believe. Hex CPUID 06:16:01 SL9XP Intel Celeron Processor Family 420 Conroe 06:16:01 SL9XN Intel Celeron Processor Family 430 Conroe 06:16:01 SL9XL Intel Celeron Processor Family 440 Conroe 06:16:01 SLAFZ Intel Celeron Processor Family 450 Conroe 06:16:01 SLAF2 Conroe 06:16:01 SL9WN Mobile Intel Celeron Processors 520 Merom 06:16:01 SL9VA Mobile Intel Celeron Processors 530 Merom 06:16:01 SLA2G Mobile Intel Celeron Processors 530 Merom 06:16:01 SLA2F Mobile Intel Celeron Processors 540 Merom 06:16:01 SLA2E Mobile Intel Celeron Processors 550 Merom 06:16:01 SLA2D Mobile Intel Celeron Processors 560 Merom 06:16:01 SLA2C Mobile Intel Celeron Processors 570 Merom >> --- linux/arch/x86/oprofile/nmi_int.c.orig 2010-09-08 >> 08:01:56.000000000 -0600 >> +++ linux/arch/x86/oprofile/nmi_int.c 2010-09-08 05:57:18.000000000 -0600 >> @@ -664,7 +664,7 @@ static int __init ppro_init(char **cpu_t >> case 14: >> *cpu_type = "i386/core"; >> break; >> - case 15: case 23: >> + case 15: case 22: case 23: >> *cpu_type = "i386/core_2"; >> break; >> case 0x1a: -- John Villalovos Intel Corporation on-site partner engineer at Red Hat, Inc. http://tabasco.usersys.redhat.com/ |
From: Robert R. <rob...@am...> - 2010-09-09 12:47:38
|
On 08.09.10 10:34:28, Patrick Simmons wrote: > This patch adds CPU type detection for the Intel Celeron 540, which is > part of the Core 2 family according to Wikipedia; the family and ID pair > is absent from the Volume 3B table referenced in the source code > comments. I have tested this patch on an Intel Celeron 540 machine > reporting itself as Family 6 Model 22, and OProfile runs on the machine > without issue. The patch was made against Linux version 2.6.35.4 but is > so trivial that it should apply cleanly to anything relevant. Please CC > me with any comments or questions as I am not subscribed to the list. > > --Patrick > > Signed-off-by: Patrick Simmons <lin...@ne...> Applied to oprofile/urgent. > > --- linux/arch/x86/oprofile/nmi_int.c.orig 2010-09-08 > 08:01:56.000000000 -0600 > +++ linux/arch/x86/oprofile/nmi_int.c 2010-09-08 05:57:18.000000000 -0600 > @@ -664,7 +664,7 @@ static int __init ppro_init(char **cpu_t > case 14: > *cpu_type = "i386/core"; > break; > - case 15: case 23: > + case 15: case 22: case 23: I slightly modified the change: - case 15: case 23: + case 0x0f: + case 0x16: + case 0x17: Thanks Patrick. -Robert > *cpu_type = "i386/core_2"; > break; > case 0x1a: > > -- Advanced Micro Devices, Inc. Operating System Research Center |
From: Robert R. <rob...@am...> - 2010-09-09 18:53:16
|
On 09.09.10 14:31:02, Robert Richter wrote: > On 08.09.10 10:34:28, Patrick Simmons wrote: > > This patch adds CPU type detection for the Intel Celeron 540, which is > > part of the Core 2 family according to Wikipedia; the family and ID pair > > is absent from the Volume 3B table referenced in the source code > > comments. I have tested this patch on an Intel Celeron 540 machine > > reporting itself as Family 6 Model 22, and OProfile runs on the machine > > without issue. The patch was made against Linux version 2.6.35.4 but is > > so trivial that it should apply cleanly to anything relevant. Please CC > > me with any comments or questions as I am not subscribed to the list. > > > > --Patrick > > > > Signed-off-by: Patrick Simmons <lin...@ne...> > > Applied to oprofile/urgent. Ingo, please pull this update for tip/perf/urgent from: git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git urgent Thanks, -Robert > > > > > --- linux/arch/x86/oprofile/nmi_int.c.orig 2010-09-08 > > 08:01:56.000000000 -0600 > > +++ linux/arch/x86/oprofile/nmi_int.c 2010-09-08 05:57:18.000000000 -0600 > > @@ -664,7 +664,7 @@ static int __init ppro_init(char **cpu_t > > case 14: > > *cpu_type = "i386/core"; > > break; > > - case 15: case 23: > > + case 15: case 22: case 23: > > I slightly modified the change: > > - case 15: case 23: > + case 0x0f: > + case 0x16: > + case 0x17: > > Thanks Patrick. > > -Robert > > > *cpu_type = "i386/core_2"; > > break; > > case 0x1a: > > > > -- Advanced Micro Devices, Inc. Operating System Research Center |
From: Arnd B. <ar...@ar...> - 2010-09-09 21:05:39
|
On Thursday 09 September 2010 20:48:12 Robert Richter wrote: > On 09.09.10 14:31:02, Robert Richter wrote: > > On 08.09.10 10:34:28, Patrick Simmons wrote: > > > This patch adds CPU type detection for the Intel Celeron 540, which is > > > part of the Core 2 family according to Wikipedia; the family and ID pair > > > is absent from the Volume 3B table referenced in the source code > > > comments. I have tested this patch on an Intel Celeron 540 machine > > > reporting itself as Family 6 Model 22, and OProfile runs on the machine > > > without issue. The patch was made against Linux version 2.6.35.4 but is > > > so trivial that it should apply cleanly to anything relevant. Please CC > > > me with any comments or questions as I am not subscribed to the list. The patch looks fine, but please note that only some Celeron 540 use this, while others are model 15. However all Core 2 Solo U2xxx and all desktop Celeron 2xx/4xx are model 22 as well. Arnd |