From patchwork Fri Apr 3 09:25:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 6155651 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A61449F389 for ; Fri, 3 Apr 2015 09:54:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 98916203DF for ; Fri, 3 Apr 2015 09:54:16 +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 8BB93203DA for ; Fri, 3 Apr 2015 09:54:15 +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 1YdyFa-0002lx-1k; Fri, 03 Apr 2015 09:50:54 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ydy0h-0005cK-DW for linux-arm-kernel@bombadil.infradead.org; Fri, 03 Apr 2015 09:35:31 +0000 Received: from szxga01-in.huawei.com ([58.251.152.64]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ydy0b-0002SA-CO for linux-arm-kernel@lists.infradead.org; Fri, 03 Apr 2015 09:35:27 +0000 Received: from 172.24.2.119 (EHLO szxeml430-hub.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CLR08851; Fri, 03 Apr 2015 17:29:02 +0800 (CST) Received: from localhost.localdomain (10.175.100.166) by szxeml430-hub.china.huawei.com (10.82.67.185) with Microsoft SMTP Server id 14.3.158.1; Fri, 3 Apr 2015 17:28:46 +0800 From: Yijing Wang To: Bjorn Helgaas Subject: [PATCH v9 14/30] PCI: Introduce pci_host_bridge_ops to support host specific operations Date: Fri, 3 Apr 2015 17:25:48 +0800 Message-ID: <1428053164-28277-16-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1428053164-28277-1-git-send-email-wangyijing@huawei.com> References: <1428053164-28277-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-20150403_103526_428398_DFE8E7C3 X-CRM114-Status: GOOD ( 17.71 ) X-Spam-Score: -1.9 (-) Cc: linux-ia64@vger.kernel.org, linux-pci@vger.kernel.org, Yijing Wang , Guan Xuetao , Russell King , x86@kernel.org, Geert Uytterhoeven , Benjamin Herrenschmidt , Arnd Bergmann , Marc Zyngier , Rusty Russell , linux-m68k@lists.linux-m68k.org, Thomas Gleixner , Yinghai Lu , linux-arm-kernel@lists.infradead.org, dja@axtens.net, Liviu Dudau , Tony Luck , linux-kernel@vger.kernel.org, Jiang Liu , linux-alpha@vger.kernel.org, "David S. Miller" 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=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 Now we have weak functions like pcibios_root_bridge_prepare() to setup pci host bridge, We could introduce pci_host_bridge_ops which contain host bridge specific ops to setup pci_host_bridge. Then host bridge driver could add pci_host_bridge_ops hooks intead of weak function to setup pci_host_bridge. This patch add following pci_host_bridge_ops hooks: pci_host_bridge_ops { struct pci_ops *ops; /* set root bus speed, some platform need this like powerpc */ void (*set_root_bus_speed)(struct pci_host_bridge *host); /* setup pci_host_bridge before pci_host_bridge be added to driver core */ int (*prepare)(struct pci_host_bridge *host); /* platform specific of scan hook to scan pci device */ int (*scan_bus)(struct pci_host_bridge *); } We could easily extend it to support different host bridge specific operations. Signed-off-by: Yijing Wang --- drivers/pci/host-bridge.c | 9 ++++++++- drivers/pci/pci.h | 5 +++-- drivers/pci/probe.c | 11 ++++++++--- include/linux/pci.h | 9 +++++++++ 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/drivers/pci/host-bridge.c b/drivers/pci/host-bridge.c index 8733b19..f2639f7 100644 --- a/drivers/pci/host-bridge.c +++ b/drivers/pci/host-bridge.c @@ -63,7 +63,8 @@ static bool pci_host_busn_res_overlap( struct pci_host_bridge *pci_create_host_bridge( struct device *parent, int domain, int bus, - void *sysdata, struct list_head *resources) + void *sysdata, struct list_head *resources, + struct pci_host_bridge_ops *ops) { int error; struct pci_host_bridge *host, *tmp; @@ -98,10 +99,16 @@ struct pci_host_bridge *pci_create_host_bridge( list_add_tail(&host->list, &pci_host_bridge_list); mutex_unlock(&pci_host_mutex); + host->ops = ops; host->dev.release = pci_release_host_bridge_dev; dev_set_drvdata(&host->dev, sysdata); dev_set_name(&host->dev, "pci%04x:%02x", host->domain, bus); + if (host->ops && host->ops->prepare) { + error = host->ops->prepare(host); + if (error) + goto list_del; + } error = pcibios_root_bridge_prepare(host); if (error) diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 027fba0..ef10cc1 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -334,8 +334,9 @@ static inline void pci_host_assign_domain_nr(struct pci_host_bridge *host) } #endif -struct pci_host_bridge *pci_create_host_bridge(struct device *parent, - int domain, int bus, void *sysdata, struct list_head *resources); +struct pci_host_bridge *pci_create_host_bridge( + struct device *parent, int domain, int bus, void *sysdata, + struct list_head *resources, struct pci_host_bridge_ops *ops); void pci_free_host_bridge(struct pci_host_bridge *host); static inline int pci_host_first_busnr(struct pci_host_bridge *host) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index ee17d9a..36dfee0 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1894,6 +1894,8 @@ static struct pci_bus *__pci_create_root_bus( bridge->bus = b; b->bridge = get_device(&bridge->dev); + if (bridge->ops && bridge->ops->set_root_bus_speed) + bridge->ops->set_root_bus_speed(bridge); pcibios_set_root_bus_speed(bridge); device_enable_async_suspend(b->bridge); pci_set_bus_of_node(b); @@ -1958,7 +1960,7 @@ struct pci_bus *pci_create_root_bus(struct device *parent, struct pci_host_bridge *host; host = pci_create_host_bridge(parent, domain, bus, - sysdata, resources); + sysdata, resources, NULL); if (!host) return NULL; @@ -2048,7 +2050,10 @@ static struct pci_bus *__pci_scan_root_bus( if (!b) return NULL; - max = pci_scan_child_bus(b); + if (host->ops && host->ops->scan_bus) + max = host->ops->scan_bus(host); + else + max = pci_scan_child_bus(b); /* If default busn resource used, update the max bus number */ if (host->busn_res.flags & IORESOURCE_BUS) { @@ -2066,7 +2071,7 @@ struct pci_bus *pci_scan_root_bus(struct device *parent, int domain, struct pci_host_bridge *host; host = pci_create_host_bridge(parent, domain, bus, - sysdata, resources); + sysdata, resources, NULL); if (!host) return NULL; diff --git a/include/linux/pci.h b/include/linux/pci.h index 91cba01..2702a51 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -400,6 +400,14 @@ static inline int pci_channel_offline(struct pci_dev *pdev) return (pdev->error_state != pci_channel_io_normal); } +struct pci_host_bridge; +struct pci_host_bridge_ops { + struct pci_ops *pci_ops; + int (*prepare)(struct pci_host_bridge *host); + void (*set_root_bus_speed)(struct pci_host_bridge *host); + int (*scan_bus)(struct pci_host_bridge *host); +}; + struct pci_host_bridge { int domain; struct device dev; @@ -408,6 +416,7 @@ struct pci_host_bridge { struct resource busn_res; struct list_head windows; /* resource_entry */ struct list_head list; + struct pci_host_bridge_ops *ops; void (*release_fn)(struct pci_host_bridge *); void *release_data; };