From patchwork Mon Nov 17 10:21:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 5316961 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 46956C11AC for ; Mon, 17 Nov 2014 09:47:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5B08E20160 for ; Mon, 17 Nov 2014 09:47:36 +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 53F412012F for ; Mon, 17 Nov 2014 09:47:35 +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 1XqIs3-0002ZU-01; Mon, 17 Nov 2014 09:45:19 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XqIpQ-000808-SA for linux-arm-kernel@bombadil.infradead.org; Mon, 17 Nov 2014 09:42:36 +0000 Received: from szxga02-in.huawei.com ([119.145.14.65]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XqIpL-0004Vs-Pc for linux-arm-kernel@lists.infradead.org; Mon, 17 Nov 2014 09:42:35 +0000 Received: from 172.24.2.119 (EHLO szxeml462-hub.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CCM04939; Mon, 17 Nov 2014 17:40:49 +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:40 +0800 From: Yijing Wang To: Bjorn Helgaas Subject: [RFC PATCH 15/16] arm/PCI: Use pci_scan_host_bridge() instead of pci_scan_root_bus() Date: Mon, 17 Nov 2014 18:21:49 +0800 Message-ID: <1416219710-26088-16-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_044232_358407_E6B03D47 X-CRM114-Status: GOOD ( 16.63 ) X-Spam-Score: -2.6 (--) 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 Signed-off-by: Yijing Wang --- arch/arm/include/asm/mach/pci.h | 1 + arch/arm/kernel/bios32.c | 52 +++++++++++++++++++++++--------------- 2 files changed, 32 insertions(+), 21 deletions(-) diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h index 370b3bd..a26eb3a 100644 --- a/arch/arm/include/asm/mach/pci.h +++ b/arch/arm/include/asm/mach/pci.h @@ -46,6 +46,7 @@ struct hw_pci { struct pci_sys_data { struct list_head node; int busnr; /* primary bus number */ + u8 nr; u64 mem_offset; /* bus->cpu memory mapping offset */ unsigned long io_offset; /* bus->cpu IO mapping offset */ struct pci_bus *bus; /* PCI bus */ diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index 3fe56f1..535d7ec 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c @@ -426,33 +426,41 @@ static int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) return irq; } -static int pcibios_init_resources(int busnr, struct pci_sys_data *sys) +static int pcibios_init_resources(struct pci_host_bridge *host, + struct pci_host_info *info) { int ret; - struct pci_host_bridge_window *window; + struct pci_sys_data *sys = info->arg; + struct pci_host_bridge_window *window, *n; if (list_empty(&sys->resources)) { - pci_add_resource_offset(&sys->resources, + pci_add_resource_offset(&host->windows, &iomem_resource, sys->mem_offset); + } else { + list_for_each_entry_safe(window, n, + &sys->resources, list) { + list_move_tail(&window->list, + &host->windows); + } } - list_for_each_entry(window, &sys->resources, list) { + list_for_each_entry(window, &host->windows, list) { if (resource_type(window->res) == IORESOURCE_IO) return 0; } - sys->io_res.start = (busnr * SZ_64K) ? : pcibios_min_io; - sys->io_res.end = (busnr + 1) * SZ_64K - 1; + sys->io_res.start = (sys->nr * SZ_64K) ? : pcibios_min_io; + sys->io_res.end = (sys->nr + 1) * SZ_64K - 1; sys->io_res.flags = IORESOURCE_IO; sys->io_res.name = sys->io_res_name; - sprintf(sys->io_res_name, "PCI%d I/O", busnr); + sprintf(sys->io_res_name, "PCI%d I/O", sys->nr); ret = request_resource(&ioport_resource, &sys->io_res); if (ret) { pr_err("PCI: unable to allocate I/O port region (%d)\n", ret); return ret; } - pci_add_resource_offset(&sys->resources, &sys->io_res, + pci_add_resource_offset(&host->windows, &sys->io_res, sys->io_offset); return 0; @@ -462,8 +470,9 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci *hw, struct list_head *head) { struct pci_sys_data *sys = NULL; - int ret; - int nr, busnr; + int ret, nr, busnr, domain; + struct pci_host_bridge *host; + struct pci_host_info info; for (nr = busnr = 0; nr < hw->nr_controllers; nr++) { sys = kzalloc(sizeof(struct pci_sys_data), GFP_KERNEL); @@ -471,6 +480,7 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci *hw, panic("PCI: unable to allocate sys data!"); sys->busnr = busnr; + sys->nr = nr; sys->swizzle = hw->swizzle; sys->map_irq = hw->map_irq; sys->align_resource = hw->align_resource; @@ -482,25 +492,25 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci *hw, sys->private_data = hw->private_data[nr]; ret = hw->setup(nr, sys); - if (ret > 0) { - ret = pcibios_init_resources(nr, sys); - if (ret) { - kfree(sys); - break; - } - + init_pci_host_info(&info); + info.arg = sys; + info.init_res = pcibios_init_resources; + domain = pci_get_domain_nr(parent); if (hw->scan) sys->bus = hw->scan(nr, sys); - else - sys->bus = pci_scan_root_bus(parent, sys->busnr, - hw->ops, sys, &sys->resources); + else { + host = pci_scan_host_bridge(parent, + PCI_DOMBUS(domain, sys->busnr), + hw->ops, &info); + if (host) + sys->bus = host->bus; + } if (!sys->bus) panic("PCI: unable to scan bus!"); busnr = sys->bus->busn_res.end + 1; - list_add(&sys->node, head); } else { kfree(sys);