LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Joerg Roedel <joerg.roedel@amd.com>
To: Ingo Molnar <mingo@elte.hu>
Cc: Jouni Malinen <jkmalinen@gmail.com>,
	Oliver Neukum <oliver@neukum.org>,
	Nicolas Bareil <nico@chdir.org>,
	linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, j@w1.fi,
	Joerg Roedel <joerg.roedel@amd.com>
Subject: [PATCH] x86, gart: fix gart detection for Fam11h CPUs
Date: Tue, 28 Oct 2008 16:13:54 +0100	[thread overview]
Message-ID: <1225206834-6189-1-git-send-email-joerg.roedel@amd.com> (raw)
In-Reply-To: <e785a1360810280207p1c162decs5a70b8915ea08476@mail.gmail.com>

The AMD Fam11h CPUs have a K8 northbridge. This northbridge is different
from other familys 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.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
---
 arch/x86/kernel/k8.c          |    1 -
 arch/x86/kernel/pci-gart_64.c |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/k8.c b/arch/x86/kernel/k8.c
index 304d8ba..cbc4332 100644
--- a/arch/x86/kernel/k8.c
+++ b/arch/x86/kernel/k8.c
@@ -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);
diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c
index e3f75bb..a42b02b 100644
--- a/arch/x86/kernel/pci-gart_64.c
+++ b/arch/x86/kernel/pci-gart_64.c
@@ -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;
 	}
 
-- 
1.5.6.4



  reply	other threads:[~2008-10-28 15:14 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-14  7:20 USB problem on x86_64: nommu_map_single() issue? Nicolas Bareil
2008-10-14  9:48 ` Oliver Neukum
2008-10-14 10:45   ` Nicolas Bareil
2008-10-14 11:00     ` FUJITA Tomonori
2008-10-14 11:05       ` Nicolas Bareil
2008-10-14 11:14         ` FUJITA Tomonori
2008-10-14 17:11           ` Yinghai Lu
2008-10-14 11:00     ` Oliver Neukum
2008-10-14 13:43       ` Nicolas Bareil
2008-10-14 14:15         ` Nicolas Bareil
2008-10-28  9:07       ` Jouni Malinen
2008-10-28 15:13         ` Joerg Roedel [this message]
2008-10-28 16:00           ` [PATCH] x86, gart: fix gart detection for Fam11h CPUs Ingo Molnar
2008-10-28 16:52           ` Greg KH
2008-10-29  9:55             ` Joerg Roedel
2008-10-29 23:12               ` Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1225206834-6189-1-git-send-email-joerg.roedel@amd.com \
    --to=joerg.roedel@amd.com \
    --cc=j@w1.fi \
    --cc=jkmalinen@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=nico@chdir.org \
    --cc=oliver@neukum.org \
    --subject='Re: [PATCH] x86, gart: fix gart detection for Fam11h CPUs' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).