| Message ID | 20190916021742.22844-4-xiaowei.bao@nxp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add the Mobiveil EP and Layerscape Gen4 EP driver support | expand |
On Mon, Sep 16, 2019 at 10:17:39AM +0800, Xiaowei Bao wrote: > This PCIe controller is based on the Mobiveil GPEX IP, it work in EP > mode if select this config opteration. > > Signed-off-by: Xiaowei Bao <xiaowei.bao@nxp.com> > --- > MAINTAINERS | 2 + > drivers/pci/controller/mobiveil/Kconfig | 17 ++- > drivers/pci/controller/mobiveil/Makefile | 1 + > .../controller/mobiveil/pcie-layerscape-gen4-ep.c | 156 +++++++++++++++++++++ > 4 files changed, 173 insertions(+), 3 deletions(-) > create mode 100644 drivers/pci/controller/mobiveil/pcie-layerscape-gen4-ep.c > > diff --git a/MAINTAINERS b/MAINTAINERS > index b997056..0858b54 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -12363,11 +12363,13 @@ F: drivers/pci/controller/dwc/*layerscape* > > PCI DRIVER FOR NXP LAYERSCAPE GEN4 CONTROLLER > M: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> > +M: Xiaowei Bao <xiaowei.bao@nxp.com> > L: linux-pci@vger.kernel.org > L: linux-arm-kernel@lists.infradead.org > S: Maintained > F: Documentation/devicetree/bindings/pci/layerscape-pcie-gen4.txt > F: drivers/pci/controller/mobibeil/pcie-layerscape-gen4.c > +F: drivers/pci/controller/mobiveil/pcie-layerscape-gen4-ep.c > > PCI DRIVER FOR GENERIC OF HOSTS > M: Will Deacon <will@kernel.org> > diff --git a/drivers/pci/controller/mobiveil/Kconfig b/drivers/pci/controller/mobiveil/Kconfig > index 2054950..0696b6e 100644 > --- a/drivers/pci/controller/mobiveil/Kconfig > +++ b/drivers/pci/controller/mobiveil/Kconfig > @@ -27,13 +27,24 @@ config PCIE_MOBIVEIL_PLAT > for address translation and it is a PCIe Gen4 IP. > > config PCIE_LAYERSCAPE_GEN4 > - bool "Freescale Layerscape PCIe Gen4 controller" > + bool "Freescale Layerscpe PCIe Gen4 controller in RC mode" > 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. The PCIe controller can work in RC or > - EP mode according to RCW[HOST_AGT_PEX] setting. > + Layerscape SoCs. And the PCIe controller work in RC mode > + by setting the RCW[HOST_AGT_PEX] to 0. > + > +config PCIE_LAYERSCAPE_GEN4_EP > + bool "Freescale Layerscpe PCIe Gen4 controller in EP mode" > + depends on PCI > + depends on OF && (ARM64 || ARCH_LAYERSCAPE) > + depends on PCI_ENDPOINT > + select PCIE_MOBIVEIL_EP > + help > + Say Y here if you want PCIe Gen4 controller support on > + Layerscape SoCs. And the PCIe controller work in EP mode > + by setting the RCW[HOST_AGT_PEX] to 1. > endmenu > diff --git a/drivers/pci/controller/mobiveil/Makefile b/drivers/pci/controller/mobiveil/Makefile > index 686d41f..6f54856 100644 > --- a/drivers/pci/controller/mobiveil/Makefile > +++ b/drivers/pci/controller/mobiveil/Makefile > @@ -4,3 +4,4 @@ obj-$(CONFIG_PCIE_MOBIVEIL_HOST) += pcie-mobiveil-host.o > obj-$(CONFIG_PCIE_MOBIVEIL_EP) += pcie-mobiveil-ep.o > obj-$(CONFIG_PCIE_MOBIVEIL_PLAT) += pcie-mobiveil-plat.o > obj-$(CONFIG_PCIE_LAYERSCAPE_GEN4) += pcie-layerscape-gen4.o > +obj-$(CONFIG_PCIE_LAYERSCAPE_GEN4_EP) += pcie-layerscape-gen4-ep.o > diff --git a/drivers/pci/controller/mobiveil/pcie-layerscape-gen4-ep.c b/drivers/pci/controller/mobiveil/pcie-layerscape-gen4-ep.c > new file mode 100644 > index 0000000..7bfec51 > --- /dev/null > +++ b/drivers/pci/controller/mobiveil/pcie-layerscape-gen4-ep.c > @@ -0,0 +1,156 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * PCIe controller EP driver for Freescale Layerscape SoCs > + * > + * Copyright (C) 2019 NXP Semiconductor. > + * > + * Author: Xiaowei Bao <xiaowei.bao@nxp.com> > + */ > + > +#include <linux/kernel.h> > +#include <linux/init.h> > +#include <linux/of_pci.h> > +#include <linux/of_platform.h> > +#include <linux/of_address.h> > +#include <linux/pci.h> > +#include <linux/platform_device.h> > +#include <linux/resource.h> > + > +#include "pcie-mobiveil.h" > + > +#define PCIE_LX2_BAR_NUM 4 > + > +#define to_ls_pcie_g4_ep(x) dev_get_drvdata((x)->dev) > + > +struct ls_pcie_g4_ep { > + struct mobiveil_pcie *mv_pci; > +}; > + > +static const struct of_device_id ls_pcie_g4_ep_of_match[] = { > + { .compatible = "fsl,lx2160a-pcie-ep",}, > + { }, > +}; > + > +static const struct pci_epc_features ls_pcie_g4_epc_features = { > + .linkup_notifier = false, > + .msi_capable = true, > + .msix_capable = true, > + .reserved_bar = (1 << BAR_4) | (1 << BAR_5), BIT(BAR_4) | BIT(BAR_5) ? > +}; > + > +static const struct pci_epc_features* > +ls_pcie_g4_ep_get_features(struct mobiveil_pcie_ep *ep) > +{ > + return &ls_pcie_g4_epc_features; > +} > + > +static void ls_pcie_g4_ep_init(struct mobiveil_pcie_ep *ep) > +{ > + struct mobiveil_pcie *mv_pci = to_mobiveil_pcie_from_ep(ep); > + int win_idx; > + u8 bar; > + > + ep->bar_num = PCIE_LX2_BAR_NUM; > + > + for (bar = BAR_0; bar < ep->epc->max_functions * ep->bar_num; bar++) > + mobiveil_pcie_ep_reset_bar(mv_pci, bar); > + > + for (win_idx = 0; win_idx < ep->apio_wins; win_idx++) > + mobiveil_pcie_disable_ob_win(mv_pci, win_idx); > +} > + > +static int ls_pcie_g4_ep_raise_irq(struct mobiveil_pcie_ep *ep, u8 func_no, > + enum pci_epc_irq_type type, > + u16 interrupt_num) > +{ > + struct mobiveil_pcie *mv_pci = to_mobiveil_pcie_from_ep(ep); > + > + switch (type) { > + case PCI_EPC_IRQ_LEGACY: > + return mobiveil_pcie_ep_raise_legacy_irq(ep, func_no); > + case PCI_EPC_IRQ_MSI: > + return mobiveil_pcie_ep_raise_msi_irq(ep, func_no, > + interrupt_num); > + case PCI_EPC_IRQ_MSIX: > + return mobiveil_pcie_ep_raise_msix_irq(ep, func_no, > + interrupt_num); > + default: > + dev_err(&mv_pci->pdev->dev, "UNKNOWN IRQ type\n"); > + } > + > + return 0; > +} > + > +static const struct mobiveil_pcie_ep_ops pcie_ep_ops = { > + .ep_init = ls_pcie_g4_ep_init, > + .raise_irq = ls_pcie_g4_ep_raise_irq, > + .get_features = ls_pcie_g4_ep_get_features, > +}; > + > +static int __init ls_pcie_gen4_add_pcie_ep(struct ls_pcie_g4_ep *ls_ep, > + struct platform_device *pdev) > +{ > + struct mobiveil_pcie *mv_pci = ls_ep->mv_pci; > + struct device *dev = &pdev->dev; > + struct mobiveil_pcie_ep *ep; > + struct resource *res; > + int ret; > + > + ep = &mv_pci->ep; > + ep->ops = &pcie_ep_ops; > + > + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "addr_space"); > + if (!res) > + return -EINVAL; > + > + ep->phys_base = res->start; > + ep->addr_size = resource_size(res); > + > + ret = mobiveil_pcie_ep_init(ep); > + if (ret) { > + dev_err(dev, "failed to initialize layerscape endpoint\n"); > + return ret; > + } > + > + return 0; > +} > + > +static int __init ls_pcie_g4_ep_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct mobiveil_pcie *mv_pci; > + struct ls_pcie_g4_ep *ls_ep; > + struct resource *res; > + int ret; > + > + ls_ep = devm_kzalloc(dev, sizeof(*ls_ep), GFP_KERNEL); > + if (!ls_ep) > + return -ENOMEM; > + > + mv_pci = devm_kzalloc(dev, sizeof(*mv_pci), GFP_KERNEL); > + if (!mv_pci) > + return -ENOMEM; > + > + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs"); > + mv_pci->csr_axi_slave_base = devm_pci_remap_cfg_resource(dev, res); > + if (IS_ERR(mv_pci->csr_axi_slave_base)) > + return PTR_ERR(mv_pci->csr_axi_slave_base); > + > + mv_pci->pdev = pdev; > + ls_ep->mv_pci = mv_pci; > + > + platform_set_drvdata(pdev, ls_ep); > + > + ret = ls_pcie_gen4_add_pcie_ep(ls_ep, pdev); > + > + return ret; > +} > + > +static struct platform_driver ls_pcie_g4_ep_driver = { > + .driver = { > + .name = "layerscape-pcie-gen4-ep", > + .of_match_table = ls_pcie_g4_ep_of_match, > + .suppress_bind_attrs = true, > + }, > +}; > +builtin_platform_driver_probe(ls_pcie_g4_ep_driver, ls_pcie_g4_ep_probe); > -- > 2.9.5 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel >
> -----Original Message----- > From: Russell King - ARM Linux admin <linux@armlinux.org.uk> > Sent: 2019年9月25日 0:39 > To: Xiaowei Bao <xiaowei.bao@nxp.com> > Cc: Z.q. Hou <zhiqiang.hou@nxp.com>; bhelgaas@google.com; > robh+dt@kernel.org; mark.rutland@arm.com; shawnguo@kernel.org; Leo Li > <leoyang.li@nxp.com>; kishon@ti.com; lorenzo.pieralisi@arm.com; M.h. Lian > <minghuan.lian@nxp.com>; andrew.murray@arm.com; Mingkai Hu > <mingkai.hu@nxp.com>; linux-pci@vger.kernel.org; > linux-arm-kernel@lists.infradead.org; devicetree@vger.kernel.org; > linux-kernel@vger.kernel.org > Subject: Re: [PATCH 3/6] PCI: mobiveil: Add PCIe Gen4 EP driver for NXP > Layerscape SoCs > > On Mon, Sep 16, 2019 at 10:17:39AM +0800, Xiaowei Bao wrote: > > This PCIe controller is based on the Mobiveil GPEX IP, it work in EP > > mode if select this config opteration. > > > > Signed-off-by: Xiaowei Bao <xiaowei.bao@nxp.com> > > --- > > MAINTAINERS | 2 + > > drivers/pci/controller/mobiveil/Kconfig | 17 ++- > > drivers/pci/controller/mobiveil/Makefile | 1 + > > .../controller/mobiveil/pcie-layerscape-gen4-ep.c | 156 > > +++++++++++++++++++++ > > 4 files changed, 173 insertions(+), 3 deletions(-) create mode > > 100644 drivers/pci/controller/mobiveil/pcie-layerscape-gen4-ep.c > > > > diff --git a/MAINTAINERS b/MAINTAINERS index b997056..0858b54 100644 > > --- a/MAINTAINERS > > +++ b/MAINTAINERS > > @@ -12363,11 +12363,13 @@ F: > drivers/pci/controller/dwc/*layerscape* > > > > PCI DRIVER FOR NXP LAYERSCAPE GEN4 CONTROLLER > > M: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> > > +M: Xiaowei Bao <xiaowei.bao@nxp.com> > > L: linux-pci@vger.kernel.org > > L: linux-arm-kernel@lists.infradead.org > > S: Maintained > > F: Documentation/devicetree/bindings/pci/layerscape-pcie-gen4.txt > > F: drivers/pci/controller/mobibeil/pcie-layerscape-gen4.c > > +F: drivers/pci/controller/mobiveil/pcie-layerscape-gen4-ep.c > > > > PCI DRIVER FOR GENERIC OF HOSTS > > M: Will Deacon <will@kernel.org> > > diff --git a/drivers/pci/controller/mobiveil/Kconfig > > b/drivers/pci/controller/mobiveil/Kconfig > > index 2054950..0696b6e 100644 > > --- a/drivers/pci/controller/mobiveil/Kconfig > > +++ b/drivers/pci/controller/mobiveil/Kconfig > > @@ -27,13 +27,24 @@ config PCIE_MOBIVEIL_PLAT > > for address translation and it is a PCIe Gen4 IP. > > > > config PCIE_LAYERSCAPE_GEN4 > > - bool "Freescale Layerscape PCIe Gen4 controller" > > + bool "Freescale Layerscpe PCIe Gen4 controller in RC mode" > > 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. The PCIe controller can work in RC or > > - EP mode according to RCW[HOST_AGT_PEX] setting. > > + Layerscape SoCs. And the PCIe controller work in RC mode > > + by setting the RCW[HOST_AGT_PEX] to 0. > > + > > +config PCIE_LAYERSCAPE_GEN4_EP > > + bool "Freescale Layerscpe PCIe Gen4 controller in EP mode" > > + depends on PCI > > + depends on OF && (ARM64 || ARCH_LAYERSCAPE) > > + depends on PCI_ENDPOINT > > + select PCIE_MOBIVEIL_EP > > + help > > + Say Y here if you want PCIe Gen4 controller support on > > + Layerscape SoCs. And the PCIe controller work in EP mode > > + by setting the RCW[HOST_AGT_PEX] to 1. > > endmenu > > diff --git a/drivers/pci/controller/mobiveil/Makefile > > b/drivers/pci/controller/mobiveil/Makefile > > index 686d41f..6f54856 100644 > > --- a/drivers/pci/controller/mobiveil/Makefile > > +++ b/drivers/pci/controller/mobiveil/Makefile > > @@ -4,3 +4,4 @@ obj-$(CONFIG_PCIE_MOBIVEIL_HOST) += > > pcie-mobiveil-host.o > > obj-$(CONFIG_PCIE_MOBIVEIL_EP) += pcie-mobiveil-ep.o > > obj-$(CONFIG_PCIE_MOBIVEIL_PLAT) += pcie-mobiveil-plat.o > > obj-$(CONFIG_PCIE_LAYERSCAPE_GEN4) += pcie-layerscape-gen4.o > > +obj-$(CONFIG_PCIE_LAYERSCAPE_GEN4_EP) += > pcie-layerscape-gen4-ep.o > > diff --git a/drivers/pci/controller/mobiveil/pcie-layerscape-gen4-ep.c > > b/drivers/pci/controller/mobiveil/pcie-layerscape-gen4-ep.c > > new file mode 100644 > > index 0000000..7bfec51 > > --- /dev/null > > +++ b/drivers/pci/controller/mobiveil/pcie-layerscape-gen4-ep.c > > @@ -0,0 +1,156 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > +/* > > + * PCIe controller EP driver for Freescale Layerscape SoCs > > + * > > + * Copyright (C) 2019 NXP Semiconductor. > > + * > > + * Author: Xiaowei Bao <xiaowei.bao@nxp.com> */ > > + > > +#include <linux/kernel.h> > > +#include <linux/init.h> > > +#include <linux/of_pci.h> > > +#include <linux/of_platform.h> > > +#include <linux/of_address.h> > > +#include <linux/pci.h> > > +#include <linux/platform_device.h> > > +#include <linux/resource.h> > > + > > +#include "pcie-mobiveil.h" > > + > > +#define PCIE_LX2_BAR_NUM 4 > > + > > +#define to_ls_pcie_g4_ep(x) dev_get_drvdata((x)->dev) > > + > > +struct ls_pcie_g4_ep { > > + struct mobiveil_pcie *mv_pci; > > +}; > > + > > +static const struct of_device_id ls_pcie_g4_ep_of_match[] = { > > + { .compatible = "fsl,lx2160a-pcie-ep",}, > > + { }, > > +}; > > + > > +static const struct pci_epc_features ls_pcie_g4_epc_features = { > > + .linkup_notifier = false, > > + .msi_capable = true, > > + .msix_capable = true, > > + .reserved_bar = (1 << BAR_4) | (1 << BAR_5), > > BIT(BAR_4) | BIT(BAR_5) ? I think use .reserved_bar = (1 << BAR_4) | (1 << BAR_5), is better, because BAR_4 is not a bit of register. Thanks Xiaowei > > > +}; > > + > > +static const struct pci_epc_features* > > +ls_pcie_g4_ep_get_features(struct mobiveil_pcie_ep *ep) { > > + return &ls_pcie_g4_epc_features; > > +} > > + > > +static void ls_pcie_g4_ep_init(struct mobiveil_pcie_ep *ep) { > > + struct mobiveil_pcie *mv_pci = to_mobiveil_pcie_from_ep(ep); > > + int win_idx; > > + u8 bar; > > + > > + ep->bar_num = PCIE_LX2_BAR_NUM; > > + > > + for (bar = BAR_0; bar < ep->epc->max_functions * ep->bar_num; bar++) > > + mobiveil_pcie_ep_reset_bar(mv_pci, bar); > > + > > + for (win_idx = 0; win_idx < ep->apio_wins; win_idx++) > > + mobiveil_pcie_disable_ob_win(mv_pci, win_idx); } > > + > > +static int ls_pcie_g4_ep_raise_irq(struct mobiveil_pcie_ep *ep, u8 > func_no, > > + enum pci_epc_irq_type type, > > + u16 interrupt_num) > > +{ > > + struct mobiveil_pcie *mv_pci = to_mobiveil_pcie_from_ep(ep); > > + > > + switch (type) { > > + case PCI_EPC_IRQ_LEGACY: > > + return mobiveil_pcie_ep_raise_legacy_irq(ep, func_no); > > + case PCI_EPC_IRQ_MSI: > > + return mobiveil_pcie_ep_raise_msi_irq(ep, func_no, > > + interrupt_num); > > + case PCI_EPC_IRQ_MSIX: > > + return mobiveil_pcie_ep_raise_msix_irq(ep, func_no, > > + interrupt_num); > > + default: > > + dev_err(&mv_pci->pdev->dev, "UNKNOWN IRQ type\n"); > > + } > > + > > + return 0; > > +} > > + > > +static const struct mobiveil_pcie_ep_ops pcie_ep_ops = { > > + .ep_init = ls_pcie_g4_ep_init, > > + .raise_irq = ls_pcie_g4_ep_raise_irq, > > + .get_features = ls_pcie_g4_ep_get_features, }; > > + > > +static int __init ls_pcie_gen4_add_pcie_ep(struct ls_pcie_g4_ep *ls_ep, > > + struct platform_device *pdev) { > > + struct mobiveil_pcie *mv_pci = ls_ep->mv_pci; > > + struct device *dev = &pdev->dev; > > + struct mobiveil_pcie_ep *ep; > > + struct resource *res; > > + int ret; > > + > > + ep = &mv_pci->ep; > > + ep->ops = &pcie_ep_ops; > > + > > + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, > "addr_space"); > > + if (!res) > > + return -EINVAL; > > + > > + ep->phys_base = res->start; > > + ep->addr_size = resource_size(res); > > + > > + ret = mobiveil_pcie_ep_init(ep); > > + if (ret) { > > + dev_err(dev, "failed to initialize layerscape endpoint\n"); > > + return ret; > > + } > > + > > + return 0; > > +} > > + > > +static int __init ls_pcie_g4_ep_probe(struct platform_device *pdev) { > > + struct device *dev = &pdev->dev; > > + struct mobiveil_pcie *mv_pci; > > + struct ls_pcie_g4_ep *ls_ep; > > + struct resource *res; > > + int ret; > > + > > + ls_ep = devm_kzalloc(dev, sizeof(*ls_ep), GFP_KERNEL); > > + if (!ls_ep) > > + return -ENOMEM; > > + > > + mv_pci = devm_kzalloc(dev, sizeof(*mv_pci), GFP_KERNEL); > > + if (!mv_pci) > > + return -ENOMEM; > > + > > + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs"); > > + mv_pci->csr_axi_slave_base = devm_pci_remap_cfg_resource(dev, res); > > + if (IS_ERR(mv_pci->csr_axi_slave_base)) > > + return PTR_ERR(mv_pci->csr_axi_slave_base); > > + > > + mv_pci->pdev = pdev; > > + ls_ep->mv_pci = mv_pci; > > + > > + platform_set_drvdata(pdev, ls_ep); > > + > > + ret = ls_pcie_gen4_add_pcie_ep(ls_ep, pdev); > > + > > + return ret; > > +} > > + > > +static struct platform_driver ls_pcie_g4_ep_driver = { > > + .driver = { > > + .name = "layerscape-pcie-gen4-ep", > > + .of_match_table = ls_pcie_g4_ep_of_match, > > + .suppress_bind_attrs = true, > > + }, > > +}; > > +builtin_platform_driver_probe(ls_pcie_g4_ep_driver, > > +ls_pcie_g4_ep_probe); > > -- > > 2.9.5 > > > > > > _______________________________________________ > > linux-arm-kernel mailing list > > linux-arm-kernel@lists.infradead.org > > https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Flists > > .infradead.org%2Fmailman%2Flistinfo%2Flinux-arm-kernel&data=02% > 7C0 > > > 1%7Cxiaowei.bao%40nxp.com%7C9db3971107ba4496343708d7410db3a4% > 7C686ea1d > > > 3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637049399428529745&sd > ata=Ei3I7 > > atvZewWtFMgVzPeX9ilmcKOmgA6VlFXejn1AxQ%3D&reserved=0 > > > > -- > RMK's Patch system: > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww. > armlinux.org.uk%2Fdeveloper%2Fpatches%2F&data=02%7C01%7Cxiao > wei.bao%40nxp.com%7C9db3971107ba4496343708d7410db3a4%7C686ea1 > d3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637049399428529745&s > data=6CIc0wpHnBoo0yJ8BICpGKpUlS2g3haRjyNNnT9HZs8%3D&reserve > d=0 > FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps > up According to speedtest.net: 11.9Mbps down 500kbps up
On Tue, Oct 15, 2019 at 07:46:12AM +0000, Xiaowei Bao wrote: > > > > -----Original Message----- > > From: Russell King - ARM Linux admin <linux@armlinux.org.uk> > > Sent: 2019年9月25日 0:39 > > To: Xiaowei Bao <xiaowei.bao@nxp.com> > > Cc: Z.q. Hou <zhiqiang.hou@nxp.com>; bhelgaas@google.com; > > robh+dt@kernel.org; mark.rutland@arm.com; shawnguo@kernel.org; Leo Li > > <leoyang.li@nxp.com>; kishon@ti.com; lorenzo.pieralisi@arm.com; M.h. Lian > > <minghuan.lian@nxp.com>; andrew.murray@arm.com; Mingkai Hu > > <mingkai.hu@nxp.com>; linux-pci@vger.kernel.org; > > linux-arm-kernel@lists.infradead.org; devicetree@vger.kernel.org; > > linux-kernel@vger.kernel.org > > Subject: Re: [PATCH 3/6] PCI: mobiveil: Add PCIe Gen4 EP driver for NXP > > Layerscape SoCs > > > > On Mon, Sep 16, 2019 at 10:17:39AM +0800, Xiaowei Bao wrote: > > > This PCIe controller is based on the Mobiveil GPEX IP, it work in EP > > > mode if select this config opteration. > > > > > > Signed-off-by: Xiaowei Bao <xiaowei.bao@nxp.com> > > > --- > > > MAINTAINERS | 2 + > > > drivers/pci/controller/mobiveil/Kconfig | 17 ++- > > > drivers/pci/controller/mobiveil/Makefile | 1 + > > > .../controller/mobiveil/pcie-layerscape-gen4-ep.c | 156 > > > +++++++++++++++++++++ > > > 4 files changed, 173 insertions(+), 3 deletions(-) create mode > > > 100644 drivers/pci/controller/mobiveil/pcie-layerscape-gen4-ep.c > > > > > > diff --git a/MAINTAINERS b/MAINTAINERS index b997056..0858b54 100644 > > > --- a/MAINTAINERS > > > +++ b/MAINTAINERS > > > @@ -12363,11 +12363,13 @@ F: > > drivers/pci/controller/dwc/*layerscape* > > > > > > PCI DRIVER FOR NXP LAYERSCAPE GEN4 CONTROLLER > > > M: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> > > > +M: Xiaowei Bao <xiaowei.bao@nxp.com> > > > L: linux-pci@vger.kernel.org > > > L: linux-arm-kernel@lists.infradead.org > > > S: Maintained > > > F: Documentation/devicetree/bindings/pci/layerscape-pcie-gen4.txt > > > F: drivers/pci/controller/mobibeil/pcie-layerscape-gen4.c > > > +F: drivers/pci/controller/mobiveil/pcie-layerscape-gen4-ep.c > > > > > > PCI DRIVER FOR GENERIC OF HOSTS > > > M: Will Deacon <will@kernel.org> > > > diff --git a/drivers/pci/controller/mobiveil/Kconfig > > > b/drivers/pci/controller/mobiveil/Kconfig > > > index 2054950..0696b6e 100644 > > > --- a/drivers/pci/controller/mobiveil/Kconfig > > > +++ b/drivers/pci/controller/mobiveil/Kconfig > > > @@ -27,13 +27,24 @@ config PCIE_MOBIVEIL_PLAT > > > for address translation and it is a PCIe Gen4 IP. > > > > > > config PCIE_LAYERSCAPE_GEN4 > > > - bool "Freescale Layerscape PCIe Gen4 controller" > > > + bool "Freescale Layerscpe PCIe Gen4 controller in RC mode" > > > 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. The PCIe controller can work in RC or > > > - EP mode according to RCW[HOST_AGT_PEX] setting. > > > + Layerscape SoCs. And the PCIe controller work in RC mode > > > + by setting the RCW[HOST_AGT_PEX] to 0. > > > + > > > +config PCIE_LAYERSCAPE_GEN4_EP > > > + bool "Freescale Layerscpe PCIe Gen4 controller in EP mode" > > > + depends on PCI > > > + depends on OF && (ARM64 || ARCH_LAYERSCAPE) > > > + depends on PCI_ENDPOINT > > > + select PCIE_MOBIVEIL_EP > > > + help > > > + Say Y here if you want PCIe Gen4 controller support on > > > + Layerscape SoCs. And the PCIe controller work in EP mode > > > + by setting the RCW[HOST_AGT_PEX] to 1. > > > endmenu > > > diff --git a/drivers/pci/controller/mobiveil/Makefile > > > b/drivers/pci/controller/mobiveil/Makefile > > > index 686d41f..6f54856 100644 > > > --- a/drivers/pci/controller/mobiveil/Makefile > > > +++ b/drivers/pci/controller/mobiveil/Makefile > > > @@ -4,3 +4,4 @@ obj-$(CONFIG_PCIE_MOBIVEIL_HOST) += > > > pcie-mobiveil-host.o > > > obj-$(CONFIG_PCIE_MOBIVEIL_EP) += pcie-mobiveil-ep.o > > > obj-$(CONFIG_PCIE_MOBIVEIL_PLAT) += pcie-mobiveil-plat.o > > > obj-$(CONFIG_PCIE_LAYERSCAPE_GEN4) += pcie-layerscape-gen4.o > > > +obj-$(CONFIG_PCIE_LAYERSCAPE_GEN4_EP) += > > pcie-layerscape-gen4-ep.o > > > diff --git a/drivers/pci/controller/mobiveil/pcie-layerscape-gen4-ep.c > > > b/drivers/pci/controller/mobiveil/pcie-layerscape-gen4-ep.c > > > new file mode 100644 > > > index 0000000..7bfec51 > > > --- /dev/null > > > +++ b/drivers/pci/controller/mobiveil/pcie-layerscape-gen4-ep.c > > > @@ -0,0 +1,156 @@ > > > +// SPDX-License-Identifier: GPL-2.0 > > > +/* > > > + * PCIe controller EP driver for Freescale Layerscape SoCs > > > + * > > > + * Copyright (C) 2019 NXP Semiconductor. > > > + * > > > + * Author: Xiaowei Bao <xiaowei.bao@nxp.com> */ > > > + > > > +#include <linux/kernel.h> > > > +#include <linux/init.h> > > > +#include <linux/of_pci.h> > > > +#include <linux/of_platform.h> > > > +#include <linux/of_address.h> > > > +#include <linux/pci.h> > > > +#include <linux/platform_device.h> > > > +#include <linux/resource.h> > > > + > > > +#include "pcie-mobiveil.h" > > > + > > > +#define PCIE_LX2_BAR_NUM 4 > > > + > > > +#define to_ls_pcie_g4_ep(x) dev_get_drvdata((x)->dev) > > > + > > > +struct ls_pcie_g4_ep { > > > + struct mobiveil_pcie *mv_pci; > > > +}; > > > + > > > +static const struct of_device_id ls_pcie_g4_ep_of_match[] = { > > > + { .compatible = "fsl,lx2160a-pcie-ep",}, > > > + { }, > > > +}; > > > + > > > +static const struct pci_epc_features ls_pcie_g4_epc_features = { > > > + .linkup_notifier = false, > > > + .msi_capable = true, > > > + .msix_capable = true, > > > + .reserved_bar = (1 << BAR_4) | (1 << BAR_5), > > > > BIT(BAR_4) | BIT(BAR_5) ? > > I think use .reserved_bar = (1 << BAR_4) | (1 << BAR_5), is better, because BAR_4 > is not a bit of register. Why is whether it's a register or not relevent?
> -----Original Message----- > From: Russell King - ARM Linux admin <linux@armlinux.org.uk> > Sent: 2019年10月15日 17:08 > To: Xiaowei Bao <xiaowei.bao@nxp.com> > Cc: Z.q. Hou <zhiqiang.hou@nxp.com>; bhelgaas@google.com; > robh+dt@kernel.org; mark.rutland@arm.com; shawnguo@kernel.org; Leo Li > <leoyang.li@nxp.com>; kishon@ti.com; lorenzo.pieralisi@arm.com; M.h. Lian > <minghuan.lian@nxp.com>; andrew.murray@arm.com; Mingkai Hu > <mingkai.hu@nxp.com>; linux-pci@vger.kernel.org; > linux-arm-kernel@lists.infradead.org; devicetree@vger.kernel.org; > linux-kernel@vger.kernel.org > Subject: Re: [PATCH 3/6] PCI: mobiveil: Add PCIe Gen4 EP driver for NXP > Layerscape SoCs > > On Tue, Oct 15, 2019 at 07:46:12AM +0000, Xiaowei Bao wrote: > > > > > > > -----Original Message----- > > > From: Russell King - ARM Linux admin <linux@armlinux.org.uk> > > > Sent: 2019年9月25日 0:39 > > > To: Xiaowei Bao <xiaowei.bao@nxp.com> > > > Cc: Z.q. Hou <zhiqiang.hou@nxp.com>; bhelgaas@google.com; > > > robh+dt@kernel.org; mark.rutland@arm.com; shawnguo@kernel.org; Leo > > > robh+Li > > > <leoyang.li@nxp.com>; kishon@ti.com; lorenzo.pieralisi@arm.com; M.h. > > > Lian <minghuan.lian@nxp.com>; andrew.murray@arm.com; Mingkai Hu > > > <mingkai.hu@nxp.com>; linux-pci@vger.kernel.org; > > > linux-arm-kernel@lists.infradead.org; devicetree@vger.kernel.org; > > > linux-kernel@vger.kernel.org > > > Subject: Re: [PATCH 3/6] PCI: mobiveil: Add PCIe Gen4 EP driver for > > > NXP Layerscape SoCs > > > > > > On Mon, Sep 16, 2019 at 10:17:39AM +0800, Xiaowei Bao wrote: > > > > This PCIe controller is based on the Mobiveil GPEX IP, it work in > > > > EP mode if select this config opteration. > > > > > > > > Signed-off-by: Xiaowei Bao <xiaowei.bao@nxp.com> > > > > --- > > > > MAINTAINERS | 2 > + > > > > drivers/pci/controller/mobiveil/Kconfig | 17 ++- > > > > drivers/pci/controller/mobiveil/Makefile | 1 + > > > > .../controller/mobiveil/pcie-layerscape-gen4-ep.c | 156 > > > > +++++++++++++++++++++ > > > > 4 files changed, 173 insertions(+), 3 deletions(-) create mode > > > > 100644 drivers/pci/controller/mobiveil/pcie-layerscape-gen4-ep.c > > > > > > > > diff --git a/MAINTAINERS b/MAINTAINERS index b997056..0858b54 > > > > 100644 > > > > --- a/MAINTAINERS > > > > +++ b/MAINTAINERS > > > > @@ -12363,11 +12363,13 @@ F: > > > drivers/pci/controller/dwc/*layerscape* > > > > > > > > PCI DRIVER FOR NXP LAYERSCAPE GEN4 CONTROLLER > > > > M: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> > > > > +M: Xiaowei Bao <xiaowei.bao@nxp.com> > > > > L: linux-pci@vger.kernel.org > > > > L: linux-arm-kernel@lists.infradead.org > > > > S: Maintained > > > > F: Documentation/devicetree/bindings/pci/layerscape-pcie-gen4.txt > > > > F: drivers/pci/controller/mobibeil/pcie-layerscape-gen4.c > > > > +F: drivers/pci/controller/mobiveil/pcie-layerscape-gen4-ep.c > > > > > > > > PCI DRIVER FOR GENERIC OF HOSTS > > > > M: Will Deacon <will@kernel.org> > > > > diff --git a/drivers/pci/controller/mobiveil/Kconfig > > > > b/drivers/pci/controller/mobiveil/Kconfig > > > > index 2054950..0696b6e 100644 > > > > --- a/drivers/pci/controller/mobiveil/Kconfig > > > > +++ b/drivers/pci/controller/mobiveil/Kconfig > > > > @@ -27,13 +27,24 @@ config PCIE_MOBIVEIL_PLAT > > > > for address translation and it is a PCIe Gen4 IP. > > > > > > > > config PCIE_LAYERSCAPE_GEN4 > > > > - bool "Freescale Layerscape PCIe Gen4 controller" > > > > + bool "Freescale Layerscpe PCIe Gen4 controller in RC mode" > > > > 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. The PCIe controller can work in RC or > > > > - EP mode according to RCW[HOST_AGT_PEX] setting. > > > > + Layerscape SoCs. And the PCIe controller work in RC mode > > > > + by setting the RCW[HOST_AGT_PEX] to 0. > > > > + > > > > +config PCIE_LAYERSCAPE_GEN4_EP > > > > + bool "Freescale Layerscpe PCIe Gen4 controller in EP mode" > > > > + depends on PCI > > > > + depends on OF && (ARM64 || ARCH_LAYERSCAPE) > > > > + depends on PCI_ENDPOINT > > > > + select PCIE_MOBIVEIL_EP > > > > + help > > > > + Say Y here if you want PCIe Gen4 controller support on > > > > + Layerscape SoCs. And the PCIe controller work in EP mode > > > > + by setting the RCW[HOST_AGT_PEX] to 1. > > > > endmenu > > > > diff --git a/drivers/pci/controller/mobiveil/Makefile > > > > b/drivers/pci/controller/mobiveil/Makefile > > > > index 686d41f..6f54856 100644 > > > > --- a/drivers/pci/controller/mobiveil/Makefile > > > > +++ b/drivers/pci/controller/mobiveil/Makefile > > > > @@ -4,3 +4,4 @@ obj-$(CONFIG_PCIE_MOBIVEIL_HOST) += > > > > pcie-mobiveil-host.o > > > > obj-$(CONFIG_PCIE_MOBIVEIL_EP) += pcie-mobiveil-ep.o > > > > obj-$(CONFIG_PCIE_MOBIVEIL_PLAT) += pcie-mobiveil-plat.o > > > > obj-$(CONFIG_PCIE_LAYERSCAPE_GEN4) += pcie-layerscape-gen4.o > > > > +obj-$(CONFIG_PCIE_LAYERSCAPE_GEN4_EP) += > > > pcie-layerscape-gen4-ep.o > > > > diff --git > > > > a/drivers/pci/controller/mobiveil/pcie-layerscape-gen4-ep.c > > > > b/drivers/pci/controller/mobiveil/pcie-layerscape-gen4-ep.c > > > > new file mode 100644 > > > > index 0000000..7bfec51 > > > > --- /dev/null > > > > +++ b/drivers/pci/controller/mobiveil/pcie-layerscape-gen4-ep.c > > > > @@ -0,0 +1,156 @@ > > > > +// SPDX-License-Identifier: GPL-2.0 > > > > +/* > > > > + * PCIe controller EP driver for Freescale Layerscape SoCs > > > > + * > > > > + * Copyright (C) 2019 NXP Semiconductor. > > > > + * > > > > + * Author: Xiaowei Bao <xiaowei.bao@nxp.com> */ > > > > + > > > > +#include <linux/kernel.h> > > > > +#include <linux/init.h> > > > > +#include <linux/of_pci.h> > > > > +#include <linux/of_platform.h> > > > > +#include <linux/of_address.h> > > > > +#include <linux/pci.h> > > > > +#include <linux/platform_device.h> #include <linux/resource.h> > > > > + > > > > +#include "pcie-mobiveil.h" > > > > + > > > > +#define PCIE_LX2_BAR_NUM 4 > > > > + > > > > +#define to_ls_pcie_g4_ep(x) dev_get_drvdata((x)->dev) > > > > + > > > > +struct ls_pcie_g4_ep { > > > > + struct mobiveil_pcie *mv_pci; > > > > +}; > > > > + > > > > +static const struct of_device_id ls_pcie_g4_ep_of_match[] = { > > > > + { .compatible = "fsl,lx2160a-pcie-ep",}, > > > > + { }, > > > > +}; > > > > + > > > > +static const struct pci_epc_features ls_pcie_g4_epc_features = { > > > > + .linkup_notifier = false, > > > > + .msi_capable = true, > > > > + .msix_capable = true, > > > > + .reserved_bar = (1 << BAR_4) | (1 << BAR_5), > > > > > > BIT(BAR_4) | BIT(BAR_5) ? > > > > I think use .reserved_bar = (1 << BAR_4) | (1 << BAR_5), is better, > > because BAR_4 is not a bit of register. > > Why is whether it's a register or not relevent? My understand is that the BIT is used to register, refer to other EP driver files, it also use 1 << BAR_4 method. [baoxw@titan controller]$ grep -r "reserved_bar" * dwc/pci-keystone.c: .reserved_bar = 1 << BAR_0 | 1 << BAR_1, mobiveil/pcie-layerscape-gen4-ep.c: .reserved_bar = (1 << BAR_4) | (1 << BAR_5), Thanks Xiaowei > > -- > RMK's Patch system: > https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww. > armlinux.org.uk%2Fdeveloper%2Fpatches%2F&data=02%7C01%7Cxiao > wei.bao%40nxp.com%7C3920d451f28b474ff67308d7514f3364%7C686ea1d3 > bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637067272935564347&sda > ta=mw%2FyCyJ%2FpjC59XWgYjLk73zYQUdyy4zXjJ1B1bStZOc%3D&reser > ved=0 > FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps > up According to speedtest.net: 11.9Mbps down 500kbps up
On Tue, Oct 15, 2019 at 09:14:00AM +0000, Xiaowei Bao wrote: > > -----Original Message----- > > From: Russell King - ARM Linux admin <linux@armlinux.org.uk> > > Sent: 2019年10月15日 17:08 > > To: Xiaowei Bao <xiaowei.bao@nxp.com> > > Cc: Z.q. Hou <zhiqiang.hou@nxp.com>; bhelgaas@google.com; > > robh+dt@kernel.org; mark.rutland@arm.com; shawnguo@kernel.org; Leo Li > > <leoyang.li@nxp.com>; kishon@ti.com; lorenzo.pieralisi@arm.com; M.h. Lian > > <minghuan.lian@nxp.com>; andrew.murray@arm.com; Mingkai Hu > > <mingkai.hu@nxp.com>; linux-pci@vger.kernel.org; > > linux-arm-kernel@lists.infradead.org; devicetree@vger.kernel.org; > > linux-kernel@vger.kernel.org > > Subject: Re: [PATCH 3/6] PCI: mobiveil: Add PCIe Gen4 EP driver for NXP > > Layerscape SoCs > > > > On Tue, Oct 15, 2019 at 07:46:12AM +0000, Xiaowei Bao wrote: > > > > > > > > > > -----Original Message----- > > > > From: Russell King - ARM Linux admin <linux@armlinux.org.uk> > > > > Sent: 2019年9月25日 0:39 > > > > To: Xiaowei Bao <xiaowei.bao@nxp.com> > > > > Cc: Z.q. Hou <zhiqiang.hou@nxp.com>; bhelgaas@google.com; > > > > robh+dt@kernel.org; mark.rutland@arm.com; shawnguo@kernel.org; Leo > > > > robh+Li > > > > <leoyang.li@nxp.com>; kishon@ti.com; lorenzo.pieralisi@arm.com; M.h. > > > > Lian <minghuan.lian@nxp.com>; andrew.murray@arm.com; Mingkai Hu > > > > <mingkai.hu@nxp.com>; linux-pci@vger.kernel.org; > > > > linux-arm-kernel@lists.infradead.org; devicetree@vger.kernel.org; > > > > linux-kernel@vger.kernel.org > > > > Subject: Re: [PATCH 3/6] PCI: mobiveil: Add PCIe Gen4 EP driver for > > > > NXP Layerscape SoCs > > > > > > > > On Mon, Sep 16, 2019 at 10:17:39AM +0800, Xiaowei Bao wrote: > > > > > This PCIe controller is based on the Mobiveil GPEX IP, it work in > > > > > EP mode if select this config opteration. > > > > > > > > > > Signed-off-by: Xiaowei Bao <xiaowei.bao@nxp.com> > > > > > --- > > > > > MAINTAINERS | 2 > > + > > > > > drivers/pci/controller/mobiveil/Kconfig | 17 ++- > > > > > drivers/pci/controller/mobiveil/Makefile | 1 + > > > > > .../controller/mobiveil/pcie-layerscape-gen4-ep.c | 156 > > > > > +++++++++++++++++++++ > > > > > 4 files changed, 173 insertions(+), 3 deletions(-) create mode > > > > > 100644 drivers/pci/controller/mobiveil/pcie-layerscape-gen4-ep.c > > > > > > > > > > diff --git a/MAINTAINERS b/MAINTAINERS index b997056..0858b54 > > > > > 100644 > > > > > --- a/MAINTAINERS > > > > > +++ b/MAINTAINERS > > > > > @@ -12363,11 +12363,13 @@ F: > > > > drivers/pci/controller/dwc/*layerscape* > > > > > > > > > > PCI DRIVER FOR NXP LAYERSCAPE GEN4 CONTROLLER > > > > > M: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> > > > > > +M: Xiaowei Bao <xiaowei.bao@nxp.com> > > > > > L: linux-pci@vger.kernel.org > > > > > L: linux-arm-kernel@lists.infradead.org > > > > > S: Maintained > > > > > F: Documentation/devicetree/bindings/pci/layerscape-pcie-gen4.txt > > > > > F: drivers/pci/controller/mobibeil/pcie-layerscape-gen4.c > > > > > +F: drivers/pci/controller/mobiveil/pcie-layerscape-gen4-ep.c > > > > > > > > > > PCI DRIVER FOR GENERIC OF HOSTS > > > > > M: Will Deacon <will@kernel.org> > > > > > diff --git a/drivers/pci/controller/mobiveil/Kconfig > > > > > b/drivers/pci/controller/mobiveil/Kconfig > > > > > index 2054950..0696b6e 100644 > > > > > --- a/drivers/pci/controller/mobiveil/Kconfig > > > > > +++ b/drivers/pci/controller/mobiveil/Kconfig > > > > > @@ -27,13 +27,24 @@ config PCIE_MOBIVEIL_PLAT > > > > > for address translation and it is a PCIe Gen4 IP. > > > > > > > > > > config PCIE_LAYERSCAPE_GEN4 > > > > > - bool "Freescale Layerscape PCIe Gen4 controller" > > > > > + bool "Freescale Layerscpe PCIe Gen4 controller in RC mode" > > > > > 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. The PCIe controller can work in RC or > > > > > - EP mode according to RCW[HOST_AGT_PEX] setting. > > > > > + Layerscape SoCs. And the PCIe controller work in RC mode > > > > > + by setting the RCW[HOST_AGT_PEX] to 0. > > > > > + > > > > > +config PCIE_LAYERSCAPE_GEN4_EP > > > > > + bool "Freescale Layerscpe PCIe Gen4 controller in EP mode" > > > > > + depends on PCI > > > > > + depends on OF && (ARM64 || ARCH_LAYERSCAPE) > > > > > + depends on PCI_ENDPOINT > > > > > + select PCIE_MOBIVEIL_EP > > > > > + help > > > > > + Say Y here if you want PCIe Gen4 controller support on > > > > > + Layerscape SoCs. And the PCIe controller work in EP mode > > > > > + by setting the RCW[HOST_AGT_PEX] to 1. > > > > > endmenu > > > > > diff --git a/drivers/pci/controller/mobiveil/Makefile > > > > > b/drivers/pci/controller/mobiveil/Makefile > > > > > index 686d41f..6f54856 100644 > > > > > --- a/drivers/pci/controller/mobiveil/Makefile > > > > > +++ b/drivers/pci/controller/mobiveil/Makefile > > > > > @@ -4,3 +4,4 @@ obj-$(CONFIG_PCIE_MOBIVEIL_HOST) += > > > > > pcie-mobiveil-host.o > > > > > obj-$(CONFIG_PCIE_MOBIVEIL_EP) += pcie-mobiveil-ep.o > > > > > obj-$(CONFIG_PCIE_MOBIVEIL_PLAT) += pcie-mobiveil-plat.o > > > > > obj-$(CONFIG_PCIE_LAYERSCAPE_GEN4) += pcie-layerscape-gen4.o > > > > > +obj-$(CONFIG_PCIE_LAYERSCAPE_GEN4_EP) += > > > > pcie-layerscape-gen4-ep.o > > > > > diff --git > > > > > a/drivers/pci/controller/mobiveil/pcie-layerscape-gen4-ep.c > > > > > b/drivers/pci/controller/mobiveil/pcie-layerscape-gen4-ep.c > > > > > new file mode 100644 > > > > > index 0000000..7bfec51 > > > > > --- /dev/null > > > > > +++ b/drivers/pci/controller/mobiveil/pcie-layerscape-gen4-ep.c > > > > > @@ -0,0 +1,156 @@ > > > > > +// SPDX-License-Identifier: GPL-2.0 > > > > > +/* > > > > > + * PCIe controller EP driver for Freescale Layerscape SoCs > > > > > + * > > > > > + * Copyright (C) 2019 NXP Semiconductor. > > > > > + * > > > > > + * Author: Xiaowei Bao <xiaowei.bao@nxp.com> */ > > > > > + > > > > > +#include <linux/kernel.h> > > > > > +#include <linux/init.h> > > > > > +#include <linux/of_pci.h> > > > > > +#include <linux/of_platform.h> > > > > > +#include <linux/of_address.h> > > > > > +#include <linux/pci.h> > > > > > +#include <linux/platform_device.h> #include <linux/resource.h> > > > > > + > > > > > +#include "pcie-mobiveil.h" > > > > > + > > > > > +#define PCIE_LX2_BAR_NUM 4 > > > > > + > > > > > +#define to_ls_pcie_g4_ep(x) dev_get_drvdata((x)->dev) > > > > > + > > > > > +struct ls_pcie_g4_ep { > > > > > + struct mobiveil_pcie *mv_pci; > > > > > +}; > > > > > + > > > > > +static const struct of_device_id ls_pcie_g4_ep_of_match[] = { > > > > > + { .compatible = "fsl,lx2160a-pcie-ep",}, > > > > > + { }, > > > > > +}; > > > > > + > > > > > +static const struct pci_epc_features ls_pcie_g4_epc_features = { > > > > > + .linkup_notifier = false, > > > > > + .msi_capable = true, > > > > > + .msix_capable = true, > > > > > + .reserved_bar = (1 << BAR_4) | (1 << BAR_5), > > > > > > > > BIT(BAR_4) | BIT(BAR_5) ? > > > > > > I think use .reserved_bar = (1 << BAR_4) | (1 << BAR_5), is better, > > > because BAR_4 is not a bit of register. > > > > Why is whether it's a register or not relevent? > > My understand is that the BIT is used to register, refer to other EP driver files, > it also use 1 << BAR_4 method. > > [baoxw@titan controller]$ grep -r "reserved_bar" * > dwc/pci-keystone.c: .reserved_bar = 1 << BAR_0 | 1 << BAR_1, > mobiveil/pcie-layerscape-gen4-ep.c: .reserved_bar = (1 << BAR_4) | (1 << BAR_5), $ grep '\<BIT(' fs kernel lib mm net -r About 695 non-device driver instances at the very least seem to disagree.
diff --git a/MAINTAINERS b/MAINTAINERS index b997056..0858b54 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12363,11 +12363,13 @@ F: drivers/pci/controller/dwc/*layerscape* PCI DRIVER FOR NXP LAYERSCAPE GEN4 CONTROLLER M: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> +M: Xiaowei Bao <xiaowei.bao@nxp.com> L: linux-pci@vger.kernel.org L: linux-arm-kernel@lists.infradead.org S: Maintained F: Documentation/devicetree/bindings/pci/layerscape-pcie-gen4.txt F: drivers/pci/controller/mobibeil/pcie-layerscape-gen4.c +F: drivers/pci/controller/mobiveil/pcie-layerscape-gen4-ep.c PCI DRIVER FOR GENERIC OF HOSTS M: Will Deacon <will@kernel.org> diff --git a/drivers/pci/controller/mobiveil/Kconfig b/drivers/pci/controller/mobiveil/Kconfig index 2054950..0696b6e 100644 --- a/drivers/pci/controller/mobiveil/Kconfig +++ b/drivers/pci/controller/mobiveil/Kconfig @@ -27,13 +27,24 @@ config PCIE_MOBIVEIL_PLAT for address translation and it is a PCIe Gen4 IP. config PCIE_LAYERSCAPE_GEN4 - bool "Freescale Layerscape PCIe Gen4 controller" + bool "Freescale Layerscpe PCIe Gen4 controller in RC mode" 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. The PCIe controller can work in RC or - EP mode according to RCW[HOST_AGT_PEX] setting. + Layerscape SoCs. And the PCIe controller work in RC mode + by setting the RCW[HOST_AGT_PEX] to 0. + +config PCIE_LAYERSCAPE_GEN4_EP + bool "Freescale Layerscpe PCIe Gen4 controller in EP mode" + depends on PCI + depends on OF && (ARM64 || ARCH_LAYERSCAPE) + depends on PCI_ENDPOINT + select PCIE_MOBIVEIL_EP + help + Say Y here if you want PCIe Gen4 controller support on + Layerscape SoCs. And the PCIe controller work in EP mode + by setting the RCW[HOST_AGT_PEX] to 1. endmenu diff --git a/drivers/pci/controller/mobiveil/Makefile b/drivers/pci/controller/mobiveil/Makefile index 686d41f..6f54856 100644 --- a/drivers/pci/controller/mobiveil/Makefile +++ b/drivers/pci/controller/mobiveil/Makefile @@ -4,3 +4,4 @@ obj-$(CONFIG_PCIE_MOBIVEIL_HOST) += pcie-mobiveil-host.o obj-$(CONFIG_PCIE_MOBIVEIL_EP) += pcie-mobiveil-ep.o obj-$(CONFIG_PCIE_MOBIVEIL_PLAT) += pcie-mobiveil-plat.o obj-$(CONFIG_PCIE_LAYERSCAPE_GEN4) += pcie-layerscape-gen4.o +obj-$(CONFIG_PCIE_LAYERSCAPE_GEN4_EP) += pcie-layerscape-gen4-ep.o diff --git a/drivers/pci/controller/mobiveil/pcie-layerscape-gen4-ep.c b/drivers/pci/controller/mobiveil/pcie-layerscape-gen4-ep.c new file mode 100644 index 0000000..7bfec51 --- /dev/null +++ b/drivers/pci/controller/mobiveil/pcie-layerscape-gen4-ep.c @@ -0,0 +1,156 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * PCIe controller EP driver for Freescale Layerscape SoCs + * + * Copyright (C) 2019 NXP Semiconductor. + * + * Author: Xiaowei Bao <xiaowei.bao@nxp.com> + */ + +#include <linux/kernel.h> +#include <linux/init.h> +#include <linux/of_pci.h> +#include <linux/of_platform.h> +#include <linux/of_address.h> +#include <linux/pci.h> +#include <linux/platform_device.h> +#include <linux/resource.h> + +#include "pcie-mobiveil.h" + +#define PCIE_LX2_BAR_NUM 4 + +#define to_ls_pcie_g4_ep(x) dev_get_drvdata((x)->dev) + +struct ls_pcie_g4_ep { + struct mobiveil_pcie *mv_pci; +}; + +static const struct of_device_id ls_pcie_g4_ep_of_match[] = { + { .compatible = "fsl,lx2160a-pcie-ep",}, + { }, +}; + +static const struct pci_epc_features ls_pcie_g4_epc_features = { + .linkup_notifier = false, + .msi_capable = true, + .msix_capable = true, + .reserved_bar = (1 << BAR_4) | (1 << BAR_5), +}; + +static const struct pci_epc_features* +ls_pcie_g4_ep_get_features(struct mobiveil_pcie_ep *ep) +{ + return &ls_pcie_g4_epc_features; +} + +static void ls_pcie_g4_ep_init(struct mobiveil_pcie_ep *ep) +{ + struct mobiveil_pcie *mv_pci = to_mobiveil_pcie_from_ep(ep); + int win_idx; + u8 bar; + + ep->bar_num = PCIE_LX2_BAR_NUM; + + for (bar = BAR_0; bar < ep->epc->max_functions * ep->bar_num; bar++) + mobiveil_pcie_ep_reset_bar(mv_pci, bar); + + for (win_idx = 0; win_idx < ep->apio_wins; win_idx++) + mobiveil_pcie_disable_ob_win(mv_pci, win_idx); +} + +static int ls_pcie_g4_ep_raise_irq(struct mobiveil_pcie_ep *ep, u8 func_no, + enum pci_epc_irq_type type, + u16 interrupt_num) +{ + struct mobiveil_pcie *mv_pci = to_mobiveil_pcie_from_ep(ep); + + switch (type) { + case PCI_EPC_IRQ_LEGACY: + return mobiveil_pcie_ep_raise_legacy_irq(ep, func_no); + case PCI_EPC_IRQ_MSI: + return mobiveil_pcie_ep_raise_msi_irq(ep, func_no, + interrupt_num); + case PCI_EPC_IRQ_MSIX: + return mobiveil_pcie_ep_raise_msix_irq(ep, func_no, + interrupt_num); + default: + dev_err(&mv_pci->pdev->dev, "UNKNOWN IRQ type\n"); + } + + return 0; +} + +static const struct mobiveil_pcie_ep_ops pcie_ep_ops = { + .ep_init = ls_pcie_g4_ep_init, + .raise_irq = ls_pcie_g4_ep_raise_irq, + .get_features = ls_pcie_g4_ep_get_features, +}; + +static int __init ls_pcie_gen4_add_pcie_ep(struct ls_pcie_g4_ep *ls_ep, + struct platform_device *pdev) +{ + struct mobiveil_pcie *mv_pci = ls_ep->mv_pci; + struct device *dev = &pdev->dev; + struct mobiveil_pcie_ep *ep; + struct resource *res; + int ret; + + ep = &mv_pci->ep; + ep->ops = &pcie_ep_ops; + + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "addr_space"); + if (!res) + return -EINVAL; + + ep->phys_base = res->start; + ep->addr_size = resource_size(res); + + ret = mobiveil_pcie_ep_init(ep); + if (ret) { + dev_err(dev, "failed to initialize layerscape endpoint\n"); + return ret; + } + + return 0; +} + +static int __init ls_pcie_g4_ep_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct mobiveil_pcie *mv_pci; + struct ls_pcie_g4_ep *ls_ep; + struct resource *res; + int ret; + + ls_ep = devm_kzalloc(dev, sizeof(*ls_ep), GFP_KERNEL); + if (!ls_ep) + return -ENOMEM; + + mv_pci = devm_kzalloc(dev, sizeof(*mv_pci), GFP_KERNEL); + if (!mv_pci) + return -ENOMEM; + + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs"); + mv_pci->csr_axi_slave_base = devm_pci_remap_cfg_resource(dev, res); + if (IS_ERR(mv_pci->csr_axi_slave_base)) + return PTR_ERR(mv_pci->csr_axi_slave_base); + + mv_pci->pdev = pdev; + ls_ep->mv_pci = mv_pci; + + platform_set_drvdata(pdev, ls_ep); + + ret = ls_pcie_gen4_add_pcie_ep(ls_ep, pdev); + + return ret; +} + +static struct platform_driver ls_pcie_g4_ep_driver = { + .driver = { + .name = "layerscape-pcie-gen4-ep", + .of_match_table = ls_pcie_g4_ep_of_match, + .suppress_bind_attrs = true, + }, +}; +builtin_platform_driver_probe(ls_pcie_g4_ep_driver, ls_pcie_g4_ep_probe);
This PCIe controller is based on the Mobiveil GPEX IP, it work in EP mode if select this config opteration. Signed-off-by: Xiaowei Bao <xiaowei.bao@nxp.com> --- MAINTAINERS | 2 + drivers/pci/controller/mobiveil/Kconfig | 17 ++- drivers/pci/controller/mobiveil/Makefile | 1 + .../controller/mobiveil/pcie-layerscape-gen4-ep.c | 156 +++++++++++++++++++++ 4 files changed, 173 insertions(+), 3 deletions(-) create mode 100644 drivers/pci/controller/mobiveil/pcie-layerscape-gen4-ep.c