Commit 847d7970 authored Mar 13, 2014 by Daniel J Blueman Committed by Ingo Molnar Mar 14, 2014

x86/amd/numa: Fix northbridge quirk to assign correct NUMA node



For systems with multiple servers and routed fabric, all
northbridges get assigned to the first server. Fix this by also
using the node reported from the PCI bus. For single-fabric
systems, the northbriges are on PCI bus 0 by definition, which
are on NUMA node 0 by definition, so this is invarient on most
systems.

Tested on fam10h and fam15h single and multi-fabric systems and
candidate for stable.

Signed-off-by: Daniel J Blueman <daniel@numascale.com>
Acked-by: Steffen Persvold <sp@numascale.com>
Acked-by: Borislav Petkov <bp@suse.de>
Cc: <stable@vger.kernel.org>
Link: http://lkml.kernel.org/r/1394710981-3596-1-git-send-email-daniel@numascale.com


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent 731bd6a9

arch/x86/kernel/quirks.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -529,7 +529,7 @@ static void quirk_amd_nb_node(struct pci_dev *dev)
		return;

		pci_read_config_dword(nb_ht, 0x60, &val);
		node = val & 7;
		node = pcibus_to_node(dev->bus) \| (val & 7);
		/*
		* Some hardware may return an invalid node ID,
		* so check it first:

Admin message