From patchwork Wed Jul 22 20:53:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 6846741 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 07D80C05AC for ; Wed, 22 Jul 2015 20:55:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0661D2060C for ; Wed, 22 Jul 2015 20:55:51 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0047320502 for ; Wed, 22 Jul 2015 20:55:49 +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 1ZI11P-0006Gn-TE; Wed, 22 Jul 2015 20:53:47 +0000 Received: from mail-ig0-x236.google.com ([2607:f8b0:4001:c05::236]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZI11M-00064n-IY for linux-arm-kernel@lists.infradead.org; Wed, 22 Jul 2015 20:53:45 +0000 Received: by igr7 with SMTP id 7so77855923igr.0 for ; Wed, 22 Jul 2015 13:53:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=+CcrOnK/q6+iQBXU9w+/V/UzBkpN7S+OFMUVI5wOWCc=; b=C0k3c1prPUojqOpcEDIfdakkmByQtVTAslQC/hyEq7lRrKu6bBajMSrB79rFD5G3Oj ZBKv6fILfo+ayRzgbvhPX9snkWLbN5N5rdsIvWsaxQULY6tTSpzGvk9wszGWcMIQ3LWb C3YgB9TA2AO278ttp+2DIyISY8T8BGnCBOCSP7fHfPFpQZPRMgZusM1bQJM77FnPULlH mZVBQ6qqht/MypOIzrImcSM4fB1Ba6vYvfe5X8/n2Rki95ZzHJ94WEXv0OkUy7hpYpm9 dex+e6H0KP+a6q/oHjP+ogICwsklpCwbcCVS+GlFBlqat92/w6vmCE7iS+nEjXH0FRT0 nAHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-type:content-disposition:in-reply-to :user-agent; bh=+CcrOnK/q6+iQBXU9w+/V/UzBkpN7S+OFMUVI5wOWCc=; b=c2B1RaHQFSfcAVde2VTiXvBiuuhxgh10EM28OrFrGuOWOhBguOuIJI4TGXyZ4xvODL ZncEWvUeti7i6dFkxALDHU8TKbP/TE0Q8sjQjIkZSglhDhAt4oz6IJOkY/08L2joK/OA GqlDS7bZULogdF05leklcmAp7/OCc0WECZ6+gF/2u0kgkLoRYn43BXt9GwVxJZH/8vRq voLpfvkVFKj8p4EjvxNT1JbuaFImhpB6ByIOM6q0Q7fqeTM26/UiSGhfzcio07xLcP5V d7VGtIR7onc+gQSOo3YU2Je9XURTLQcoUglS/GpvflIbR2KruW0HnzKMEWLPgwK3KWoV 0sqA== X-Gm-Message-State: ALoCoQmAkIz4QR1m0kFQqtdAtp94KsxK0sbgQs4ufGq4i0GQLpUp/U/kBhfS19W7SiQw5JviRuAj X-Received: by 10.50.59.148 with SMTP id z20mr9594258igq.77.1437598402937; Wed, 22 Jul 2015 13:53:22 -0700 (PDT) Received: from google.com ([69.71.1.1]) by smtp.gmail.com with ESMTPSA id r95sm1535979ioi.38.2015.07.22.13.53.18 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 22 Jul 2015 13:53:19 -0700 (PDT) Date: Wed, 22 Jul 2015 15:53:16 -0500 From: Bjorn Helgaas To: Ray Jui Subject: Re: [PATCH v4 1/4] PCI: iproc: enable arm64 support for iProc PCIe Message-ID: <20150722205316.GO21967@google.com> References: <1437528583-855-1-git-send-email-rjui@broadcom.com> <1437528583-855-2-git-send-email-rjui@broadcom.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1437528583-855-2-git-send-email-rjui@broadcom.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150722_135344_669100_A3040726 X-CRM114-Status: GOOD ( 26.59 ) X-Spam-Score: -3.9 (---) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Arnd Bergmann , linux-pci@vger.kernel.org, Catalin Marinas , Will Deacon , linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, Hauke Mehrtens , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FSL_HELO_FAKE, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 On Tue, Jul 21, 2015 at 06:29:40PM -0700, Ray Jui wrote: > This patch enables arm64 support to the iProc PCIe driver > > Note struct pci_sys_data is arm32 specific and will eventually be > removed. This change is done in such a way that when struct pci_sys_data > is removed from arm32, one only needs to also remove it from > pcie-iproc.h, no other change in the iProc PCIe core driver is needed > > In addition, arm64 based PCI driver does not require call to > pci_fixup_irqs, as it implements OF based irq parsing and mapping in > pcibios_add_device > > Signed-off-by: Ray Jui > Reviewed-by: Scott Branden > --- > drivers/pci/host/pcie-iproc.c | 15 ++++----------- > drivers/pci/host/pcie-iproc.h | 8 ++++++-- > 2 files changed, 10 insertions(+), 13 deletions(-) > > diff --git a/drivers/pci/host/pcie-iproc.c b/drivers/pci/host/pcie-iproc.c > index d77481e..8a556d5 100644 > --- a/drivers/pci/host/pcie-iproc.c > +++ b/drivers/pci/host/pcie-iproc.c > @@ -58,11 +58,6 @@ > #define SYS_RC_INTX_EN 0x330 > #define SYS_RC_INTX_MASK 0xf > > -static inline struct iproc_pcie *sys_to_pcie(struct pci_sys_data *sys) > -{ > - return sys->private_data; > -} > - > /** > * Note access to the configuration registers are protected at the higher layer > * by 'pci_lock' in drivers/pci/access.c > @@ -71,8 +66,7 @@ static void __iomem *iproc_pcie_map_cfg_bus(struct pci_bus *bus, > unsigned int devfn, > int where) > { > - struct pci_sys_data *sys = bus->sysdata; > - struct iproc_pcie *pcie = sys_to_pcie(sys); > + struct iproc_pcie *pcie = bus->sysdata; I'm thinking something like the following so we don't depend on pci_sys_data being at the beginning of iproc_pcie. What do you think? It has more ifdefs but feels a bit safer. And I don't mind if ugly code comes with ugly ifdefs -- it's a little incentive to make the code cleaner. commit 8d9bfe3702aaea457b3d59b09b86e9f03c322605 Author: Ray Jui Date: Tue Jul 21 18:29:40 2015 -0700 PCI: iproc: Add arm64 support Add arm64 support to the iProc PCIe driver. Note that on arm32, bus->sysdata points to the arm32-specific pci_sys_data struct, and pci_sys_data.private_data contains the iproc_pcie pointer. For arm64, there's nothing corresponding to pci_sys_data, so we keep the iproc_pcie pointer directly in bus->sysdata. In addition, arm64 does IRQ mapping in pcibios_add_device(), so it doesn't need pci_fixup_irqs() as arm32 does. Signed-off-by: Ray Jui Signed-off-by: Bjorn Helgaas Reviewed-by: Scott Branden Acked-by: Bjorn Helgaas diff --git a/drivers/pci/host/pcie-iproc.c b/drivers/pci/host/pcie-iproc.c index 9a00dca..fe2efb1 100644 --- a/drivers/pci/host/pcie-iproc.c +++ b/drivers/pci/host/pcie-iproc.c @@ -58,9 +58,17 @@ #define SYS_RC_INTX_EN 0x330 #define SYS_RC_INTX_MASK 0xf -static inline struct iproc_pcie *sys_to_pcie(struct pci_sys_data *sys) +static inline struct iproc_pcie *iproc_data(struct pci_bus *bus) { - return sys->private_data; + struct iproc_pcie *pcie; +#ifdef CONFIG_ARM + struct pci_sys_data *sys = bus->sysdata; + + pcie = sys->private_data; +#else + pcie = bus->sysdata; +#endif + return pcie; } /** @@ -71,8 +79,7 @@ static void __iomem *iproc_pcie_map_cfg_bus(struct pci_bus *bus, unsigned int devfn, int where) { - struct pci_sys_data *sys = bus->sysdata; - struct iproc_pcie *pcie = sys_to_pcie(sys); + struct iproc_pcie *pcie = iproc_data(bus); unsigned slot = PCI_SLOT(devfn); unsigned fn = PCI_FUNC(devfn); unsigned busno = bus->number; @@ -186,6 +193,7 @@ static void iproc_pcie_enable(struct iproc_pcie *pcie) int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res) { int ret; + void *sysdata; struct pci_bus *bus; if (!pcie || !pcie->dev || !pcie->base) @@ -205,10 +213,14 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res) iproc_pcie_reset(pcie); +#ifdef CONFIG_ARM pcie->sysdata.private_data = pcie; + sysdata = &pcie->sysdata; +#else + sysdata = pcie; +#endif - bus = pci_create_root_bus(pcie->dev, 0, &iproc_pcie_ops, - &pcie->sysdata, res); + bus = pci_create_root_bus(pcie->dev, 0, &iproc_pcie_ops, sysdata, res); if (!bus) { dev_err(pcie->dev, "unable to create PCI root bus\n"); ret = -ENOMEM; @@ -226,7 +238,9 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res) pci_scan_child_bus(bus); pci_assign_unassigned_bus_resources(bus); +#ifdef CONFIG_ARM pci_fixup_irqs(pci_common_swizzle, pcie->map_irq); +#endif pci_bus_add_devices(bus); return 0; diff --git a/drivers/pci/host/pcie-iproc.h b/drivers/pci/host/pcie-iproc.h index ba0a108..c9e4c10 100644 --- a/drivers/pci/host/pcie-iproc.h +++ b/drivers/pci/host/pcie-iproc.h @@ -21,7 +21,7 @@ * @dev: pointer to device data structure * @base: PCIe host controller I/O register base * @resources: linked list of all PCI resources - * @sysdata: Per PCI controller data + * @sysdata: Per PCI controller data (ARM-specific) * @root_bus: pointer to root bus * @phy: optional PHY device that controls the Serdes * @irqs: interrupt IDs @@ -29,7 +29,9 @@ struct iproc_pcie { struct device *dev; void __iomem *base; +#ifdef CONFIG_ARM struct pci_sys_data sysdata; +#endif struct pci_bus *root_bus; struct phy *phy; int irqs[IPROC_PCIE_MAX_NUM_IRQS];