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

[PATCH] x86_64: Revert k8-bus.c northbridge access change

Browse Source 
As Travis Betak points out it accesses the wrong northbridge subfunction
now. Switch back to the old code.

Cc: "Travis Betak" <betak@mpdtxmail.amd.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Andi Kleen
2006-07-29 21:42:46 +02:00
committed by Linus Torvalds
parent d2105b10fe
commit 355540f333
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/x86_64/pci/k8-bus.c
View File

@@ -2,7 +2,6 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <asm/mpspec.h> #include <asm/mpspec.h>
#include <linux/cpumask.h> #include <linux/cpumask.h>
#include <asm/k8.h>
/* /*
* This discovers the pcibus <-> node mapping on AMD K8. * This discovers the pcibus <-> node mapping on AMD K8.
@@ -19,6 +18,7 @@
#define NR_LDT_BUS_NUMBER_REGISTERS 3 #define NR_LDT_BUS_NUMBER_REGISTERS 3
#define SECONDARY_LDT_BUS_NUMBER(dword) ((dword >> 8) & 0xFF) #define SECONDARY_LDT_BUS_NUMBER(dword) ((dword >> 8) & 0xFF)
#define SUBORDINATE_LDT_BUS_NUMBER(dword) ((dword >> 16) & 0xFF) #define SUBORDINATE_LDT_BUS_NUMBER(dword) ((dword >> 16) & 0xFF)
#define PCI_DEVICE_ID_K8HTCONFIG 0x1100
/** /**
* fill_mp_bus_to_cpumask() * fill_mp_bus_to_cpumask()
@@ -28,7 +28,8 @@
__init static int __init static int
fill_mp_bus_to_cpumask(void) fill_mp_bus_to_cpumask(void)
{ {
int i, j, k; struct pci_dev *nb_dev = NULL;
int i, j;
u32 ldtbus, nid; u32 ldtbus, nid;
static int lbnr[3] = { static int lbnr[3] = {
LDT_BUS_NUMBER_REGISTER_0, LDT_BUS_NUMBER_REGISTER_0,
@@ -36,9 +37,8 @@ fill_mp_bus_to_cpumask(void)
LDT_BUS_NUMBER_REGISTER_2 LDT_BUS_NUMBER_REGISTER_2
}; };
cache_k8_northbridges(); while ((nb_dev = pci_get_device(PCI_VENDOR_ID_AMD,
for (k = 0; k < num_k8_northbridges; k++) { PCI_DEVICE_ID_K8HTCONFIG, nb_dev))) {
struct pci_dev *nb_dev = k8_northbridges[k];
pci_read_config_dword(nb_dev, NODE_ID_REGISTER, &nid); pci_read_config_dword(nb_dev, NODE_ID_REGISTER, &nid);
for (i = 0; i < NR_LDT_BUS_NUMBER_REGISTERS; i++) { for (i = 0; i < NR_LDT_BUS_NUMBER_REGISTERS; i++) {