d44647b0a6
From: "Andy Currid" <ACurrid@nvidia.com> This patch fixes a kernel panic during boot that occurs on NVIDIA platforms that have HPET enabled. When HPET is enabled, the standard timer IRQ is routed to IOAPIC pin 2 and is advertised as such in the ACPI APIC table - but an earlier workaround in the kernel was ignoring this override. The fix is to honor timer IRQ overrides from ACPI when HPET is detected on an NVIDIA platform. Signed-off-by: Andy Currid <acurrid@nvidia.com> Cc: "Brown, Len" <len.brown@intel.com> Cc: "Yu, Luming" <luming.yu@intel.com> Cc: Andi Kleen <ak@muc.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
77 lines
1.6 KiB
C
77 lines
1.6 KiB
C
/*
|
|
* Do early PCI probing for bug detection when the main PCI subsystem is
|
|
* not up yet.
|
|
*/
|
|
#include <linux/init.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/acpi.h>
|
|
|
|
#include <asm/pci-direct.h>
|
|
#include <asm/acpi.h>
|
|
#include <asm/apic.h>
|
|
|
|
#ifdef CONFIG_ACPI
|
|
|
|
static int nvidia_hpet_detected __initdata;
|
|
|
|
static int __init nvidia_hpet_check(unsigned long phys, unsigned long size)
|
|
{
|
|
nvidia_hpet_detected = 1;
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
static int __init check_bridge(int vendor, int device)
|
|
{
|
|
#ifdef CONFIG_ACPI
|
|
/* According to Nvidia all timer overrides are bogus unless HPET
|
|
is enabled. */
|
|
if (vendor == PCI_VENDOR_ID_NVIDIA) {
|
|
nvidia_hpet_detected = 0;
|
|
acpi_table_parse(ACPI_HPET, nvidia_hpet_check);
|
|
if (nvidia_hpet_detected == 0) {
|
|
acpi_skip_timer_override = 1;
|
|
}
|
|
}
|
|
#endif
|
|
if (vendor == PCI_VENDOR_ID_ATI && timer_over_8254 == 1) {
|
|
timer_over_8254 = 0;
|
|
printk(KERN_INFO "ATI board detected. Disabling timer routing "
|
|
"over 8254.\n");
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
void __init check_acpi_pci(void)
|
|
{
|
|
int num, slot, func;
|
|
|
|
/* Assume the machine supports type 1. If not it will
|
|
always read ffffffff and should not have any side effect. */
|
|
|
|
/* Poor man's PCI discovery */
|
|
for (num = 0; num < 32; num++) {
|
|
for (slot = 0; slot < 32; slot++) {
|
|
for (func = 0; func < 8; func++) {
|
|
u32 class;
|
|
u32 vendor;
|
|
class = read_pci_config(num, slot, func,
|
|
PCI_CLASS_REVISION);
|
|
if (class == 0xffffffff)
|
|
break;
|
|
|
|
if ((class >> 16) != PCI_CLASS_BRIDGE_PCI)
|
|
continue;
|
|
|
|
vendor = read_pci_config(num, slot, func,
|
|
PCI_VENDOR_ID);
|
|
|
|
if (check_bridge(vendor & 0xffff, vendor >> 16))
|
|
return;
|
|
}
|
|
|
|
}
|
|
}
|
|
}
|