summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoachim Deguara <joachim.deguara@amd.com>2008-01-30 13:34:12 +0100
committerIngo Molnar <mingo@elte.hu>2008-01-30 13:34:12 +0100
commitbb4a1d644a84e7e9d1d1fa9d1c7d1017b02e0947 (patch)
treeb4edb770e21ae8459474836e6e2e14fb99e057af
parentx86: fix early_ioremap pagetable ops (diff)
downloadlinux-bb4a1d644a84e7e9d1d1fa9d1c7d1017b02e0947.tar.xz
linux-bb4a1d644a84e7e9d1d1fa9d1c7d1017b02e0947.zip
x86: add PCI IDs to k8topology_64.c
This just adds the PCI IDs of AMD's family 10h and 11h CPU's northbridges to k8topology discovery. Signed-off-by: Joachim Deguara <joachim.deguara@amd.com> Signed-off-by: Andi Kleen <ak@suse.de> Acked-by: Yinghai Lu <yinghai.lu@sun.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/x86/mm/k8topology_64.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/x86/mm/k8topology_64.c b/arch/x86/mm/k8topology_64.c
index 32b963de9b8f..7a2ebce87df5 100644
--- a/arch/x86/mm/k8topology_64.c
+++ b/arch/x86/mm/k8topology_64.c
@@ -28,11 +28,15 @@ static __init int find_northbridge(void)
u32 header;
header = read_pci_config(0, num, 0, 0x00);
- if (header != (PCI_VENDOR_ID_AMD | (0x1100<<16)))
+ if (header != (PCI_VENDOR_ID_AMD | (0x1100<<16)) &&
+ header != (PCI_VENDOR_ID_AMD | (0x1200<<16)) &&
+ header != (PCI_VENDOR_ID_AMD | (0x1300<<16)))
continue;
header = read_pci_config(0, num, 1, 0x00);
- if (header != (PCI_VENDOR_ID_AMD | (0x1101<<16)))
+ if (header != (PCI_VENDOR_ID_AMD | (0x1101<<16)) &&
+ header != (PCI_VENDOR_ID_AMD | (0x1201<<16)) &&
+ header != (PCI_VENDOR_ID_AMD | (0x1301<<16)))
continue;
return num;
}