Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp926895ybv; Thu, 20 Feb 2020 09:44:03 -0800 (PST) X-Google-Smtp-Source: APXvYqwVapevQVeG/xnfkGtjE+X05eLLfhOkLOtZCpxGtH3q/mmnC4J76d6FfTFQ9lbWuMIU8Fu/ X-Received: by 2002:a05:6808:618:: with SMTP id y24mr2830575oih.86.1582220643588; Thu, 20 Feb 2020 09:44:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582220643; cv=none; d=google.com; s=arc-20160816; b=lA5+4b6oXQ6/BOVPiIsFOUShfoayK3ItgBrF5nVUF14VSUAHcN3k5Y2ii0/FxKHYZ6 PO+sTKc6qI9UQvLBSIQWy5yXLRlgIRrroq3rwwEuOXMzLhSr01ZEUn4TceYR/KQcuVrJ RJSzXEkPWIHcjLkJuT/VwmtfkuyGqdAlmD4OzDZhhM5WqFO3vOmyD84ol5BTaUnKbesX +5lqV8kSDeqo2OW62UxBleE4hL6u+rtxwEhC/i2gZGMGixrXn5w4jlAIX8GMrKHIKGU1 Jb+/+2bjo7UgVfTntcTBKIVk0ILSw0wxstpFUIsrFPLYvynmfPolWLKsvLEQ+1Z7TmPv vb8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:content-transfer-encoding :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature; bh=ElSoMQSykyBLZXo/UCCjNoS1sTIS9dW+a+JrOtMneqQ=; b=maOu7x7o+9GD0V85Zt+4O+zs++KoBGR7hRneaxdB5w2HwI20oiB0IOr2AosVRZ/8Uo jFDEib4Hp00x4NOZK+5YdWTC0FafAOVIzzp72Ex4IQy3MT1rq8VdtywQXgMmwAqV6lKE McjgdnFIRrclBWee5PtWutYidVCr6j5J6B2iMXOLPiMw4CHVUp4Tv3lnjkU33wCX40iX nX1uE0uEjUWNq/IirHJrP9yuRTuE9eqWoJqwS69acrN6VcrJzAl/dwTHaG+3LDDLTmOF fFRm1R56vVuWa7T3rdPQdeb0ifjy7Fm5MqMP+Qw95YNaeV2PLpEtyuXBJvGcF3WwUShT vBxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@thegoodpenguin-co-uk.20150623.gappssmtp.com header.s=20150623 header.b=JpyhFTSO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t20si53750otr.64.2020.02.20.09.43.51; Thu, 20 Feb 2020 09:44:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@thegoodpenguin-co-uk.20150623.gappssmtp.com header.s=20150623 header.b=JpyhFTSO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728434AbgBTRnU (ORCPT + 99 others); Thu, 20 Feb 2020 12:43:20 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:53521 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727233AbgBTRnU (ORCPT ); Thu, 20 Feb 2020 12:43:20 -0500 Received: by mail-wm1-f65.google.com with SMTP id s10so2949055wmh.3 for ; Thu, 20 Feb 2020 09:43:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thegoodpenguin-co-uk.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to; bh=ElSoMQSykyBLZXo/UCCjNoS1sTIS9dW+a+JrOtMneqQ=; b=JpyhFTSOpXDcgcOfgxexvvZMLr16n+hRX9eauBlvL7fDsVeHUuc/s+Ua25MFT/Qwh1 xKIJ+2UgacZRZe9QS65PIohjfhGaiFQcePwQ4D6zUR+KWS/jQkyTuJ/UgTFMaUn+IpOY jVBi6Hkg4h6tFewQxXIWoT0Ig/oPPMfommf1P6AJtS8zxxZiZHoHKTkLYV2K33fMOLyr o2ZKfG3o+H6iY0bdpZcHjOYT9CjAlpMp1DZGSArQO7vq3VLmEUxrp1LsTM/JBoAHxmFE UMXUfkDzXgFlcemBvaTSgCpBOEMLY56fNdm7OT2qZ4p7gbkHdvyx9d1U1FC8gxh8F0y5 x/7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=ElSoMQSykyBLZXo/UCCjNoS1sTIS9dW+a+JrOtMneqQ=; b=E4zyk5Zm68M5BKF84oU2t1fDF6Z5Chp3b1+ERo9RdhMa+Qlx5qIfXjR4nw7wUD1VWQ 4TeMQImF2PApJyx5qDd6PyarW2Q6relaSotVUHz226qUpsiSHWrL6R0+ZGO345xaszsE iwFNsJT1FY2UgolRusJAxkPX82Xj7L0m8naytCCXqSjIjfLDrEg6AbCJgXCvE6KCBwuh s5zExWkCfXsTm8d+3dD7I5ejunx5ofxP6oYb2U4DeCQtw+dWIGM4H923Zx7Hq4Hu61Jw WfXjNgVdbbNZWnXWfhqCxNPcvuYv+DMCUQEDl/C288A9iDZnkhwQMDyCWFrhZAcbhav2 bB5g== X-Gm-Message-State: APjAAAUU1CqNcv5jzWfR3KztPgc5RpTHQlCNkhy3bYGKCPwUX6THWMr/ gMlcszULoGLfQEBNjSqG0W/5uA== X-Received: by 2002:a05:600c:1007:: with SMTP id c7mr5592182wmc.158.1582220597093; Thu, 20 Feb 2020 09:43:17 -0800 (PST) Received: from big-machine ([2a00:23c5:dd80:8400:98d8:49e6:cdcc:25df]) by smtp.gmail.com with ESMTPSA id x7sm310110wrq.41.2020.02.20.09.43.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 09:43:16 -0800 (PST) Date: Thu, 20 Feb 2020 17:43:14 +0000 From: Andrew Murray To: Zhiqiang Hou Cc: linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, bhelgaas@google.com, robh+dt@kernel.org, andrew.murray@arm.com, arnd@arndb.de, mark.rutland@arm.com, l.subrahmanya@mobiveil.co.in, shawnguo@kernel.org, m.karthikeyan@mobiveil.co.in, leoyang.li@nxp.com, lorenzo.pieralisi@arm.com, catalin.marinas@arm.com, will.deacon@arm.com, Mingkai.Hu@nxp.com, Minghuan.Lian@nxp.com, Xiaowei.Bao@nxp.com Subject: Re: [PATCHv10 11/13] PCI: mobiveil: Add PCIe Gen4 RC driver for NXP Layerscape SoCs Message-ID: <20200220174314.GK19388@big-machine> References: <20200213040644.45858-1-Zhiqiang.Hou@nxp.com> <20200213040644.45858-12-Zhiqiang.Hou@nxp.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20200213040644.45858-12-Zhiqiang.Hou@nxp.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Feb 13, 2020 at 12:06:42PM +0800, Zhiqiang Hou wrote: > From: Hou Zhiqiang > > This PCIe controller is based on the Mobiveil GPEX IP, which is > compatible with the PCI Express™ Base Specification, Revision 4.0. > > Signed-off-by: Hou Zhiqiang > Reviewed-by: Minghuan Lian Reviewed-by: Andrew Murray > --- > V10: > - Changed the return type of ls_pcie_g4_reinit_hw() to void. > - Moved Header Type check to mobiveil_pcie_host_probe(). > > drivers/pci/controller/mobiveil/Kconfig | 9 + > drivers/pci/controller/mobiveil/Makefile | 1 + > .../mobiveil/pcie-layerscape-gen4.c | 267 ++++++++++++++++++ > .../pci/controller/mobiveil/pcie-mobiveil.h | 16 +- > 4 files changed, 291 insertions(+), 2 deletions(-) > create mode 100644 drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c > > diff --git a/drivers/pci/controller/mobiveil/Kconfig b/drivers/pci/controller/mobiveil/Kconfig > index 54161d4ddb11..7439991ee82c 100644 > --- a/drivers/pci/controller/mobiveil/Kconfig > +++ b/drivers/pci/controller/mobiveil/Kconfig > @@ -21,4 +21,13 @@ config PCIE_MOBIVEIL_PLAT > Soft IP. It has up to 8 outbound and inbound windows > for address translation and it is a PCIe Gen4 IP. > > +config PCIE_LAYERSCAPE_GEN4 > + bool "Freescale Layerscape PCIe Gen4 controller" > + depends on PCI > + depends on OF && (ARM64 || ARCH_LAYERSCAPE) > + depends on PCI_MSI_IRQ_DOMAIN > + select PCIE_MOBIVEIL_HOST > + help > + Say Y here if you want PCIe Gen4 controller support on > + Layerscape SoCs. > endmenu > diff --git a/drivers/pci/controller/mobiveil/Makefile b/drivers/pci/controller/mobiveil/Makefile > index 9fb6d1c6504d..99d879de32d6 100644 > --- a/drivers/pci/controller/mobiveil/Makefile > +++ b/drivers/pci/controller/mobiveil/Makefile > @@ -2,3 +2,4 @@ > obj-$(CONFIG_PCIE_MOBIVEIL) += pcie-mobiveil.o > obj-$(CONFIG_PCIE_MOBIVEIL_HOST) += pcie-mobiveil-host.o > obj-$(CONFIG_PCIE_MOBIVEIL_PLAT) += pcie-mobiveil-plat.o > +obj-$(CONFIG_PCIE_LAYERSCAPE_GEN4) += pcie-layerscape-gen4.o > diff --git a/drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c b/drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c > new file mode 100644 > index 000000000000..f3bd5f5ad229 > --- /dev/null > +++ b/drivers/pci/controller/mobiveil/pcie-layerscape-gen4.c > @@ -0,0 +1,267 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * PCIe Gen4 host controller driver for NXP Layerscape SoCs > + * > + * Copyright 2019-2020 NXP > + * > + * Author: Zhiqiang Hou > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include "pcie-mobiveil.h" > + > +/* LUT and PF control registers */ > +#define PCIE_LUT_OFF 0x80000 > +#define PCIE_PF_OFF 0xc0000 > +#define PCIE_PF_INT_STAT 0x18 > +#define PF_INT_STAT_PABRST BIT(31) > + > +#define PCIE_PF_DBG 0x7fc > +#define PF_DBG_LTSSM_MASK 0x3f > +#define PF_DBG_LTSSM_L0 0x2d /* L0 state */ > +#define PF_DBG_WE BIT(31) > +#define PF_DBG_PABR BIT(27) > + > +#define to_ls_pcie_g4(x) platform_get_drvdata((x)->pdev) > + > +struct ls_pcie_g4 { > + struct mobiveil_pcie pci; > + struct delayed_work dwork; > + int irq; > +}; > + > +static inline u32 ls_pcie_g4_lut_readl(struct ls_pcie_g4 *pcie, u32 off) > +{ > + return ioread32(pcie->pci.csr_axi_slave_base + PCIE_LUT_OFF + off); > +} > + > +static inline void ls_pcie_g4_lut_writel(struct ls_pcie_g4 *pcie, > + u32 off, u32 val) > +{ > + iowrite32(val, pcie->pci.csr_axi_slave_base + PCIE_LUT_OFF + off); > +} > + > +static inline u32 ls_pcie_g4_pf_readl(struct ls_pcie_g4 *pcie, u32 off) > +{ > + return ioread32(pcie->pci.csr_axi_slave_base + PCIE_PF_OFF + off); > +} > + > +static inline void ls_pcie_g4_pf_writel(struct ls_pcie_g4 *pcie, > + u32 off, u32 val) > +{ > + iowrite32(val, pcie->pci.csr_axi_slave_base + PCIE_PF_OFF + off); > +} > + > +static int ls_pcie_g4_link_up(struct mobiveil_pcie *pci) > +{ > + struct ls_pcie_g4 *pcie = to_ls_pcie_g4(pci); > + u32 state; > + > + state = ls_pcie_g4_pf_readl(pcie, PCIE_PF_DBG); > + state = state & PF_DBG_LTSSM_MASK; > + > + if (state == PF_DBG_LTSSM_L0) > + return 1; > + > + return 0; > +} > + > +static void ls_pcie_g4_disable_interrupt(struct ls_pcie_g4 *pcie) > +{ > + struct mobiveil_pcie *mv_pci = &pcie->pci; > + > + mobiveil_csr_writel(mv_pci, 0, PAB_INTP_AMBA_MISC_ENB); > +} > + > +static void ls_pcie_g4_enable_interrupt(struct ls_pcie_g4 *pcie) > +{ > + struct mobiveil_pcie *mv_pci = &pcie->pci; > + u32 val; > + > + /* Clear the interrupt status */ > + mobiveil_csr_writel(mv_pci, 0xffffffff, PAB_INTP_AMBA_MISC_STAT); > + > + val = PAB_INTP_INTX_MASK | PAB_INTP_MSI | PAB_INTP_RESET | > + PAB_INTP_PCIE_UE | PAB_INTP_IE_PMREDI | PAB_INTP_IE_EC; > + mobiveil_csr_writel(mv_pci, val, PAB_INTP_AMBA_MISC_ENB); > +} > + > +static int ls_pcie_g4_reinit_hw(struct ls_pcie_g4 *pcie) > +{ > + struct mobiveil_pcie *mv_pci = &pcie->pci; > + struct device *dev = &mv_pci->pdev->dev; > + u32 val, act_stat; > + int to = 100; > + > + /* Poll for pab_csb_reset to set and PAB activity to clear */ > + do { > + usleep_range(10, 15); > + val = ls_pcie_g4_pf_readl(pcie, PCIE_PF_INT_STAT); > + act_stat = mobiveil_csr_readl(mv_pci, PAB_ACTIVITY_STAT); > + } while (((val & PF_INT_STAT_PABRST) == 0 || act_stat) && to--); > + if (to < 0) { > + dev_err(dev, "Poll PABRST&PABACT timeout\n"); > + return -EIO; > + } > + > + /* clear PEX_RESET bit in PEX_PF0_DBG register */ > + val = ls_pcie_g4_pf_readl(pcie, PCIE_PF_DBG); > + val |= PF_DBG_WE; > + ls_pcie_g4_pf_writel(pcie, PCIE_PF_DBG, val); > + > + val = ls_pcie_g4_pf_readl(pcie, PCIE_PF_DBG); > + val |= PF_DBG_PABR; > + ls_pcie_g4_pf_writel(pcie, PCIE_PF_DBG, val); > + > + val = ls_pcie_g4_pf_readl(pcie, PCIE_PF_DBG); > + val &= ~PF_DBG_WE; > + ls_pcie_g4_pf_writel(pcie, PCIE_PF_DBG, val); > + > + mobiveil_host_init(mv_pci, true); > + > + to = 100; > + while (!ls_pcie_g4_link_up(mv_pci) && to--) > + usleep_range(200, 250); > + if (to < 0) { > + dev_err(dev, "PCIe link training timeout\n"); > + return -EIO; > + } > + > + return 0; > +} > + > +static irqreturn_t ls_pcie_g4_isr(int irq, void *dev_id) > +{ > + struct ls_pcie_g4 *pcie = (struct ls_pcie_g4 *)dev_id; > + struct mobiveil_pcie *mv_pci = &pcie->pci; > + u32 val; > + > + val = mobiveil_csr_readl(mv_pci, PAB_INTP_AMBA_MISC_STAT); > + if (!val) > + return IRQ_NONE; > + > + if (val & PAB_INTP_RESET) { > + ls_pcie_g4_disable_interrupt(pcie); > + schedule_delayed_work(&pcie->dwork, msecs_to_jiffies(1)); > + } > + > + mobiveil_csr_writel(mv_pci, val, PAB_INTP_AMBA_MISC_STAT); > + > + return IRQ_HANDLED; > +} > + > +static int ls_pcie_g4_interrupt_init(struct mobiveil_pcie *mv_pci) > +{ > + struct ls_pcie_g4 *pcie = to_ls_pcie_g4(mv_pci); > + struct platform_device *pdev = mv_pci->pdev; > + struct device *dev = &pdev->dev; > + int ret; > + > + pcie->irq = platform_get_irq_byname(pdev, "intr"); > + if (pcie->irq < 0) { > + dev_err(dev, "Can't get 'intr' IRQ, errno = %d\n", pcie->irq); > + return pcie->irq; > + } > + ret = devm_request_irq(dev, pcie->irq, ls_pcie_g4_isr, > + IRQF_SHARED, pdev->name, pcie); > + if (ret) { > + dev_err(dev, "Can't register PCIe IRQ, errno = %d\n", ret); > + return ret; > + } > + > + return 0; > +} > + > +static void ls_pcie_g4_reset(struct work_struct *work) > +{ > + struct delayed_work *dwork = container_of(work, struct delayed_work, > + work); > + struct ls_pcie_g4 *pcie = container_of(dwork, struct ls_pcie_g4, dwork); > + struct mobiveil_pcie *mv_pci = &pcie->pci; > + u16 ctrl; > + > + ctrl = mobiveil_csr_readw(mv_pci, PCI_BRIDGE_CONTROL); > + ctrl &= ~PCI_BRIDGE_CTL_BUS_RESET; > + mobiveil_csr_writew(mv_pci, ctrl, PCI_BRIDGE_CONTROL); > + > + if (!ls_pcie_g4_reinit_hw(pcie)) > + return; > + > + ls_pcie_g4_enable_interrupt(pcie); > +} > + > +static struct mobiveil_rp_ops ls_pcie_g4_rp_ops = { > + .interrupt_init = ls_pcie_g4_interrupt_init, > +}; > + > +static const struct mobiveil_pab_ops ls_pcie_g4_pab_ops = { > + .link_up = ls_pcie_g4_link_up, > +}; > + > +static int __init ls_pcie_g4_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct pci_host_bridge *bridge; > + struct mobiveil_pcie *mv_pci; > + struct ls_pcie_g4 *pcie; > + struct device_node *np = dev->of_node; > + int ret; > + > + if (!of_parse_phandle(np, "msi-parent", 0)) { > + dev_err(dev, "Failed to find msi-parent\n"); > + return -EINVAL; > + } > + > + bridge = devm_pci_alloc_host_bridge(dev, sizeof(*pcie)); > + if (!bridge) > + return -ENOMEM; > + > + pcie = pci_host_bridge_priv(bridge); > + mv_pci = &pcie->pci; > + > + mv_pci->pdev = pdev; > + mv_pci->ops = &ls_pcie_g4_pab_ops; > + mv_pci->rp.ops = &ls_pcie_g4_rp_ops; > + mv_pci->rp.bridge = bridge; > + > + platform_set_drvdata(pdev, pcie); > + > + INIT_DELAYED_WORK(&pcie->dwork, ls_pcie_g4_reset); > + > + ret = mobiveil_pcie_host_probe(mv_pci); > + if (ret) { > + dev_err(dev, "Fail to probe\n"); > + return ret; > + } > + > + ls_pcie_g4_enable_interrupt(pcie); > + > + return 0; > +} > + > +static const struct of_device_id ls_pcie_g4_of_match[] = { > + { .compatible = "fsl,lx2160a-pcie", }, > + { }, > +}; > + > +static struct platform_driver ls_pcie_g4_driver = { > + .driver = { > + .name = "layerscape-pcie-gen4", > + .of_match_table = ls_pcie_g4_of_match, > + .suppress_bind_attrs = true, > + }, > +}; > + > +builtin_platform_driver_probe(ls_pcie_g4_driver, ls_pcie_g4_probe); > diff --git a/drivers/pci/controller/mobiveil/pcie-mobiveil.h b/drivers/pci/controller/mobiveil/pcie-mobiveil.h > index 72c62b4d8f7b..7b6a403a9fc0 100644 > --- a/drivers/pci/controller/mobiveil/pcie-mobiveil.h > +++ b/drivers/pci/controller/mobiveil/pcie-mobiveil.h > @@ -43,6 +43,8 @@ > #define PAGE_LO_MASK 0x3ff > #define PAGE_SEL_OFFSET_SHIFT 10 > > +#define PAB_ACTIVITY_STAT 0x81c > + > #define PAB_AXI_PIO_CTRL 0x0840 > #define APIO_EN_MASK 0xf > > @@ -51,8 +53,18 @@ > > #define PAB_INTP_AMBA_MISC_ENB 0x0b0c > #define PAB_INTP_AMBA_MISC_STAT 0x0b1c > -#define PAB_INTP_INTX_MASK 0x01e0 > -#define PAB_INTP_MSI_MASK 0x8 > +#define PAB_INTP_RESET BIT(1) > +#define PAB_INTP_MSI BIT(3) > +#define PAB_INTP_INTA BIT(5) > +#define PAB_INTP_INTB BIT(6) > +#define PAB_INTP_INTC BIT(7) > +#define PAB_INTP_INTD BIT(8) > +#define PAB_INTP_PCIE_UE BIT(9) > +#define PAB_INTP_IE_PMREDI BIT(29) > +#define PAB_INTP_IE_EC BIT(30) > +#define PAB_INTP_MSI_MASK PAB_INTP_MSI > +#define PAB_INTP_INTX_MASK (PAB_INTP_INTA | PAB_INTP_INTB |\ > + PAB_INTP_INTC | PAB_INTP_INTD) > > #define PAB_AXI_AMAP_CTRL(win) PAB_REG_ADDR(0x0ba0, win) > #define WIN_ENABLE_SHIFT 0 > -- > 2.17.1 >