* Re:[PATCH] Mobil Pentium 4 HT and the NMI
@ 2005-08-19 1:59 Steven Rostedt
2005-08-19 3:23 ` [PATCH] " Andrew Morton
0 siblings, 1 reply; 6+ messages in thread
From: Steven Rostedt @ 2005-08-19 1:59 UTC (permalink / raw)
To: LKML; +Cc: Ingo Molnar, Linus Torvalds, Andrew Morton
Hi,
I'm resending this since I don't see it in git yet, and I'm wondering if
there is a problem with this patch. I have a IBM ThinkPad G41 with a
Mobile Pentium 4 HT. Without this patch, the NMI won't be setup. Is
there a reason that if the x86_model is greater than 0x3 it will return.
Since my processor has a 0x4 x86_model, I upped it to that. Otherwise my
laptop won't be able to use the NMI.
Thanks,
-- Steve
Description:
This patch is to allow the Mobile Penitum 4 HT to use the NMI.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
--- linux-2.6.13-rc6-git10/arch/i386/kernel/nmi.c.orig 2005-08-18 21:51:11.000000000 -0400
+++ linux-2.6.13-rc6-git10/arch/i386/kernel/nmi.c 2005-08-18 21:52:03.000000000 -0400
@@ -195,7 +195,7 @@ static void disable_lapic_nmi_watchdog(v
wrmsr(MSR_P6_EVNTSEL0, 0, 0);
break;
case 15:
- if (boot_cpu_data.x86_model > 0x3)
+ if (boot_cpu_data.x86_model > 0x4)
break;
wrmsr(MSR_P4_IQ_CCCR0, 0, 0);
@@ -432,7 +432,7 @@ void setup_apic_nmi_watchdog (void)
setup_p6_watchdog();
break;
case 15:
- if (boot_cpu_data.x86_model > 0x3)
+ if (boot_cpu_data.x86_model > 0x4)
return;
if (!setup_p4_watchdog())
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Mobil Pentium 4 HT and the NMI
2005-08-19 1:59 Re:[PATCH] Mobil Pentium 4 HT and the NMI Steven Rostedt
@ 2005-08-19 3:23 ` Andrew Morton
2005-08-19 3:34 ` Steven Rostedt
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Andrew Morton @ 2005-08-19 3:23 UTC (permalink / raw)
To: Steven Rostedt; +Cc: linux-kernel, mingo, torvalds
Steven Rostedt <rostedt@goodmis.org> wrote:
>
> Hi,
>
> I'm resending this since I don't see it in git yet, and I'm wondering if
> there is a problem with this patch. I have a IBM ThinkPad G41 with a
> Mobile Pentium 4 HT. Without this patch, the NMI won't be setup. Is
> there a reason that if the x86_model is greater than 0x3 it will return.
> Since my processor has a 0x4 x86_model, I upped it to that. Otherwise my
> laptop won't be able to use the NMI.
>
Well I was hoping that someone with knowledge of the low-level Intel model
differences would pipe up, but they all seem to be in hiding. (Wildly
bcc's lots of x86 people).
>
> Description:
> This patch is to allow the Mobile Penitum 4 HT to use the NMI.
>
> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
>
> --- linux-2.6.13-rc6-git10/arch/i386/kernel/nmi.c.orig 2005-08-18 21:51:11.000000000 -0400
> +++ linux-2.6.13-rc6-git10/arch/i386/kernel/nmi.c 2005-08-18 21:52:03.000000000 -0400
> @@ -195,7 +195,7 @@ static void disable_lapic_nmi_watchdog(v
> wrmsr(MSR_P6_EVNTSEL0, 0, 0);
> break;
> case 15:
> - if (boot_cpu_data.x86_model > 0x3)
> + if (boot_cpu_data.x86_model > 0x4)
> break;
>
> wrmsr(MSR_P4_IQ_CCCR0, 0, 0);
> @@ -432,7 +432,7 @@ void setup_apic_nmi_watchdog (void)
> setup_p6_watchdog();
> break;
> case 15:
> - if (boot_cpu_data.x86_model > 0x3)
> + if (boot_cpu_data.x86_model > 0x4)
> return;
>
> if (!setup_p4_watchdog())
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] Mobil Pentium 4 HT and the NMI
2005-08-19 3:23 ` [PATCH] " Andrew Morton
@ 2005-08-19 3:34 ` Steven Rostedt
2005-08-19 3:41 ` Zwane Mwaikambo
2005-08-19 11:21 ` Philippe Elie
2 siblings, 0 replies; 6+ messages in thread
From: Steven Rostedt @ 2005-08-19 3:34 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel, mingo, torvalds
On Thu, 2005-08-18 at 20:23 -0700, Andrew Morton wrote:
> Steven Rostedt <rostedt@goodmis.org> wrote:
> >
> > Hi,
> >
> > I'm resending this since I don't see it in git yet, and I'm wondering if
> > there is a problem with this patch. I have a IBM ThinkPad G41 with a
> > Mobile Pentium 4 HT. Without this patch, the NMI won't be setup. Is
> > there a reason that if the x86_model is greater than 0x3 it will return.
> > Since my processor has a 0x4 x86_model, I upped it to that. Otherwise my
> > laptop won't be able to use the NMI.
> >
>
> Well I was hoping that someone with knowledge of the low-level Intel model
> differences would pipe up, but they all seem to be in hiding. (Wildly
> bcc's lots of x86 people).
>
If this is any consolation, I've been using this patch all day today
debugging a deadlock in Ingo's RT patch. It seems to work fine with me.
Who knows, maybe in two days my Laptop will be dead because this set up
some self destruct register. (knocks on wood).
-- Steve
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Mobil Pentium 4 HT and the NMI
2005-08-19 3:23 ` [PATCH] " Andrew Morton
2005-08-19 3:34 ` Steven Rostedt
@ 2005-08-19 3:41 ` Zwane Mwaikambo
2005-08-19 11:21 ` Philippe Elie
2 siblings, 0 replies; 6+ messages in thread
From: Zwane Mwaikambo @ 2005-08-19 3:41 UTC (permalink / raw)
To: Andrew Morton; +Cc: Steven Rostedt, linux-kernel, mingo, torvalds
On Thu, 18 Aug 2005, Andrew Morton wrote:
> Steven Rostedt <rostedt@goodmis.org> wrote:
> >
> > Hi,
> >
> > I'm resending this since I don't see it in git yet, and I'm wondering if
> > there is a problem with this patch. I have a IBM ThinkPad G41 with a
> > Mobile Pentium 4 HT. Without this patch, the NMI won't be setup. Is
> > there a reason that if the x86_model is greater than 0x3 it will return.
> > Since my processor has a 0x4 x86_model, I upped it to that. Otherwise my
> > laptop won't be able to use the NMI.
> >
>
> Well I was hoping that someone with knowledge of the low-level Intel model
> differences would pipe up, but they all seem to be in hiding. (Wildly
> bcc's lots of x86 people).
Looks ok to me, they haven't changed the performance counter setup on
those processors.
Acked-by: Zwane Mwaikambo <zwane@arm.linux.org.uk>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Mobil Pentium 4 HT and the NMI
2005-08-19 3:23 ` [PATCH] " Andrew Morton
2005-08-19 3:34 ` Steven Rostedt
2005-08-19 3:41 ` Zwane Mwaikambo
@ 2005-08-19 11:21 ` Philippe Elie
2 siblings, 0 replies; 6+ messages in thread
From: Philippe Elie @ 2005-08-19 11:21 UTC (permalink / raw)
To: Andrew Morton; +Cc: Steven Rostedt, linux-kernel, mingo, torvalds
On Thu, 18 Aug 2005 at 20:23 +0000, Andrew Morton wrote:
> Steven Rostedt <rostedt@goodmis.org> wrote:
> >
> > Hi,
> >
> > I'm resending this since I don't see it in git yet, and I'm wondering if
> > there is a problem with this patch. I have a IBM ThinkPad G41 with a
> > Mobile Pentium 4 HT. Without this patch, the NMI won't be setup. Is
> > there a reason that if the x86_model is greater than 0x3 it will return.
> > Since my processor has a 0x4 x86_model, I upped it to that. Otherwise my
> > laptop won't be able to use the NMI.
> >
>
> Well I was hoping that someone with knowledge of the low-level Intel model
> differences would pipe up, but they all seem to be in hiding. (Wildly
> bcc's lots of x86 people).
There is no documented change regarding to the used msr for P4 model 4,
Zwane do this for oprofile the 2005-02-02 and nobody complained.
--
Philippe Elie
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Mobil Pentium 4 HT and the NMI
@ 2005-08-19 10:12 Mikael Pettersson
0 siblings, 0 replies; 6+ messages in thread
From: Mikael Pettersson @ 2005-08-19 10:12 UTC (permalink / raw)
To: akpm, rostedt; +Cc: linux-kernel, mingo, torvalds
On Thu, 18 Aug 2005 20:23:00 -0700, Andrew Morton wrote:
>Steven Rostedt <rostedt@goodmis.org> wrote:
>>
>> Hi,
>>
>> I'm resending this since I don't see it in git yet, and I'm wondering if
>> there is a problem with this patch. I have a IBM ThinkPad G41 with a
>> Mobile Pentium 4 HT. Without this patch, the NMI won't be setup. Is
>> there a reason that if the x86_model is greater than 0x3 it will return.
>> Since my processor has a 0x4 x86_model, I upped it to that. Otherwise my
>> laptop won't be able to use the NMI.
>>
>
>Well I was hoping that someone with knowledge of the low-level Intel model
>differences would pipe up, but they all seem to be in hiding. (Wildly
>bcc's lots of x86 people).
>
>>
>> Description:
>> This patch is to allow the Mobile Penitum 4 HT to use the NMI.
>>
>> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
The patch is OK, but it doesn't fix a bug or regression.
Since Linus' kernel seems to be in bug-fix-only mode, it
shouldn't go in there until after 2.6.13.
Acked-by: Mikael Pettersson <mikpe@csd.uu.se>
>>
>> --- linux-2.6.13-rc6-git10/arch/i386/kernel/nmi.c.orig 2005-08-18 21:51:11.000000000 -0400
>> +++ linux-2.6.13-rc6-git10/arch/i386/kernel/nmi.c 2005-08-18 21:52:03.000000000 -0400
>> @@ -195,7 +195,7 @@ static void disable_lapic_nmi_watchdog(v
>> wrmsr(MSR_P6_EVNTSEL0, 0, 0);
>> break;
>> case 15:
>> - if (boot_cpu_data.x86_model > 0x3)
>> + if (boot_cpu_data.x86_model > 0x4)
>> break;
>>
>> wrmsr(MSR_P4_IQ_CCCR0, 0, 0);
>> @@ -432,7 +432,7 @@ void setup_apic_nmi_watchdog (void)
>> setup_p6_watchdog();
>> break;
>> case 15:
>> - if (boot_cpu_data.x86_model > 0x3)
>> + if (boot_cpu_data.x86_model > 0x4)
>> return;
>>
>> if (!setup_p4_watchdog())
>-
>To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>the body of a message to majordomo@vger.kernel.org
>More majordomo info at http://vger.kernel.org/majordomo-info.html
>Please read the FAQ at http://www.tux.org/lkml/
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2005-08-19 11:17 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-08-19 1:59 Re:[PATCH] Mobil Pentium 4 HT and the NMI Steven Rostedt
2005-08-19 3:23 ` [PATCH] " Andrew Morton
2005-08-19 3:34 ` Steven Rostedt
2005-08-19 3:41 ` Zwane Mwaikambo
2005-08-19 11:21 ` Philippe Elie
-- strict thread matches above, loose matches on Subject: below --
2005-08-19 10:12 Mikael Pettersson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox