Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3777a959 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[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: default avatarAndi Kleen <ak@suse.de>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7f66ae48

arch/i386/kernel/apic.c

+4 −1
Original line number Diff line number Diff line
@@ -75,7 +75,9 @@ void ack_bad_irq(unsigned int irq) 
	 * holds up an irq slot - in excessive cases (when multiple

	 * unexpected vectors occur) that might lock up the APIC

	 * completely.

	 * But only ack when the APIC is enabled -AK

	 */

	if (!cpu_has_apic)

		ack_APIC_irq();

}
@@ -1303,6 +1305,7 @@ int __init APIC_init_uniprocessor (void) 
	if (!cpu_has_apic && APIC_INTEGRATED(apic_version[boot_cpu_physical_apicid])) {

		printk(KERN_ERR "BIOS bug, local APIC #%d not detected!...\n",

			boot_cpu_physical_apicid);

		clear_bit(X86_FEATURE_APIC, boot_cpu_data.x86_capability);

		return -1;

	}

arch/x86_64/kernel/apic.c

+20 −0
Original line number Diff line number Diff line
@@ -72,6 +72,26 @@ int get_maxlvt(void) 
	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)

{

	int maxlvt;

include/asm-x86_64/hardirq.h

+2 −19
Original line number Diff line number Diff line
@@ -16,23 +16,6 @@ 
#define set_softirq_pending(x) write_pda(__softirq_pending, (x))

#define or_softirq_pending(x)  or_pda(__softirq_pending, (x))



/*

 * '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

}

extern void ack_bad_irq(unsigned int irq);



#endif /* __ASM_HARDIRQ_H */