[PATCH 05/05] x86_64: family 10h and 11h to k8topology

[PATCH 05/05] x86_64: family 10h and 11h to k8topology

[Yinghai Lu]

[-- Attachment #1: Type: text/plain, Size: 1 bytes --]



[-- Attachment #2: apicid_to_node_5.diff --]
[-- Type: text/x-patch, Size: 1212 bytes --]

[PATCH 05/05] x86_64: family 10h and 11h to k8topology

From: "Joachim Deguara" <joachim.deguara@amd.com>
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>

 arch/x86_64/mm/k8topology.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- a/arch/x86_64/mm/k8topology.c	2007-07-23 11:14:46.000000000 -0700
+++ b/arch/x86_64/mm/k8topology.c	2007-07-23 11:17:20.000000000 -0700
@@ -28,11 +28,15 @@
 		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; 
 	}