Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[PATCH] x86_64: Revert k8-bus.c northbridge access change
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>
authored by
Andi Kleen
and committed by
Linus Torvalds
355540f3
d2105b10
+5
-5
+5
-5
arch/x86_64/pci/k8-bus.c
+5
-5
arch/x86_64/pci/k8-bus.c
···
2
2
#include <linux/pci.h>
3
3
#include <asm/mpspec.h>
4
4
#include <linux/cpumask.h>
5
-
#include <asm/k8.h>
6
5
7
6
/*
8
7
* This discovers the pcibus <-> node mapping on AMD K8.
···
18
19
#define NR_LDT_BUS_NUMBER_REGISTERS 3
19
20
#define SECONDARY_LDT_BUS_NUMBER(dword) ((dword >> 8) & 0xFF)
20
21
#define SUBORDINATE_LDT_BUS_NUMBER(dword) ((dword >> 16) & 0xFF)
22
+
#define PCI_DEVICE_ID_K8HTCONFIG 0x1100
21
23
22
24
/**
23
25
* fill_mp_bus_to_cpumask()
···
28
28
__init static int
29
29
fill_mp_bus_to_cpumask(void)
30
30
{
31
-
int i, j, k;
31
+
struct pci_dev *nb_dev = NULL;
32
+
int i, j;
32
33
u32 ldtbus, nid;
33
34
static int lbnr[3] = {
34
35
LDT_BUS_NUMBER_REGISTER_0,
···
37
36
LDT_BUS_NUMBER_REGISTER_2
38
37
};
39
38
40
-
cache_k8_northbridges();
41
-
for (k = 0; k < num_k8_northbridges; k++) {
42
-
struct pci_dev *nb_dev = k8_northbridges[k];
39
+
while ((nb_dev = pci_get_device(PCI_VENDOR_ID_AMD,
40
+
PCI_DEVICE_ID_K8HTCONFIG, nb_dev))) {
43
41
pci_read_config_dword(nb_dev, NODE_ID_REGISTER, &nid);
44
42
45
43
for (i = 0; i < NR_LDT_BUS_NUMBER_REGISTERS; i++) {