From patchwork Mon Apr 9 16:22:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 151452 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 33172B6FDC for ; Tue, 10 Apr 2012 02:26:18 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932183Ab2DIQ0R (ORCPT ); Mon, 9 Apr 2012 12:26:17 -0400 Received: from mail-iy0-f174.google.com ([209.85.210.174]:40501 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932108Ab2DIQ0Q (ORCPT ); Mon, 9 Apr 2012 12:26:16 -0400 Received: by mail-iy0-f174.google.com with SMTP id z16so6060703iag.19 for ; Mon, 09 Apr 2012 09:26:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=AodtUmp7Hpp4QTZoOtrJ+st34Qv5Gg8IJ5HKwAdKyco=; b=wy8ZyU9uM+RggSr6UeBbFxU2PcKtOP5yr995pWuNodpx8IHu+OSht5AJ29klJccFSU hg9qLxUwY9GNEnvNh/Xi8Lsj3neBm0fDB9GzDaKtJsDmQVcxM0uPaGQn9TV3soQVXju9 jXiaLKrD2j4Es88j3sNSp8XoS1k2zsBU7SorFZ5c8aLhh5DbRXeCchmroxqz3g/F7Fno AuWemvxykdDJahZ6mafxhnHs+qtipFsJ+G3v6R4E1Y5I8RnU6eeI7gw6BWikia+ACPfh krdkGitBtaU9KJFSMafXoqs4Zshgc1e5qCc+EZGzRnuEw8eSvS7Spc/PKi3cReTD5CQZ U00A== Received: by 10.42.152.68 with SMTP id h4mr4622906icw.15.1333988776491; Mon, 09 Apr 2012 09:26:16 -0700 (PDT) Received: from localhost.localdomain ([221.221.23.44]) by mx.google.com with ESMTPS id en3sm38061224igc.2.2012.04.09.09.26.07 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 09 Apr 2012 09:26:15 -0700 (PDT) From: Jiang Liu To: Taku Izumi , Kenji Kaneshige , Yinghai Lu Cc: Jiang Liu , Bjorn Helgaas , Len Brown , Jiang Liu , Keping Chen , x86@vger.kernel.org, linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org Subject: [PATCH V2 6/6] PCI, ACPI, x86: update MMCFG information when hot-plugging PCI host bridges Date: Tue, 10 Apr 2012 00:22:48 +0800 Message-Id: <1333988568-11282-7-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1333988568-11282-1-git-send-email-jiang.liu@huawei.com> References: <1333988568-11282-1-git-send-email-jiang.liu@huawei.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org This patch enhances pci_root driver to update MMCFG information when hot-plugging PCI root bridges on x86 platforms. Signed-off-by: Jiang Liu --- arch/x86/pci/acpi.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++ drivers/acpi/pci_root.c | 20 ++++++++++++++ include/acpi/acnames.h | 1 + include/linux/pci-acpi.h | 2 + 4 files changed, 89 insertions(+), 0 deletions(-) diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c index da0149d..e38d9b7 100644 --- a/arch/x86/pci/acpi.c +++ b/arch/x86/pci/acpi.c @@ -488,6 +488,72 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root) return bus; } +int arch_acpi_pci_root_add(struct acpi_pci_root *root) +{ + int result = 0; + acpi_status status; + unsigned long long base_addr; + struct pci_mmcfg_region *cfg; + + /* MMCONFIG disabled */ + if ((pci_probe & PCI_PROBE_MMCONF) == 0) + return 0; + + /* + * Try to insert MMCFG information for host bridges with _CBA method + */ + status = acpi_evaluate_integer(root->device->handle, METHOD_NAME__CBA, + NULL, &base_addr); + if (ACPI_SUCCESS(status)) { + result = pci_mmconfig_insert(root->segment, + root->secondary.start, + root->secondary.end, + base_addr); + /* + * MMCFG information for hot-pluggable host bridges may have + * already been added by __pci_mmcfg_init(); + */ + if (result == -EEXIST) + result = 0; + } else if (status == AE_NOT_FOUND) { + /* + * Check whether MMCFG information has been added for + * host bridges without _CBA method. + */ + rcu_read_lock(); + cfg = pci_mmconfig_lookup(root->segment, root->secondary.start); + if (!cfg || cfg->end_bus < root->secondary.end) + result = -ENODEV; + rcu_read_unlock(); + } else + result = -ENODEV; + + return result; +} + +int arch_acpi_pci_root_remove(struct acpi_pci_root *root) +{ + acpi_status status; + unsigned long long base_addr; + + /* MMCONFIG disabled */ + if ((pci_probe & PCI_PROBE_MMCONF) == 0) + return 0; + + /* Remove MMCFG information for host bridges with _CBA method */ + status = acpi_evaluate_integer(root->device->handle, METHOD_NAME__CBA, + NULL, &base_addr); + if (ACPI_SUCCESS(status)) + return pci_mmconfig_delete(root->segment, + root->secondary.start, + root->secondary.end, + base_addr); + else if (status != AE_NOT_FOUND) + return -ENODEV; + + return 0; +} + int __init pci_acpi_init(void) { struct pci_dev *dev = NULL; diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index 4a7d575..a62bfa8 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -448,6 +448,16 @@ out: } EXPORT_SYMBOL(acpi_pci_osc_control_set); +int __weak arch_acpi_pci_root_add(struct acpi_pci_root *root) +{ + return 0; +} + +int __weak arch_acpi_pci_root_remove(struct acpi_pci_root *root) +{ + return 0; +} + static int __devinit acpi_pci_root_add(struct acpi_device *device) { unsigned long long segment, bus; @@ -504,6 +514,14 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device) strcpy(acpi_device_class(device), ACPI_PCI_ROOT_CLASS); device->driver_data = root; + if (arch_acpi_pci_root_add(root)) { + printk(KERN_ERR PREFIX + "can't add MMCFG information for Bus %04x:%02x\n", + root->segment, (unsigned int)root->secondary.start); + result = -ENODEV; + goto out_free; + } + /* * All supported architectures that use ACPI have support for * PCI domains, so we indicate this in _OSC support capabilities. @@ -629,6 +647,7 @@ out_del_root: list_del_rcu(&root->node); mutex_unlock(&acpi_pci_root_lock); synchronize_rcu(); + arch_acpi_pci_root_remove(root); out_free: kfree(root); return result; @@ -679,6 +698,7 @@ out: list_del_rcu(&root->node); mutex_unlock(&acpi_pci_root_lock); synchronize_rcu(); + arch_acpi_pci_root_remove(root); kfree(root); return 0; diff --git a/include/acpi/acnames.h b/include/acpi/acnames.h index 38f5088..99bda75 100644 --- a/include/acpi/acnames.h +++ b/include/acpi/acnames.h @@ -62,6 +62,7 @@ #define METHOD_NAME__AEI "_AEI" #define METHOD_NAME__PRW "_PRW" #define METHOD_NAME__SRS "_SRS" +#define METHOD_NAME__CBA "_CBA" /* Method names - these methods must appear at the namespace root */ diff --git a/include/linux/pci-acpi.h b/include/linux/pci-acpi.h index ac93634..6e8dd10 100644 --- a/include/linux/pci-acpi.h +++ b/include/linux/pci-acpi.h @@ -37,6 +37,8 @@ static inline acpi_handle acpi_pci_get_bridge_handle(struct pci_bus *pbus) } void acpi_pci_root_rescan(void); +int arch_acpi_pci_root_add(struct acpi_pci_root *root); +int arch_acpi_pci_root_remove(struct acpi_pci_root *root); #else