Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755093AbbDULio (ORCPT ); Tue, 21 Apr 2015 07:38:44 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:4565 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752491AbbDULiM (ORCPT ); Tue, 21 Apr 2015 07:38:12 -0400 From: Yijing Wang To: Bjorn Helgaas CC: Jiang Liu , , Yinghai Lu , , Marc Zyngier , , Russell King , , , Thomas Gleixner , Benjamin Herrenschmidt , Rusty Russell , Tony Luck , , "David S. Miller" , "Guan Xuetao" , , , Liviu Dudau , "Arnd Bergmann" , Geert Uytterhoeven , "Yijing Wang" Subject: [PATCH v10 08/29] PCI: Introduce pci_host_assign_domain_nr() to assign domain Date: Tue, 21 Apr 2015 19:34:27 +0800 Message-ID: <1429616088-10249-9-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 Content-Type: text/plain X-Originating-IP: [10.175.100.166] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2477 Lines: 81 Introduce pci_host_assign_domain_nr() to assign domain number for pci_host_bridge. In the later patch, we would assign domain in pci_create_host_bridge, clean up the pci_bus_assign_domain_nr() and move this function into drivers/pci/host-bridge.c. Signed-off-by: Yijing Wang --- drivers/pci/pci.c | 24 +++++++++++++++++++----- drivers/pci/pci.h | 1 + 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index acc4b6e..95ea445 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -4506,10 +4506,10 @@ int pci_get_new_domain_nr(void) } #ifdef CONFIG_PCI_DOMAINS_GENERIC -void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent) +static int pci_assign_domain_nr(struct device *dev) { static int use_dt_domains = -1; - int domain = of_get_pci_domain_nr(parent->of_node); + int domain = of_get_pci_domain_nr(dev->of_node); /* * Check DT domain and use_dt_domains values. @@ -4543,16 +4543,30 @@ void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent) use_dt_domains = 0; domain = pci_get_new_domain_nr(); } else { - dev_err(parent, "Node %s has inconsistent \"linux,pci-domain\" property in DT\n", - parent->of_node->full_name); + dev_err(dev, "Node %s has inconsistent \"linux,pci-domain\" property in DT\n", + dev->of_node->full_name); domain = -1; } - bus->domain_nr = domain; + return domain; +} + +void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent) +{ + bus->domain_nr = pci_assign_domain_nr(parent); } #endif #endif +void pci_host_assign_domain_nr(struct pci_host_bridge *host, int domain) +{ +#ifdef CONFIG_PCI_DOMAINS_GENERIC + host->domain = pci_assign_domain_nr(host->dev.parent); +#else + host->domain = domain; +#endif +} + /** * pci_ext_cfg_avail - can we access extended PCI config space? * diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index dbf1ac0..1e291e4 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -332,4 +332,5 @@ static inline void pci_bus_assign_domain_nr(struct pci_bus *bus, } #endif +void pci_host_assign_domain_nr(struct pci_host_bridge *host, int domain); #endif /* DRIVERS_PCI_H */ -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/