x86: apic - lapic_setup_esr does not handle esr_disable - fix it
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/2 x86: apic - lapic_setup_esr does not handle esr_disable - fix it
lapic_setup_esr doesn't handle esr_disable inquire. The error brought in during unification process. Fix it.
Signed-off-by Cyrill Gorcunov <[email protected]>
---
I've simplified this procedure, ie the algo is following
- check if apic is not 82489DX (which doesn't have ESR at all)
- check if ESR was asked to not being touched
- normal handling of ESR
arch/x86/kernel/apic.c +34 -31
@@ -1081,40 +1081,43 @@ void __init init_bsp_APIC(void)static void __cpuinit lapic_setup_esr (void ) { -unsigned long oldvalue, value, maxlvt; -if (lapic_is_integrated () && !esr_disable) { -if (esr_disable) { -/* -* Something untraceable is creating bad interrupts on -* secondary quads ... for the moment, just leave the -* ESR disabled - we can't do anything useful with the -* errors anyway - mbligh -*/ -printk (KERN_INFO "Leaving ESR disabled.\n" ); -return ; - } -/* !82489DX */ - maxlvt =lapic_get_maxlvt (); -if (maxlvt >3 )/* Due to the Pentium erratum 3AP. */ -apic_write (APIC_ESR ,0 ); - oldvalue =apic_read (APIC_ESR ); - -/* enables sending errors */ - value =ERROR_APIC_VECTOR ; -apic_write (APIC_LVTERR , value); +unsigned int oldvalue, value, maxlvt; + +if (!lapic_is_integrated ()) { +printk (KERN_INFO "No ESR for 82489DX.\n" ); +return ; + } + +if (esr_disable) {/* -* spec says clear errors after enabling vector. +* Something untraceable is creating bad interrupts on +* secondary quads ... for the moment, just leave the +* ESR disabled - we can't do anything useful with the +* errors anyway - mbligh */ -if (maxlvt >3 ) -apic_write (APIC_ESR ,0 ); - value =apic_read (APIC_ESR ); -if (value != oldvalue) -apic_printk (APIC_VERBOSE ,"ESR value before enabling " -"vector: 0x%08lx after: 0x%08lx\n" , - oldvalue, value); - }else { -printk (KERN_INFO "No ESR for 82489DX.\n" ); +printk (KERN_INFO "Leaving ESR disabled.\n" ); +return ; } + + maxlvt =lapic_get_maxlvt (); +if (maxlvt >3 )/* Due to the Pentium erratum 3AP. */ +apic_write (APIC_ESR ,0 ); + oldvalue =apic_read (APIC_ESR ); + +/* enables sending errors */ + value =ERROR_APIC_VECTOR ; +apic_write (APIC_LVTERR , value); + +/* +* spec says clear errors after enabling vector. +*/ +if (maxlvt >3 ) +apic_write (APIC_ESR ,0 ); + value =apic_read (APIC_ESR ); +if (value != oldvalue) +apic_printk (APIC_VERBOSE ,"ESR value before enabling " +"vector: 0x%08x after: 0x%08x\n" , + oldvalue, value); }
PATCH 2/2 x86: apic - skip writting ESR register if we dont have on
In reply to a message not in the archiveOn 82489DX we don't have ESR register so we should not write it.
Signed-off-by Cyrill Gorcunov <[email protected]>
---
arch/x86/kernel/apic.c +1 -1
@@ -1131,7 +1131,7 @@ void __cpuinit setup_local_APIC(void)#ifdef CONFIG_X86_32 /* Pound the ESR really hard over the head with a big hammer - mbligh */ -if (esr_disable) { +if (lapic_is_integrated () && esr_disable) {apic_write (APIC_ESR ,0 );apic_write (APIC_ESR ,0 );apic_write (APIC_ESR ,0 );