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

Commit 87c6f401 authored by Joerg Roedel's avatar Joerg Roedel Committed by Ingo Molnar
Browse files

x86, gart: fix gart detection for Fam11h CPUs 



Impact: fix AMD Family 11h boot hangs / USB device problems

The AMD Fam11h CPUs have a K8 northbridge. This northbridge is different
from other family's because it lacks GART support (as I just learned).

But the kernel implicitly expects a GART if it finds an AMD northbridge.

Fix this by removing the Fam11h northbridge id from the scan list of K8
northbridges. This patch also changes the message in the GART driver
about missing K8 northbridges to tell that the GART is missing which is
the correct information in this case.

Reported-by: default avatarJouni Malinen <jkmalinen@gmail.com>
Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 11a6b0c9

arch/x86/kernel/k8.c

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ static u32 *flush_words; 
struct pci_device_id k8_nb_ids[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MISC) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_10H_NB_MISC) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_11H_NB_MISC) },

	{}

};

EXPORT_SYMBOL(k8_nb_ids);

arch/x86/kernel/pci-gart_64.c

+1 −1
Original line number Diff line number Diff line
@@ -744,7 +744,7 @@ void __init gart_iommu_init(void) 
	long i;



	if (cache_k8_northbridges() < 0 || num_k8_northbridges == 0) {

		printk(KERN_INFO "PCI-GART: No AMD northbridge found.\n");

		printk(KERN_INFO "PCI-GART: No AMD GART found.\n");

		return;

	}