From: Yinghai Lu <yinghai@kernel.org>
To: jbarnes@virtuousgeek.org
Cc: Ingo Molnar <mingo@elte.hu>,
Ed Swierk <eswierk@aristanetworks.com>,
hpa@zytor.com, linux-kernel@vger.kernel.org,
linux-pci@vger.kernel.org
Subject: Subject: [PATCH] x86/pci: Detect mmconfig on nVidia MCP55 -v2
Date: Mon, 09 Feb 2009 18:00:26 -0800 [thread overview]
Message-ID: <4990DFBA.1050401@kernel.org> (raw)
In-Reply-To: <4990DF7C.1090701@kernel.org>
From: Ed Swierk <eswierk@aristanetworks.com>
Detect and enable memory-mapped PCI configuration space on the nVidia
MCP55 southbridge. Tested against 2.6.27.4 on an Arista Networks
development board with one MCP55, Coreboot firmware, no ACPI.
v2: add multi mcp55 support, and conexist with amd quad core system by Yinghai
also only enable it only when acpi=off or acpi is not built-in
Signed-off-by: Ed Swierk <eswierk@aristanetworks.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
arch/x86/pci/mmconfig-shared.c | 64 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 64 insertions(+)
Index: linux-2.6/arch/x86/pci/mmconfig-shared.c
===================================================================
--- linux-2.6.orig/arch/x86/pci/mmconfig-shared.c
+++ linux-2.6/arch/x86/pci/mmconfig-shared.c
@@ -166,6 +166,68 @@ static const char __init *pci_mmcfg_amd_
return "AMD Family 10h NB";
}
+static bool __initdata mcp55_checked;
+static const char __init *pci_mmcfg_nvidia_mcp55(void)
+{
+ int bus;
+ int mcp55_mmconf_found = 0;
+
+ static const u32 extcfg_regnum = 0x90;
+ static const u32 extcfg_regsize = 4;
+ static const u32 extcfg_enable_mask = 1<<31;
+ static const u32 extcfg_start_mask = 0xff<<16;
+ static const int extcfg_start_shift = 16;
+ static const u32 extcfg_size_mask = 0x3<<28;
+ static const int extcfg_size_shift = 28;
+ static const int extcfg_sizebus[] = {0x100, 0x80, 0x40, 0x20};
+ static const u32 extcfg_base_mask[] = {0x7ff8, 0x7ffc, 0x7ffe, 0x7fff};
+ static const int extcfg_base_lshift = 25;
+
+ /*
+ * do check if amd fam10h already took over
+ */
+ if (!acpi_disabled || pci_mmcfg_config_num || mcp55_checked)
+ return NULL;
+
+ mcp55_checked = true;
+ for (bus = 0; bus < 256; bus++) {
+ u64 base;
+ u32 l, extcfg;
+ u16 vendor, device;
+ int start, size_index, end;
+
+ raw_pci_ops->read(0, bus, PCI_DEVFN(0, 0), 0, 4, &l);
+ vendor = l & 0xffff;
+ device = (l >> 16) & 0xffff;
+
+ if (PCI_VENDOR_ID_NVIDIA != vendor || 0x0369 != device)
+ continue;
+
+ raw_pci_ops->read(0, bus, PCI_DEVFN(0, 0), extcfg_regnum,
+ extcfg_regsize, &extcfg);
+
+ if (!(extcfg & extcfg_enable_mask))
+ continue;
+
+ if (extend_mmcfg(1) == -1)
+ continue;
+
+ size_index = (extcfg & extcfg_size_mask) >> extcfg_size_shift;
+ base = extcfg & extcfg_base_mask[size_index];
+ /* base could > 4G */
+ base <<= extcfg_base_lshift;
+ start = (extcfg & extcfg_start_mask) >> extcfg_start_shift;
+ end = start + extcfg_sizebus[size_index] - 1;
+ fill_one_mmcfg(base, 0, start, end);
+ mcp55_mmconf_found++;
+ }
+
+ if (!mcp55_mmconf_found)
+ return NULL;
+
+ return "nVidia MCP55";
+}
+
struct pci_mmcfg_hostbridge_probe {
u32 bus;
u32 devfn;
@@ -183,6 +245,8 @@ static struct pci_mmcfg_hostbridge_probe
0x1200, pci_mmcfg_amd_fam10h },
{ 0xff, PCI_DEVFN(0, 0), PCI_VENDOR_ID_AMD,
0x1200, pci_mmcfg_amd_fam10h },
+ { 0, PCI_DEVFN(0, 0), PCI_VENDOR_ID_NVIDIA,
+ 0x0369, pci_mmcfg_nvidia_mcp55 },
};
static int __init cmp_mmcfg(const void *x1, const void *x2)
next prev parent reply other threads:[~2009-02-10 2:01 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-04 16:39 [PATCH] Detect mmconfig on nVidia MCP55 Ed Swierk
2009-02-04 17:04 ` Ingo Molnar
2009-02-05 17:05 ` Tvrtko Ursulin
2009-02-05 18:00 ` Ingo Molnar
2009-02-06 11:30 ` Tvrtko Ursulin
2009-02-06 15:42 ` Ingo Molnar
2009-02-06 16:10 ` Tvrtko Ursulin
2009-02-09 19:26 ` Ed Swierk
2009-02-09 19:42 ` Yinghai Lu
2009-02-04 17:07 ` Loic Prylli
2009-02-04 17:37 ` Ed Swierk
2009-02-04 20:00 ` Yinghai Lu
2009-02-04 20:12 ` Yinghai Lu
2009-02-04 21:25 ` Ingo Molnar
2009-02-04 23:10 ` Yinghai Lu
2009-02-10 1:59 ` [PATCH] x86/pci: host mmconfig detect clean up v3 Yinghai Lu
2009-02-10 2:00 ` Yinghai Lu [this message]
2009-02-10 22:57 ` Subject: [PATCH] x86/pci: Detect mmconfig on nVidia MCP55 -v2 Ed Swierk
2009-02-11 5:05 ` Yinghai Lu
2009-02-11 22:00 ` Ed Swierk
2009-02-12 5:03 ` Ed Swierk
2009-02-12 5:02 ` [PATCH] x86/pci: host mmconfig detect clean up v3 Ed Swierk
2009-02-05 2:24 ` [PATCH] x86/pci: host mmconfig detect clean up v2 Yinghai Lu
2009-02-05 18:15 ` Ingo Molnar
2009-02-05 18:31 ` Yinghai Lu
2009-02-05 22:04 ` Ed Swierk
2009-02-05 22:36 ` Yinghai Lu
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=4990DFBA.1050401@kernel.org \
--to=yinghai@kernel.org \
--cc=eswierk@aristanetworks.com \
--cc=hpa@zytor.com \
--cc=jbarnes@virtuousgeek.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=mingo@elte.hu \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).