From patchwork Thu Oct 30 11:44:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Pieralisi X-Patchwork-Id: 39829 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E1359202FE for ; Thu, 30 Oct 2014 11:47:30 +0000 (UTC) Received: by mail-lb0-f199.google.com with SMTP id n15sf2807136lbi.6 for ; Thu, 30 Oct 2014 04:47:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=nRXVmGFKom51wTmWP6MyvB1+L6O6qHF9p92K6EB0gm8=; b=l30GsTOLuvEloqyl2R9u9mKFYwPRBDnaiMjNYfbzuhzJ19v1c14VJXb6VBucUmBeh6 kWf+rqs98uiTCtlAXf9Ao4RroUuCsNEc4LgSIul80kxvw/tsuDsSLO1AtCsyNP/sFMmb PV7xbDFQXnfK43WbldyuqFhX/y5ScHV9MXkoWvDJDTdLmST/q97JTSqfRb7W4f/To55i z3g2OGuhSlt2Sq/6+W4Z7AuFlWd238dsk8prOyvMLKeGy+/vFNl3F+WU8I65Oj5GzX3V 69LTfR6cA3VAwHZITTevV9rHAnjEbt4pwpOzS0L3dNYrzFcI9DB0tLXQx6pVraM591B1 UbHQ== X-Gm-Message-State: ALoCoQlkgHCx60mIB9kgXZpMQBLupyODtwGNnQZ0B1Apw5/hBXY/P8IGyVh/t0hCWGg/WiXmu7iG X-Received: by 10.112.137.202 with SMTP id qk10mr308163lbb.11.1414669649790; Thu, 30 Oct 2014 04:47:29 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.6.38 with SMTP id cr6ls332193lad.108.gmail; Thu, 30 Oct 2014 04:47:29 -0700 (PDT) X-Received: by 10.152.42.172 with SMTP id p12mr18330576lal.11.1414669649647; Thu, 30 Oct 2014 04:47:29 -0700 (PDT) Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com. [209.85.217.169]) by mx.google.com with ESMTPS id k10si11575978lbp.126.2014.10.30.04.47.29 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 30 Oct 2014 04:47:29 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.169 as permitted sender) client-ip=209.85.217.169; Received: by mail-lb0-f169.google.com with SMTP id l4so4158831lbv.28 for ; Thu, 30 Oct 2014 04:47:29 -0700 (PDT) X-Received: by 10.112.97.135 with SMTP id ea7mr18464404lbb.46.1414669649518; Thu, 30 Oct 2014 04:47:29 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp25951lbz; Thu, 30 Oct 2014 04:47:28 -0700 (PDT) X-Received: by 10.70.48.175 with SMTP id m15mr3112085pdn.153.1414669647833; Thu, 30 Oct 2014 04:47:27 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id f4si6387975pdn.154.2014.10.30.04.47.27 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Oct 2014 04:47:27 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; 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 1XjoB1-00083V-5j; Thu, 30 Oct 2014 11:46:03 +0000 Received: from foss-mx-na.foss.arm.com ([217.140.108.86]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XjoAT-0007c0-VV for linux-arm-kernel@lists.infradead.org; Thu, 30 Oct 2014 11:45:31 +0000 Received: from foss-smtp-na-1.foss.arm.com (unknown [10.80.61.8]) by foss-mx-na.foss.arm.com (Postfix) with ESMTP id 76407494; Thu, 30 Oct 2014 06:45:08 -0500 (CDT) Received: from collaborate-mta1.arm.com (highbank-bc01-b06.austin.arm.com [10.112.81.134]) by foss-smtp-na-1.foss.arm.com (Postfix) with ESMTP id 590E45FAD7; Thu, 30 Oct 2014 06:45:06 -0500 (CDT) Received: from red-moon.cambridge.arm.com (red-moon.cambridge.arm.com [10.1.203.137]) by collaborate-mta1.arm.com (Postfix) with ESMTP id B7B8B13F8EE; Thu, 30 Oct 2014 06:45:04 -0500 (CDT) From: Lorenzo Pieralisi To: linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org Subject: [RFC PATCH 2/2] arm: pcibios: move to generic PCI domains Date: Thu, 30 Oct 2014 11:44:48 +0000 Message-Id: <1414669490-1217-3-git-send-email-lorenzo.pieralisi@arm.com> X-Mailer: git-send-email 2.1.2 In-Reply-To: <1414669490-1217-1-git-send-email-lorenzo.pieralisi@arm.com> References: <1414669490-1217-1-git-send-email-lorenzo.pieralisi@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141030_044530_172013_AC506C9D X-CRM114-Status: GOOD ( 16.65 ) X-Spam-Score: -0.6 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.6 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 SPF_PASS SPF: sender matches SPF record Cc: Phil Edworthy , Lorenzo Pieralisi , Russell King , Arnd Bergmann , Mohit Kumar , Jingoo Han , liviu.dudau@arm.com, Jason Gunthorpe , Bjorn Helgaas 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: lorenzo.pieralisi@arm.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.169 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Most if not all ARM PCI host controller device drivers either ignore the domain field in the pci_sys_data structure or just increment it every time a host controller is probed, using it as a domain counter. Therefore, instead of relying on pci_sys_data to stash the domain number in a standard location, ARM pcibios code can be moved to the newly introduced generic PCI domains code, implemented in commits: commit 41e5c0f81d3e676d671d96a0a1fafb27abfbd9 ("of/pci: Add pci_get_new_domain_nr() and of_get_pci_domain_nr()") commit 670ba0c8883b576d0aec28bd7a838358a4be1 ("PCI: Add generic domain handling") In order to assign a domain number dynamically, the ARM pcibios defines the function, called by core PCI code: void pci_bus_assign_domain_nr(...) that relies on a DT property to define the domain number or falls back to a counter; its usage replaces the current domain assignment code in PCI host controllers present in the kernel. Cc: Arnd Bergmann Cc: Phil Edworthy Cc: Jason Gunthorpe Cc: Jingoo Han Cc: Bjorn Helgaas Cc: Russell King Cc: Mohit Kumar Signed-off-by: Lorenzo Pieralisi Acked-by: Arnd Bergmann Reviewed-by: Yijing Wang Acked-by: Phil Edworthy Acked-by: Jingoo Han Tested-by: Lucas Stach Acked-by: Lucas Stach --- arch/arm/Kconfig | 3 +++ arch/arm/include/asm/mach/pci.h | 3 --- arch/arm/include/asm/pci.h | 7 ------- arch/arm/kernel/bios32.c | 26 +++++++++++++++++++++++--- drivers/pci/host/pci-mvebu.c | 10 ++-------- drivers/pci/host/pcie-designware.c | 3 --- drivers/pci/host/pcie-rcar.c | 3 --- 7 files changed, 28 insertions(+), 27 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 89c4b5c..29544f0 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1292,6 +1292,9 @@ config PCI_DOMAINS bool depends on PCI +config PCI_DOMAINS_GENERIC + def_bool PCI_DOMAINS + config PCI_NANOENGINE bool "BSE nanoEngine PCI support" depends on SA1100_NANOENGINE diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h index 7fc4278..f19f627 100644 --- a/arch/arm/include/asm/mach/pci.h +++ b/arch/arm/include/asm/mach/pci.h @@ -44,9 +44,6 @@ struct hw_pci { * Per-controller structure */ struct pci_sys_data { -#ifdef CONFIG_PCI_DOMAINS - int domain; -#endif struct list_head node; int busnr; /* primary bus number */ u64 mem_offset; /* bus->cpu memory mapping offset */ diff --git a/arch/arm/include/asm/pci.h b/arch/arm/include/asm/pci.h index 7e95d85..585dc33 100644 --- a/arch/arm/include/asm/pci.h +++ b/arch/arm/include/asm/pci.h @@ -18,13 +18,6 @@ static inline int pcibios_assign_all_busses(void) } #ifdef CONFIG_PCI_DOMAINS -static inline int pci_domain_nr(struct pci_bus *bus) -{ - struct pci_sys_data *root = bus->sysdata; - - return root->domain; -} - static inline int pci_proc_domain(struct pci_bus *bus) { return pci_domain_nr(bus); diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index 17a26c1..d8c2b4e 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c @@ -11,6 +11,8 @@ #include #include #include +#include +#include #include #include @@ -468,9 +470,6 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci *hw, if (!sys) panic("PCI: unable to allocate sys data!"); -#ifdef CONFIG_PCI_DOMAINS - sys->domain = hw->domain; -#endif sys->busnr = busnr; sys->swizzle = hw->swizzle; sys->map_irq = hw->map_irq; @@ -511,6 +510,27 @@ 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 domain = of_get_pci_domain_nr(parent->of_node); + + if (domain >= 0) { + dt_domain_found = true; + } else if (dt_domain_found == true) { + dev_err(parent, "Node %s is missing \"linux,pci-domain\" property in DT\n", + parent->of_node->full_name); + return; + } else { + domain = pci_get_new_domain_nr(); + } + + bus->domain_nr = domain; +} +#endif + void pci_common_init_dev(struct device *parent, struct hw_pci *hw) { struct pci_sys_data *sys; diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c index b1315e1..2b4c1f2 100644 --- a/drivers/pci/host/pci-mvebu.c +++ b/drivers/pci/host/pci-mvebu.c @@ -722,17 +722,11 @@ static int mvebu_pcie_setup(int nr, struct pci_sys_data *sys) { struct mvebu_pcie *pcie = sys_to_pcie(sys); int i; - int domain = 0; -#ifdef CONFIG_PCI_DOMAINS - domain = sys->domain; -#endif - - snprintf(pcie->mem_name, sizeof(pcie->mem_name), "PCI MEM %04x", - domain); + snprintf(pcie->mem_name, sizeof(pcie->mem_name), "PCI MEM %04x", nr); pcie->mem.name = pcie->mem_name; - snprintf(pcie->io_name, sizeof(pcie->io_name), "PCI I/O %04x", domain); + snprintf(pcie->io_name, sizeof(pcie->io_name), "PCI I/O %04x", nr); pcie->realio.name = pcie->io_name; if (request_resource(&iomem_resource, &pcie->mem)) diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c index dfed00a..6790b87 100644 --- a/drivers/pci/host/pcie-designware.c +++ b/drivers/pci/host/pcie-designware.c @@ -502,9 +502,6 @@ int __init dw_pcie_host_init(struct pcie_port *pp) dw_pci.private_data = (void **)&pp; pci_common_init_dev(pp->dev, &dw_pci); -#ifdef CONFIG_PCI_DOMAINS - dw_pci.domain++; -#endif return 0; } diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c index 61158e0..b6b859e 100644 --- a/drivers/pci/host/pcie-rcar.c +++ b/drivers/pci/host/pcie-rcar.c @@ -404,9 +404,6 @@ static void rcar_pcie_enable(struct rcar_pcie *pcie) rcar_pci.private_data = (void **)&pcie; pci_common_init_dev(&pdev->dev, &rcar_pci); -#ifdef CONFIG_PCI_DOMAINS - rcar_pci.domain++; -#endif } static int phy_wait_for_ack(struct rcar_pcie *pcie)