From patchwork Mon Nov 17 10:21:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 5316761 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 79DB69F2ED for ; Mon, 17 Nov 2014 09:44:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AF89820122 for ; Mon, 17 Nov 2014 09:44:30 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DDBCE200E6 for ; Mon, 17 Nov 2014 09:44:29 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XqIp6-0007px-3f; Mon, 17 Nov 2014 09:42:16 +0000 Received: from szxga01-in.huawei.com ([119.145.14.64]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XqIp0-0007FW-Es for linux-arm-kernel@lists.infradead.org; Mon, 17 Nov 2014 09:42:11 +0000 Received: from 172.24.2.119 (EHLO szxeml462-hub.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CEO10146; Mon, 17 Nov 2014 17:40:45 +0800 (CST) Received: from localhost.localdomain (10.175.100.166) by szxeml462-hub.china.huawei.com (10.82.67.205) with Microsoft SMTP Server id 14.3.158.1; Mon, 17 Nov 2014 17:40:35 +0800 From: Yijing Wang To: Bjorn Helgaas Subject: [RFC PATCH 10/16] PCI: Add of_scan_bus() to pci_host_info Date: Mon, 17 Nov 2014 18:21:44 +0800 Message-ID: <1416219710-26088-11-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1416219710-26088-1-git-send-email-wangyijing@huawei.com> References: <1416219710-26088-1-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.100.166] X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141117_014210_875499_B4E6B333 X-CRM114-Status: GOOD ( 12.55 ) X-Spam-Score: -0.7 (/) Cc: Liviu Dudau , Tony Luck , Russell King , linux-pci@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, Xinwei Hu , Thierry Reding , Suravee.Suthikulpanit@amd.com, Benjamin Herrenschmidt , Yijing Wang , linux-ia64@vger.kernel.org, Thomas Gleixner , Wuyun , linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add of_scan_bus() to support some platforms scan bus by of_node. Signed-off-by: Yijing Wang --- drivers/pci/host-bridge.c | 1 + drivers/pci/probe.c | 10 +++++++--- include/linux/pci.h | 3 +++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/pci/host-bridge.c b/drivers/pci/host-bridge.c index 872cae1..1a1f81b 100644 --- a/drivers/pci/host-bridge.c +++ b/drivers/pci/host-bridge.c @@ -52,6 +52,7 @@ struct pci_host_bridge *pci_create_host_bridge( return NULL; host->sysdata = info->arg; + host->node = info->node; host->busnum = PCI_BUSNUM(db); host->domain = PCI_DOMAIN(db); host->ops = ops; diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 42158fd..2729c41 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -2126,9 +2126,13 @@ struct pci_host_bridge *pci_scan_host_bridge( pci_bus_insert_busn_res(host->bus, host->busnum, 255); } - max = pci_scan_child_bus(host->bus); - if (!found) - pci_bus_update_busn_res_end(host->bus, max); + if (info->of_scan_bus) { + info->of_scan_bus(host); + } else { + max = pci_scan_child_bus(host->bus); + if (!found) + pci_bus_update_busn_res_end(host->bus, max); + } return host; diff --git a/include/linux/pci.h b/include/linux/pci.h index af1ee86..c4f4438 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -407,6 +407,7 @@ struct pci_host_bridge { int busnum; int domain; void *sysdata; + struct device_node *node; struct pci_ops *ops; struct msi_controller *(*get_msi_ctrl)(struct pci_dev *pdev); void (*release_fn)(struct pci_host_bridge *); @@ -416,10 +417,12 @@ struct pci_host_bridge { struct pci_host_info { u8 res_type; void *arg; + struct device_node *node; struct list_head *resources; /*just for build, will clean up later */ struct msi_controller *(*get_msi_ctrl)(struct pci_dev *pdev); int (*init_res)(struct pci_host_bridge *host, struct pci_host_info *info); + void (*of_scan_bus)(struct pci_host_bridge *host); }; static inline void init_pci_host_info(struct pci_host_info *info)