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

Commit 9b94b3a1 authored by Andreas Herrmann's avatar Andreas Herrmann Committed by Ingo Molnar
Browse files

x86: fixup numa_node information for AMD CPU northbridge functions 



Currently the numa_node attribute for these PCI devices is 0 (it
corresponds to the numa_node for PCI bus 0). This is not a big issue
but incorrect.

This inconsistency can be fixed by reading the node number from CPU
NB function 0.

[ Impact: fill in dev->numa_node information, to optimize DMA allocations ]

Signed-off-by: default avatarAndreas Herrmann <andreas.herrmann3@amd.com>
Cc: jbarnes@virtuousgeek.org
LKML-Reference: <20090417100746.GG16198@alberich.amd.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent b206525a

arch/x86/kernel/quirks.c

+37 −0
Original line number Original line Diff line number Diff line
@@ -493,5 +493,42 @@ void force_hpet_resume(void) 
		break;

		break;

	}

	}

}

}

#endif



#if defined(CONFIG_PCI) && defined(CONFIG_NUMA)

/* Set correct numa_node information for AMD NB functions */

static void __init quirk_amd_nb_node(struct pci_dev *dev)

{

	struct pci_dev *nb_ht;

	unsigned int devfn;

	u32 val;



	devfn = PCI_DEVFN(PCI_SLOT(dev->devfn), 0);

	nb_ht = pci_get_slot(dev->bus, devfn);

	if (!nb_ht)

		return;



	pci_read_config_dword(nb_ht, 0x60, &val);

	set_dev_node(&dev->dev, val & 7);

	pci_dev_put(dev);

}





DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB,

			quirk_amd_nb_node);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_ADDRMAP,

			quirk_amd_nb_node);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MEMCTL,

			quirk_amd_nb_node);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MISC,

			quirk_amd_nb_node);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_10H_NB_HT,

			quirk_amd_nb_node);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_10H_NB_MAP,

			quirk_amd_nb_node);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_10H_NB_DRAM,

			quirk_amd_nb_node);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_10H_NB_MISC,

			quirk_amd_nb_node);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_10H_NB_LINK,

			quirk_amd_nb_node);

#endif
 
#endif