Re: [PATCH] x86_64: use apic core id bits for core nums

["Yinghai Lu" <yhlu.kernel@gmail.com>]

On 7/21/07, Andi Kleen <ak@suse.de> wrote:
> On Saturday 21 July 2007 09:56:15 Yinghai Lu wrote:
> > please check my version, we should use core id bits instead.
> >
> > it should replace
> > [PATCH for review] [37/48] x86_64: make k8topology multi-core aware
>
> Yes, you're right the patch is not good. It should probably use
> information from the regular CPU setup code, not touch cpuid
> directly
>
> I'll drop it for now

too bad, just figure out you dropped wrong one.

following one 36/48 is right. please apply it again.

37/48 got into the mainline. that is wrong. please use
http://lkml.org/lkml/2007/7/22/7
[PATCH 2/3] x86_64: use core id bits for apicid_to_node initialization v2
that is rebased to 37/48.

YH


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>

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

Index: linux/arch/x86_64/mm/k8topology.c
===================================================================
--- linux.orig/arch/x86_64/mm/k8topology.c
+++ linux/arch/x86_64/mm/k8topology.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;
       }
-