From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752284AbaKQJmM (ORCPT ); Mon, 17 Nov 2014 04:42:12 -0500 Received: from szxga02-in.huawei.com ([119.145.14.65]:28886 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752092AbaKQJk5 (ORCPT ); Mon, 17 Nov 2014 04:40:57 -0500 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 14/16] arm/PCI: Introduce pci_get_domain_nr() Date: Mon, 17 Nov 2014 18:21:48 +0800 Message-ID: <1416219710-26088-15-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 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 Signed-off-by: Yijing Wang --- arch/arm/include/asm/mach/pci.h | 9 +++++++++ arch/arm/kernel/bios32.c | 8 ++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h index f19f627..370b3bd 100644 --- a/arch/arm/include/asm/mach/pci.h +++ b/arch/arm/include/asm/mach/pci.h @@ -90,6 +90,15 @@ extern void pci_map_io_early(unsigned long pfn); static inline void pci_map_io_early(unsigned long pfn) {} #endif +#ifdef CONFIG_PCI_DOMAINS_GENERIC +int pci_get_domain_nr(struct device *parent) +#else +static inline int pci_get_domain_nr(struct device *parent) +{ + return 0; +} +#endif + /* * PCI controllers */ diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index d8c2b4e..3fe56f1 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c @@ -513,7 +513,7 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci *hw, #ifdef CONFIG_PCI_DOMAINS_GENERIC static bool dt_domain_found; -void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent) +int pci_get_domain_nr(struct device *parent) { int domain = of_get_pci_domain_nr(parent->of_node); @@ -526,8 +526,12 @@ void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent) } else { domain = pci_get_new_domain_nr(); } + return domain; +} - bus->domain_nr = domain; +void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent) +{ + bus->domain_nr = pci_get_domain_nr(parent); } #endif -- 1.7.1