Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 355540f3 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[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: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d2105b10

arch/x86_64/pci/k8-bus.c

+5 −5
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#include <linux/pci.h>

#include <asm/mpspec.h>

#include <linux/cpumask.h>

#include <asm/k8.h>



/*

 * This discovers the pcibus <-> node mapping on AMD K8.
@@ -19,6 +18,7 @@ 
#define NR_LDT_BUS_NUMBER_REGISTERS 3

#define SECONDARY_LDT_BUS_NUMBER(dword) ((dword >> 8) & 0xFF)

#define SUBORDINATE_LDT_BUS_NUMBER(dword) ((dword >> 16) & 0xFF)

#define PCI_DEVICE_ID_K8HTCONFIG 0x1100



/**

 * fill_mp_bus_to_cpumask()
@@ -28,7 +28,8 @@ 
__init static int

fill_mp_bus_to_cpumask(void)

{

	int i, j, k;

	struct pci_dev *nb_dev = NULL;

	int i, j;

	u32 ldtbus, nid;

	static int lbnr[3] = {

		LDT_BUS_NUMBER_REGISTER_0,
@@ -36,9 +37,8 @@ fill_mp_bus_to_cpumask(void) 
		LDT_BUS_NUMBER_REGISTER_2

	};



	cache_k8_northbridges();

	for (k = 0; k < num_k8_northbridges; k++) {

		struct pci_dev *nb_dev = k8_northbridges[k];

	while ((nb_dev = pci_get_device(PCI_VENDOR_ID_AMD,

			PCI_DEVICE_ID_K8HTCONFIG, nb_dev))) {

		pci_read_config_dword(nb_dev, NODE_ID_REGISTER, &nid);



		for (i = 0; i < NR_LDT_BUS_NUMBER_REGISTERS; i++) {