x86: smpboot - check if we have ESR register in wakeup_secondary_cpu
PATCH 1/1 x86: smpboot - check if we have ESR register in wakeup_secondary_cpu
We should check if we have ESR register before writting to it.
---
Please review!
it seems the same nit in do_boot_cpu - checking now.
arch/x86/kernel/smpboot.c +6 -4
@@ -598,10 +598,12 @@ wakeup_secondary_cpu(int logical_apicid,* Give the other CPU some time to accept the IPI. */ udelay (200 ); - maxlvt =lapic_get_maxlvt (); -if (maxlvt >3 )/* Due to the Pentium erratum 3AP. */ -apic_write (APIC_ESR ,0 ); - accept_status = (apic_read (APIC_ESR ) &0xEF ); +if (APIC_INTEGRATED (apic_version[phys_apicid])) { + maxlvt =lapic_get_maxlvt (); +if (maxlvt >3 )/* Due to the Pentium erratum 3AP. */ +apic_write (APIC_ESR ,0 ); + accept_status = (apic_read (APIC_ESR ) &0xEF ); + }pr_debug ("NMI sent.\n" );if (send_status)
Quoted 17 lines · Cyrill Gorcunov
We should check if we have ESR register before writting to it.
Signed-off-by Cyrill Gorcunov <[email protected]>---
Please review!
it seems the same nit indo_boot_cpu- checking now.Index:
linux-2.6.git/arch/x86/kernel/smpboot.c
===================================================================arch/x86/kernel/smpboot.c +0
-1@@ -598,10 +598,12 @@ wakeup_secondary_cpu(int logical_apicid,* Give the other CPU some time to accept the IPI. */ udelay (200 ); - maxlvt =lapic_get_maxlvt ();
arch/x86/kernel/smpboot.c wakeup_secondary_cpu(int logical_apicid, · line 607
Quoted 10 lines
arch/x86/kernel/smpboot.c +6
-3-if (maxlvt >3 )/* Due to the Pentium erratum 3AP. */ -apic_write (APIC_ESR ,0 ); - accept_status = (apic_read (APIC_ESR ) &0xEF ); +if (APIC_INTEGRATED (apic_version[phys_apicid])) { + maxlvt =lapic_get_maxlvt (); +if (maxlvt >3 )/* Due to the Pentium erratum 3AP. */ +apic_write (APIC_ESR ,0 ); + accept_status = (apic_read (APIC_ESR ) &0xEF ); + }pr_debug ("NMI sent.\n" );
hm, is there any non-integrated lapic that has more than 3 lvts? iirc lvts were introduced with the integrated lapic.
Ingo
[Ingo Molnar - Mon, Sep 15, 2008 at 09:56:55AM +0200]
| | * Cyrill Gorcunov <[email protected]> wrote: | | > We should check if we have ESR register before writting to it. | > | > Signed-off-by: Cyrill Gorcunov <[email protected]> | > --- | > | > Please review! | > it seems the same nit in do_boot_cpu - checking now. | > | > Index: linux-2.6.git/arch/x86/kernel/smpboot.c | > =================================================================== | > --- linux-2.6.git.orig/arch/x86/kernel/smpboot.c 2008-09-14 19:43:03.000000000 +0400 | > +++ linux-2.6.git/arch/x86/kernel/smpboot.c 2008-09-14 21:49:36.000000000 +0400 | > @@ -598,10 +598,12 @@ wakeup_secondary_cpu(int logical_apicid, | > * Give the other CPU some time to accept the IPI. | > */ | > udelay(200); | > - maxlvt = lapic_get_maxlvt(); | > - if (maxlvt > 3) /* Due to the Pentium erratum 3AP. */ | > - apic_write(APIC_ESR, 0); | > - accept_status = (apic_read(APIC_ESR) & 0xEF); | > + if (APIC_INTEGRATED(apic_version[phys_apicid])) { | > + maxlvt = lapic_get_maxlvt(); | > + if (maxlvt > 3) /* Due to the Pentium erratum 3AP. */ | > + apic_write(APIC_ESR, 0); | > + accept_status = (apic_read(APIC_ESR) & 0xEF); | > + } | > pr_debug("NMI sent.\n"); | | hm, is there any non-integrated lapic that has more than 3 lvts? iirc | lvts were introduced with the integrated lapic. | | Ingo |
Yes Ingo, but don't forget the next line in former
accept_status = (apic_read(APIC_ESR) & 0xEF);
so we're protected in writting but _not_ in reading - which is buggy a bit :-)
- Cyrill -
[Cyrill Gorcunov - Mon, Sep 15, 2008 at 02:01:19PM +0400]
| [Ingo Molnar - Mon, Sep 15, 2008 at 09:56:55AM +0200] | | | | * Cyrill Gorcunov <[email protected]> wrote: | | | | > We should check if we have ESR register before writting to it. | | > | | > Signed-off-by: Cyrill Gorcunov <[email protected]> | | > --- | | > | | > Please review! | | > it seems the same nit in do_boot_cpu - checking now. | | > | | > Index: linux-2.6.git/arch/x86/kernel/smpboot.c | | > =================================================================== | | > --- linux-2.6.git.orig/arch/x86/kernel/smpboot.c 2008-09-14 19:43:03.000000000 +0400 | | > +++ linux-2.6.git/arch/x86/kernel/smpboot.c 2008-09-14 21:49:36.000000000 +0400 | | > @@ -598,10 +598,12 @@ wakeup_secondary_cpu(int logical_apicid, | | > * Give the other CPU some time to accept the IPI. | | > */ | | > udelay(200); | | > - maxlvt = lapic_get_maxlvt(); | | > - if (maxlvt > 3) /* Due to the Pentium erratum 3AP. */ | | > - apic_write(APIC_ESR, 0); | | > - accept_status = (apic_read(APIC_ESR) & 0xEF); | | > + if (APIC_INTEGRATED(apic_version[phys_apicid])) { | | > + maxlvt = lapic_get_maxlvt(); | | > + if (maxlvt > 3) /* Due to the Pentium erratum 3AP. */ | | > + apic_write(APIC_ESR, 0); | | > + accept_status = (apic_read(APIC_ESR) & 0xEF); | | > + } | | > pr_debug("NMI sent.\n"); | | | | hm, is there any non-integrated lapic that has more than 3 lvts? iirc | | lvts were introduced with the integrated lapic. | | | | Ingo | | | | Yes Ingo, but don't forget the next line in former | | accept_status = (apic_read(APIC_ESR) & 0xEF); | | so we're protected in writting but _not_ in reading - which | is buggy a bit :-) | | - Cyrill -
Ingo - could you replace in this patch message and subject - writting to reading - it will be more correct.
- Cyrill -
[Ingo Molnar - Mon, Sep 15, 2008 at 09:56:55AM +0200]
| | * Cyrill Gorcunov <[email protected]> wrote: | | > We should check if we have ESR register before writting to it. | > | > Signed-off-by: Cyrill Gorcunov <[email protected]> | > --- | > | > Please review! | > it seems the same nit in do_boot_cpu - checking now. | > | > Index: linux-2.6.git/arch/x86/kernel/smpboot.c | > =================================================================== | > --- linux-2.6.git.orig/arch/x86/kernel/smpboot.c 2008-09-14 19:43:03.000000000 +0400 | > +++ linux-2.6.git/arch/x86/kernel/smpboot.c 2008-09-14 21:49:36.000000000 +0400 | > @@ -598,10 +598,12 @@ wakeup_secondary_cpu(int logical_apicid, | > * Give the other CPU some time to accept the IPI. | > */ | > udelay(200); | > - maxlvt = lapic_get_maxlvt(); | > - if (maxlvt > 3) /* Due to the Pentium erratum 3AP. */ | > - apic_write(APIC_ESR, 0); | > - accept_status = (apic_read(APIC_ESR) & 0xEF); | > + if (APIC_INTEGRATED(apic_version[phys_apicid])) { | > + maxlvt = lapic_get_maxlvt(); | > + if (maxlvt > 3) /* Due to the Pentium erratum 3AP. */ | > + apic_write(APIC_ESR, 0); | > + accept_status = (apic_read(APIC_ESR) & 0xEF); | > + } | > pr_debug("NMI sent.\n"); | | hm, is there any non-integrated lapic that has more than 3 lvts? iirc | lvts were introduced with the integrated lapic. | | Ingo |
Ingo, here is an updated version of patch - only subject and patch message updated (not patch body)
- Cyrill -
---
From: Cyrill Gorcunov <[email protected]>
Subject: x86: wakeup_secondary_cpu - check if we have ESR register to read
We shouldn't read ESR register on discrete APIC.
Check it first.
---
arch/x86/kernel/smpboot.c +6 -4
@@ -598,10 +598,12 @@ wakeup_secondary_cpu(int logical_apicid,* Give the other CPU some time to accept the IPI. */ udelay (200 ); - maxlvt =lapic_get_maxlvt (); -if (maxlvt >3 )/* Due to the Pentium erratum 3AP. */ -apic_write (APIC_ESR ,0 ); - accept_status = (apic_read (APIC_ESR ) &0xEF ); +if (APIC_INTEGRATED (apic_version[phys_apicid])) { + maxlvt =lapic_get_maxlvt (); +if (maxlvt >3 )/* Due to the Pentium erratum 3AP. */ +apic_write (APIC_ESR ,0 ); + accept_status = (apic_read (APIC_ESR ) &0xEF ); + }pr_debug ("NMI sent.\n" );if (send_status)