[PATCH] i386/x86-64: Don't ack the APIC for bad interrupts when the APIC is not enabled
It's bad juju to touch the APIC when it hasn't been enabled. I also moved ack_bad_irq for x86-64 out of line following i386. Signed-off-by: Andi Kleen <ak@suse.de> Acked-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
7f66ae48de
commit
3777a95903
|
@ -75,8 +75,10 @@ void ack_bad_irq(unsigned int irq)
|
||||||
* holds up an irq slot - in excessive cases (when multiple
|
* holds up an irq slot - in excessive cases (when multiple
|
||||||
* unexpected vectors occur) that might lock up the APIC
|
* unexpected vectors occur) that might lock up the APIC
|
||||||
* completely.
|
* completely.
|
||||||
|
* But only ack when the APIC is enabled -AK
|
||||||
*/
|
*/
|
||||||
ack_APIC_irq();
|
if (!cpu_has_apic)
|
||||||
|
ack_APIC_irq();
|
||||||
}
|
}
|
||||||
|
|
||||||
void __init apic_intr_init(void)
|
void __init apic_intr_init(void)
|
||||||
|
@ -1303,6 +1305,7 @@ int __init APIC_init_uniprocessor (void)
|
||||||
if (!cpu_has_apic && APIC_INTEGRATED(apic_version[boot_cpu_physical_apicid])) {
|
if (!cpu_has_apic && APIC_INTEGRATED(apic_version[boot_cpu_physical_apicid])) {
|
||||||
printk(KERN_ERR "BIOS bug, local APIC #%d not detected!...\n",
|
printk(KERN_ERR "BIOS bug, local APIC #%d not detected!...\n",
|
||||||
boot_cpu_physical_apicid);
|
boot_cpu_physical_apicid);
|
||||||
|
clear_bit(X86_FEATURE_APIC, boot_cpu_data.x86_capability);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -72,6 +72,26 @@ int get_maxlvt(void)
|
||||||
return maxlvt;
|
return maxlvt;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* 'what should we do if we get a hw irq event on an illegal vector'.
|
||||||
|
* each architecture has to answer this themselves.
|
||||||
|
*/
|
||||||
|
void ack_bad_irq(unsigned int irq)
|
||||||
|
{
|
||||||
|
printk("unexpected IRQ trap at vector %02x\n", irq);
|
||||||
|
/*
|
||||||
|
* Currently unexpected vectors happen only on SMP and APIC.
|
||||||
|
* We _must_ ack these because every local APIC has only N
|
||||||
|
* irq slots per priority level, and a 'hanging, unacked' IRQ
|
||||||
|
* holds up an irq slot - in excessive cases (when multiple
|
||||||
|
* unexpected vectors occur) that might lock up the APIC
|
||||||
|
* completely.
|
||||||
|
* But don't ack when the APIC is disabled. -AK
|
||||||
|
*/
|
||||||
|
if (!disable_apic)
|
||||||
|
ack_APIC_irq();
|
||||||
|
}
|
||||||
|
|
||||||
void clear_local_APIC(void)
|
void clear_local_APIC(void)
|
||||||
{
|
{
|
||||||
int maxlvt;
|
int maxlvt;
|
||||||
|
|
|
@ -16,23 +16,6 @@
|
||||||
#define set_softirq_pending(x) write_pda(__softirq_pending, (x))
|
#define set_softirq_pending(x) write_pda(__softirq_pending, (x))
|
||||||
#define or_softirq_pending(x) or_pda(__softirq_pending, (x))
|
#define or_softirq_pending(x) or_pda(__softirq_pending, (x))
|
||||||
|
|
||||||
/*
|
extern void ack_bad_irq(unsigned int irq);
|
||||||
* 'what should we do if we get a hw irq event on an illegal vector'.
|
|
||||||
* each architecture has to answer this themselves.
|
|
||||||
*/
|
|
||||||
static inline void ack_bad_irq(unsigned int irq)
|
|
||||||
{
|
|
||||||
printk("unexpected IRQ trap at vector %02x\n", irq);
|
|
||||||
#ifdef CONFIG_X86_LOCAL_APIC
|
|
||||||
/*
|
|
||||||
* Currently unexpected vectors happen only on SMP and APIC.
|
|
||||||
* We _must_ ack these because every local APIC has only N
|
|
||||||
* irq slots per priority level, and a 'hanging, unacked' IRQ
|
|
||||||
* holds up an irq slot - in excessive cases (when multiple
|
|
||||||
* unexpected vectors occur) that might lock up the APIC
|
|
||||||
* completely.
|
|
||||||
*/
|
|
||||||
ack_APIC_irq();
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
#endif /* __ASM_HARDIRQ_H */
|
#endif /* __ASM_HARDIRQ_H */
|
||||||
|
|
Loading…
Reference in New Issue