lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: use bus conf in NB conf fun1 to get bus range on, on 64-bit

Browse Source 
... so we use the same code with Quad core cpu as old opteron.

This patch is useful when acpi=off or _PXM is not there in DSDT.

Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Yinghai Lu
2008-02-19 03:15:08 -08:00
committed by Ingo Molnar
parent 871d5f8dd0
commit 35ddd068fb
1 changed files with 47 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
arch/x86/pci/k8-bus_64.c
View File

@@ -12,15 +12,18 @@
* RED-PEN empty cpus get reported wrong * RED-PEN empty cpus get reported wrong
*/ */
#define NODE_ID_REGISTER 0x60 #define NODE_ID(dword) ((dword>>4) & 0x07)
#define NODE_ID(dword) (dword & 0x07) #define LDT_BUS_NUMBER_REGISTER_0 0xE0
#define LDT_BUS_NUMBER_REGISTER_0 0x94 #define LDT_BUS_NUMBER_REGISTER_1 0xE4
#define LDT_BUS_NUMBER_REGISTER_1 0xB4 #define LDT_BUS_NUMBER_REGISTER_2 0xE8
#define LDT_BUS_NUMBER_REGISTER_2 0xD4 #define LDT_BUS_NUMBER_REGISTER_3 0xEC
#define NR_LDT_BUS_NUMBER_REGISTERS 3 #define NR_LDT_BUS_NUMBER_REGISTERS 4
#define SECONDARY_LDT_BUS_NUMBER(dword) ((dword >> 8) & 0xFF) #define SECONDARY_LDT_BUS_NUMBER(dword) ((dword >> 16) & 0xFF)
#define SUBORDINATE_LDT_BUS_NUMBER(dword) ((dword >> 16) & 0xFF) #define SUBORDINATE_LDT_BUS_NUMBER(dword) ((dword >> 24) & 0xFF)
#define PCI_DEVICE_ID_K8HTCONFIG 0x1100 #define PCI_DEVICE_ID_K8HTCONFIG 0x1100
#define PCI_DEVICE_ID_K8_10H_HTCONFIG 0x1200
#define PCI_DEVICE_ID_K8_11H_HTCONFIG 0x1300
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
@@ -67,12 +70,19 @@ early_fill_mp_bus_to_node(void)
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
int i, j; int i, j;
unsigned slot; unsigned slot;
u32 ldtbus, nid; u32 ldtbus;
u32 id; u32 id;
static int lbnr[3] = { int node;
u16 deviceid;
u16 vendorid;
int min_bus;
int max_bus;
static int lbnr[NR_LDT_BUS_NUMBER_REGISTERS] = {
LDT_BUS_NUMBER_REGISTER_0, LDT_BUS_NUMBER_REGISTER_0,
LDT_BUS_NUMBER_REGISTER_1, LDT_BUS_NUMBER_REGISTER_1,
LDT_BUS_NUMBER_REGISTER_2 LDT_BUS_NUMBER_REGISTER_2,
LDT_BUS_NUMBER_REGISTER_3
}; };
for (i = 0; i < BUS_NR; i++) for (i = 0; i < BUS_NR; i++)
@@ -81,38 +91,36 @@ early_fill_mp_bus_to_node(void)
if (!early_pci_allowed()) if (!early_pci_allowed())
return -1; return -1;
for (slot = 0x18; slot < 0x20; slot++) { slot = 0x18;
id = read_pci_config(0, slot, 0, PCI_VENDOR_ID); id = read_pci_config(0, slot, 0, PCI_VENDOR_ID);
if (id != (PCI_VENDOR_ID_AMD | (PCI_DEVICE_ID_K8HTCONFIG<<16)))
break;
nid = read_pci_config(0, slot, 0, NODE_ID_REGISTER);
for (i = 0; i < NR_LDT_BUS_NUMBER_REGISTERS; i++) { vendorid = id & 0xffff;
ldtbus = read_pci_config(0, slot, 0, lbnr[i]); if (vendorid != PCI_VENDOR_ID_AMD)
/* goto out;
* if there are no busses hanging off of the current
* ldt link then both the secondary and subordinate deviceid = (id>>16) & 0xffff;
* bus number fields are set to 0. if ((deviceid != PCI_DEVICE_ID_K8HTCONFIG) &&
* (deviceid != PCI_DEVICE_ID_K8_10H_HTCONFIG) &&
* RED-PEN (deviceid != PCI_DEVICE_ID_K8_11H_HTCONFIG))
* This is slightly broken because it assumes goto out;
* HT node IDs == Linux node ids, which is not always
* true. However it is probably mostly true. for (i = 0; i < NR_LDT_BUS_NUMBER_REGISTERS; i++) {
*/ ldtbus = read_pci_config(0, slot, 1, lbnr[i]);
if (!(SECONDARY_LDT_BUS_NUMBER(ldtbus) == 0
&& SUBORDINATE_LDT_BUS_NUMBER(ldtbus) == 0)) { /* Check if that register is enabled for bus range */
for (j = SECONDARY_LDT_BUS_NUMBER(ldtbus); if ((ldtbus & 7) != 3)
j <= SUBORDINATE_LDT_BUS_NUMBER(ldtbus); continue;
j++) {
int node = NODE_ID(nid); min_bus = SECONDARY_LDT_BUS_NUMBER(ldtbus);
mp_bus_to_node[j] = (unsigned char)node; max_bus = SUBORDINATE_LDT_BUS_NUMBER(ldtbus);
} node = NODE_ID(ldtbus);
} for (j = min_bus; j <= max_bus; j++)
} mp_bus_to_node[j] = (unsigned char) node;
} }
out:
for (i = 0; i < BUS_NR; i++) { for (i = 0; i < BUS_NR; i++) {
int node = mp_bus_to_node[i]; node = mp_bus_to_node[i];
if (node >= 0) if (node >= 0)
printk(KERN_DEBUG "bus: %02x to node: %02x\n", i, node); printk(KERN_DEBUG "bus: %02x to node: %02x\n", i, node);
} }