From patchwork Wed Feb 4 16:39:12 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ed Swierk X-Patchwork-Id: 5404 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n14GdAre008902 for ; Wed, 4 Feb 2009 16:39:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752353AbZBDQjW (ORCPT ); Wed, 4 Feb 2009 11:39:22 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752463AbZBDQjV (ORCPT ); Wed, 4 Feb 2009 11:39:21 -0500 Received: from mail-gx0-f21.google.com ([209.85.217.21]:63807 "EHLO mail-gx0-f21.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751942AbZBDQjU (ORCPT ); Wed, 4 Feb 2009 11:39:20 -0500 Received: by gxk14 with SMTP id 14so2175763gxk.13 for ; Wed, 04 Feb 2009 08:39:18 -0800 (PST) Received: by 10.142.13.13 with SMTP id 13mr1271946wfm.280.1233765558285; Wed, 04 Feb 2009 08:39:18 -0800 (PST) Received: from ?172.17.2.29? (65-119-47-100.dia.static.qwest.net [65.119.47.100]) by mx.google.com with ESMTPS id 30sm12802656wff.52.2009.02.04.08.39.16 (version=SSLv3 cipher=RC4-MD5); Wed, 04 Feb 2009 08:39:17 -0800 (PST) Subject: [PATCH] Detect mmconfig on nVidia MCP55 From: Ed Swierk To: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, lenb@kernel.org, linux-acpi@vger.kernel.org, jbarnes@virtuousgeek.org, linux-pci@vger.kernel.org Date: Wed, 04 Feb 2009 08:39:12 -0800 Message-Id: <1233765552.16414.6.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.24.3 (2.24.3-1.fc10) Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Detect and enable memory-mapped PCI configuration space on the nVidia MCP55 southbridge even if the ACPI MCFG table is missing or wrong. Signed-off-by: Ed Swierk --- -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux-2.6.27.4/arch/x86/pci/mmconfig-shared.c =================================================================== --- linux-2.6.27.4.orig/arch/x86/pci/mmconfig-shared.c +++ linux-2.6.27.4/arch/x86/pci/mmconfig-shared.c @@ -155,6 +155,26 @@ static const char __init *pci_mmcfg_amd_ return "AMD Family 10h NB"; } +static const char __init *pci_mmcfg_nvidia_mcp55(void) +{ + u32 extcfg; + + raw_pci_ops->read(0, 0, PCI_DEVFN(0, 0), 0x90, 4, &extcfg); + + if (!(extcfg & 0x80000000)) + return NULL; + pci_mmcfg_config = kzalloc(sizeof(pci_mmcfg_config[0]), GFP_KERNEL); + if (!pci_mmcfg_config) + return NULL; + pci_mmcfg_config[0].address = (extcfg & 0x00007fff) << 25; + pci_mmcfg_config[0].pci_segment = 0; + pci_mmcfg_config[0].start_bus_number = 0; + pci_mmcfg_config[0].end_bus_number = (1 << (8 - ((extcfg >> 28) & 3))) - 1; + pci_mmcfg_config_num = 1; + + return "nVidia MCP55"; +} + struct pci_mmcfg_hostbridge_probe { u32 bus; u32 devfn; @@ -172,6 +192,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 pci_mmcfg_check_hostbridge(void)