From patchwork Mon Jul 20 12:01:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 497672 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 26A0D14076B for ; Mon, 20 Jul 2015 22:10:01 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752662AbbGTMF6 (ORCPT ); Mon, 20 Jul 2015 08:05:58 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:43500 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752193AbbGTMFy (ORCPT ); Mon, 20 Jul 2015 08:05:54 -0400 Received: from 172.24.1.49 (EHLO szxeml432-hub.china.huawei.com) ([172.24.1.49]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id COZ21646; Mon, 20 Jul 2015 20:05:29 +0800 (CST) Received: from localhost.localdomain (10.175.100.166) by szxeml432-hub.china.huawei.com (10.82.67.209) with Microsoft SMTP Server id 14.3.158.1; Mon, 20 Jul 2015 20:05:19 +0800 From: Yijing Wang To: Bjorn Helgaas CC: , , , 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 part3 v12 04/10] PCI: Introduce pci_host_assign_domain_nr() to assign domain Date: Mon, 20 Jul 2015 20:01:12 +0800 Message-ID: <1437393678-4077-5-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1437393678-4077-1-git-send-email-wangyijing@huawei.com> References: <1437393678-4077-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 Introduce pci_host_assign_domain_nr() to assign domain number for pci_host_bridge. 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 59032e2..79d01e4 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -4484,10 +4484,10 @@ static int pci_get_new_domain_nr(void) return atomic_inc_return(&__domain_nr); } -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. @@ -4521,16 +4521,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 02192aa..4a815c9 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -344,4 +344,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 */