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

Commit 0b6a39f7 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Revert "x86: fix ioapic bug again" 



This reverts commit 6e908947.

Németh Márton reported:

| there is a problem in 2.6.26-rc3 which was not there in case of
| 2.6.25: the CPU wakes up ~90,000 times per sec instead of ~60 per sec.
|
| I also "git bisected" the problem, the result is:
|
| 6e908947 is first bad commit
| commit 6e908947
| Author: Ingo Molnar <mingo@elte.hu>
| Date:   Fri Mar 21 14:32:36 2008 +0100
|
|     x86: fix ioapic bug again

the original problem is fixed by Maciej W. Rozycki in the tip/x86/apic
branch (confirmed by Márton), but those changes are too intrusive for
v2.6.26 so we'll go for the less intrusive (repeated) revert now.

Reported-and-bisected-by: default avatarNémeth Márton <nm127@freemail.hu>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 86b2b70e

arch/x86/kernel/io_apic_32.c

+2 −10
Original line number Original line Diff line number Diff line
@@ -2130,14 +2130,10 @@ static inline void __init check_timer(void) 
{

{

	int apic1, pin1, apic2, pin2;

	int apic1, pin1, apic2, pin2;

	int vector;

	int vector;

	unsigned int ver;

	unsigned long flags;

	unsigned long flags;





	local_irq_save(flags);

	local_irq_save(flags);





	ver = apic_read(APIC_LVR);

	ver = GET_APIC_VERSION(ver);



	/*

	/*

	 * get/set the timer IRQ vector:

	 * get/set the timer IRQ vector:

	 */

	 */
@@ -2150,15 +2146,11 @@ static inline void __init check_timer(void) 
	 * mode for the 8259A whenever interrupts are routed

	 * mode for the 8259A whenever interrupts are routed

	 * through I/O APICs.  Also IRQ0 has to be enabled in

	 * through I/O APICs.  Also IRQ0 has to be enabled in

	 * the 8259A which implies the virtual wire has to be

	 * the 8259A which implies the virtual wire has to be

	 * disabled in the local APIC.  Finally timer interrupts

	 * disabled in the local APIC.

	 * need to be acknowledged manually in the 8259A for

	 * timer_interrupt() and for the i82489DX when using

	 * the NMI watchdog.

	 */

	 */

	apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT);

	apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT);

	init_8259A(1);

	init_8259A(1);

	timer_ack = !cpu_has_tsc;

	timer_ack = 1;

	timer_ack |= (nmi_watchdog == NMI_IO_APIC && !APIC_INTEGRATED(ver));

	if (timer_over_8254 > 0)

	if (timer_over_8254 > 0)

		enable_8259A_irq(0);

		enable_8259A_irq(0);

arch/x86/kernel/nmi_32.c

+2 −7
Original line number Original line Diff line number Diff line
@@ -26,7 +26,6 @@ 




#include <asm/smp.h>

#include <asm/smp.h>

#include <asm/nmi.h>

#include <asm/nmi.h>

#include <asm/timer.h>





#include "mach_traps.h"

#include "mach_traps.h"
@@ -82,7 +81,7 @@ int __init check_nmi_watchdog(void) 




	prev_nmi_count = kmalloc(NR_CPUS * sizeof(int), GFP_KERNEL);

	prev_nmi_count = kmalloc(NR_CPUS * sizeof(int), GFP_KERNEL);

	if (!prev_nmi_count)

	if (!prev_nmi_count)

		goto error;

		return -1;





	printk(KERN_INFO "Testing NMI watchdog ... ");

	printk(KERN_INFO "Testing NMI watchdog ... ");
@@ -119,7 +118,7 @@ int __init check_nmi_watchdog(void) 
	if (!atomic_read(&nmi_active)) {

	if (!atomic_read(&nmi_active)) {

		kfree(prev_nmi_count);

		kfree(prev_nmi_count);

		atomic_set(&nmi_active, -1);

		atomic_set(&nmi_active, -1);

		goto error;

		return -1;

	}

	}

	printk("OK.\n");

	printk("OK.\n");
@@ -130,10 +129,6 @@ int __init check_nmi_watchdog(void) 




	kfree(prev_nmi_count);

	kfree(prev_nmi_count);

	return 0;

	return 0;

error:

	timer_ack = !cpu_has_tsc;



	return -1;

}

}





static int __init setup_nmi_watchdog(char *str)

static int __init setup_nmi_watchdog(char *str)