From patchwork Tue Apr 21 11:34:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 6247941 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 12B7DBF4A6 for ; Tue, 21 Apr 2015 12:18:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 24EAF202AE for ; Tue, 21 Apr 2015 12:18:52 +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 238322021F for ; Tue, 21 Apr 2015 12:18:51 +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 1YkX6k-0006rs-KR; Tue, 21 Apr 2015 12:16:54 +0000 Received: from szxga02-in.huawei.com ([119.145.14.65]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YkWgn-0006je-Nu for linux-arm-kernel@lists.infradead.org; Tue, 21 Apr 2015 11:50:07 +0000 Received: from 172.24.2.119 (EHLO szxeml431-hub.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CKC39704; Tue, 21 Apr 2015 19:38:06 +0800 (CST) Received: from localhost.localdomain (10.175.100.166) by szxeml431-hub.china.huawei.com (10.82.67.208) with Microsoft SMTP Server id 14.3.158.1; Tue, 21 Apr 2015 19:37:56 +0800 From: Yijing Wang To: Bjorn Helgaas Subject: [PATCH v10 14/29] PCI: Introduce pci_host_bridge_ops to support host specific operations Date: Tue, 21 Apr 2015 19:34:33 +0800 Message-ID: <1429616088-10249-15-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1429616088-10249-1-git-send-email-wangyijing@huawei.com> References: <1429616088-10249-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-20150421_045006_372981_B6D3AF40 X-CRM114-Status: GOOD ( 13.74 ) X-Spam-Score: -2.3 (--) 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 *pci_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 | 3 ++- drivers/pci/probe.c | 8 ++++++-- include/linux/pci.h | 9 +++++++++ 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/drivers/pci/host-bridge.c b/drivers/pci/host-bridge.c index 6309970..7e25f53 100644 --- a/drivers/pci/host-bridge.c +++ b/drivers/pci/host-bridge.c @@ -82,7 +82,8 @@ static int pci_host_busn_res_check( struct pci_host_bridge *pci_create_host_bridge( struct device *parent, int domain, void *sysdata, - struct list_head *resources) + struct list_head *resources, + struct pci_host_bridge_ops *ops) { int error, bus; struct pci_host_bridge *host, *tmp; @@ -115,10 +116,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 3d6f455..0432889 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -334,6 +334,7 @@ static inline void pci_bus_assign_domain_nr(struct pci_bus *bus, struct resource_entry *pci_busn_resource(struct list_head *resources); void pci_host_assign_domain_nr(struct pci_host_bridge *host, int domain); struct pci_host_bridge *pci_create_host_bridge(struct device *parent, - int domain, void *sysdata, struct list_head *resources); + int domain, void *sysdata, struct list_head *resources, + struct pci_host_bridge_ops *ops); void pci_free_host_bridge(struct pci_host_bridge *host); #endif /* DRIVERS_PCI_H */ diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index e75b27c..83cf7c6 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1903,6 +1903,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); @@ -1974,7 +1976,8 @@ struct pci_bus *pci_create_root_bus(struct device *parent, return NULL; } - host = pci_create_host_bridge(parent, domain, sysdata, resources); + host = pci_create_host_bridge(parent, domain, sysdata, + resources, NULL); if (!host) return NULL; @@ -2084,7 +2087,8 @@ struct pci_bus *pci_scan_root_bus(struct device *parent, int domain, bus); } - host = pci_create_host_bridge(parent, domain, sysdata, resources); + host = pci_create_host_bridge(parent, domain, sysdata, + resources, NULL); if (!host) { kfree(busn_resource); return NULL; diff --git a/include/linux/pci.h b/include/linux/pci.h index 9a8a223..91fde6a 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; bool dynamic_busn; @@ -407,6 +415,7 @@ struct pci_host_bridge { struct pci_bus *bus; /* root bus */ 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; unsigned int ignore_reset_delay:1; /* for entire hierarchy */