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: 5316651 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@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 ABE14C11AC for ; Mon, 17 Nov 2014 09:42:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D344F201FA for ; Mon, 17 Nov 2014 09:42:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CEC64201FB for ; Mon, 17 Nov 2014 09:42:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752264AbaKQJmK (ORCPT ); Mon, 17 Nov 2014 04:42:10 -0500 Received: from szxga02-in.huawei.com ([119.145.14.65]:28887 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752088AbaKQJk5 (ORCPT ); Mon, 17 Nov 2014 04:40:57 -0500 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 CC: , , Xinwei Hu , Wuyun , , Russell King , , Thomas Gleixner , Benjamin Herrenschmidt , , Tony Luck , , Thierry Reding , Liviu Dudau , , Yijing Wang 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 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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);