2.4.31 - nforce chipset timer override bios bug workaround
In the 2.4.30/31 kernels there is now a backport from the 2.6 kernels of a workaround for buggy timer overrides in the ACPI tables for many nvidia chipset based motherboards. Unfortunately the code for this on x86-64 based systems is conditionally compiled in only for non-SMP kernels. This is a patch to remove the conditional and allow the code to be compiled in for SMP kernels as well (we've seen a number of SMP motherboards which intermittently lock up during boot, and otherwise sometimes seem unstable without the workaround). Patch so far has been tested across numerous reboots and several hours uptime.
Also part of this patch is modifications to avoid referencing the variable "swiotlb" from pci-gart.c when CONFIG_SWIOTLB is not set; without modification, an x86_64 kernel without CONFIG_SWIOTLB set breaks during compilation of arch/x86_64/kernel/pci-gart.c.
All small changes & straightforward; don't think there's anything to worry about WRT enabling the override workaround code on SMP boxes, although I'd appreciate verification from someone more familiar with the setup code.
Thanks,
-Tymm
arch/x86_64/kernel/io_apic.c +0 -2
@@ -222,7 +222,6 @@__setup ("apic" , ioapic_setup); -#ifndef CONFIG_SMP #include <asm/pci-direct.h> #include <linux/pci_ids.h> #include <linux/pci.h>
@@ -279,7 +278,6 @@ } } } -#endif static int __init ioapic_pirq_setup (char *str) {
arch/x86_64/kernel/pci-gart.c +5 -0
@@ -155,7 +155,12 @@int i;unsigned long iommu_page; +#ifdef CONFIG_SWIOTLB if (hwdev ==NULL || hwdev->dma_mask <0xffffffff || (no_iommu && !swiotlb)) +#else + if (hwdev == NULL || hwdev->dma_mask < 0xffffffff || (no_iommu)) + +#endif gfp |=GFP_DMA ;/*
arch/x86_64/kernel/setup.c +3 -1
@@ -51,8 +51,10 @@int acpi_disabled;EXPORT_SYMBOL (acpi_disabled); +#ifdef CONFIG_SWIOTLB int swiotlb;EXPORT_SYMBOL (swiotlb); +#endif extern int phys_proc_id[NR_CPUS ];
@@ -304,7 +306,7 @@#endif paging_init (); -#if !defined(CONFIG_SMP ) && defined(CONFIG_X86_IO_APIC ) +#if defined(CONFIG_X86_IO_APIC )extern void check_ioapic (void );check_ioapic ();#endif