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

Commit 66759a01 authored by Chuck Ebbert's avatar Chuck Ebbert Committed by Linus Torvalds
Browse files

[PATCH] x86-64: i386/x86-64: Fix time going twice as fast problem on ATI Xpress chipsets 



Original patch from Bertro Simul

This is probably still not quite correct, but seems to be
the best solution so far.

Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 049cdefe

Documentation/kernel-parameters.txt

+9 −0
Original line number Original line Diff line number Diff line
@@ -164,6 +164,15 @@ running once the system is up. 
			over-ride platform specific driver.

			over-ride platform specific driver.

			See also Documentation/acpi-hotkey.txt.

			See also Documentation/acpi-hotkey.txt.





	enable_timer_pin_1 [i386,x86-64]

			Enable PIN 1 of APIC timer

			Can be useful to work around chipset bugs (in particular on some ATI chipsets)

			The kernel tries to set a reasonable default.



	disable_timer_pin_1 [i386,x86-64]

			Disable PIN 1 of APIC timer

			Can be useful to work around chipset bugs.



	ad1816=		[HW,OSS]

	ad1816=		[HW,OSS]

			Format: <io>,<irq>,<dma>,<dma2>

			Format: <io>,<irq>,<dma>,<dma2>

			See also Documentation/sound/oss/AD1816.

			See also Documentation/sound/oss/AD1816.

arch/i386/kernel/acpi/earlyquirk.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -15,6 +15,13 @@ static int __init check_bridge(int vendor, int device) 
	if (vendor == PCI_VENDOR_ID_NVIDIA) {

	if (vendor == PCI_VENDOR_ID_NVIDIA) {

		acpi_skip_timer_override = 1;

		acpi_skip_timer_override = 1;

	}

	}

	/*

	 * ATI IXP chipsets get double timer interrupts.

	 * For now just do this for all ATI chipsets.

 	 * FIXME: this needs to be checked for the non ACPI case too.

	 */

	if (vendor == PCI_VENDOR_ID_ATI)

		disable_timer_pin_1 = 1;

	return 0;

	return 0;

}

}

arch/i386/kernel/io_apic.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -60,6 +60,8 @@ int sis_apic_bug = -1; 
 */

 */

int nr_ioapic_registers[MAX_IO_APICS];

int nr_ioapic_registers[MAX_IO_APICS];





int disable_timer_pin_1 __initdata;



/*

/*

 * Rough estimation of how many shared IRQs there are, can

 * Rough estimation of how many shared IRQs there are, can

 * be changed anytime.

 * be changed anytime.
@@ -2211,6 +2213,8 @@ static inline void check_timer(void) 
				setup_nmi();

				setup_nmi();

				enable_8259A_irq(0);

				enable_8259A_irq(0);

			}

			}

			if (disable_timer_pin_1 > 0)

				clear_IO_APIC_pin(0, pin1);

			return;

			return;

		}

		}

		clear_IO_APIC_pin(0, pin1);

		clear_IO_APIC_pin(0, pin1);

arch/i386/kernel/setup.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -851,6 +851,11 @@ static void __init parse_cmdline_early (char ** cmdline_p) 
#endif

#endif





#ifdef CONFIG_X86_LOCAL_APIC

#ifdef CONFIG_X86_LOCAL_APIC

		if (!memcmp(from, "disable_timer_pin_1", 19))

			disable_timer_pin_1 = 1;

		if (!memcmp(from, "enable_timer_pin_1", 18))

			disable_timer_pin_1 = -1;



		/* disable IO-APIC */

		/* disable IO-APIC */

		else if (!memcmp(from, "noapic", 6))

		else if (!memcmp(from, "noapic", 6))

			disable_ioapic_setup();

			disable_ioapic_setup();

arch/x86_64/kernel/io_apic.c

+13 −0
Original line number Original line Diff line number Diff line
@@ -44,6 +44,8 @@ int sis_apic_bug; /* not actually supported, dummy for compile */ 




static int no_timer_check;

static int no_timer_check;





int disable_timer_pin_1 __initdata;



static DEFINE_SPINLOCK(ioapic_lock);

static DEFINE_SPINLOCK(ioapic_lock);





/*

/*
@@ -297,6 +299,15 @@ void __init check_ioapic(void) 
#endif

#endif

					/* RED-PEN skip them on mptables too? */

					/* RED-PEN skip them on mptables too? */

					return;

					return;

				case PCI_VENDOR_ID_ATI:

					/* All timer interrupts on atiixp

				           are doubled. Disable one. */

					if (disable_timer_pin_1 == 0) {

						disable_timer_pin_1 = 1;

						printk(KERN_INFO

		"ATI board detected. Disabling timer pin 1.\n");

					}

					return;

				} 

				} 





				/* No multi-function device? */

				/* No multi-function device? */
@@ -1658,6 +1669,8 @@ static inline void check_timer(void) 
				setup_nmi();

				setup_nmi();

				enable_8259A_irq(0);

				enable_8259A_irq(0);

			}

			}

			if (disable_timer_pin_1 > 0)

				clear_IO_APIC_pin(0, pin1);

			return;

			return;

		}

		}

		clear_IO_APIC_pin(0, pin1);

		clear_IO_APIC_pin(0, pin1);