* [PATCH 0/2] PCI: Add new UniPhier PCIe endpoint driver @ 2019-12-12 2:02 Kunihiko Hayashi 2019-12-12 2:02 ` [PATCH 1/2] dt-bindings: PCI: Add UniPhier PCIe endpoint controller description Kunihiko Hayashi 2019-12-12 2:02 ` [PATCH 2/2] PCI: uniphier: Add UniPhier PCIe endpoint controller support Kunihiko Hayashi 0 siblings, 2 replies; 5+ messages in thread From: Kunihiko Hayashi @ 2019-12-12 2:02 UTC (permalink / raw) To: Bjorn Helgaas, Lorenzo Pieralisi, Andrew Murray, Masahiro Yamada, Rob Herring, Mark Rutland Cc: devicetree, Kunihiko Hayashi, Masami Hiramatsu, linux-pci, linux-kernel, Jassi Brar, linux-arm-kernel This series adds PCIe endpoint controller driver for Socionext UniPhier SoCs. This controller is based on the DesignWare PCIe core. This driver supports Pro5 SoC. Kunihiko Hayashi (2): dt-bindings: PCI: Add UniPhier PCIe endpoint controller description PCI: uniphier: Add UniPhier PCIe endpoint controller support .../devicetree/bindings/pci/uniphier-pcie-ep.txt | 47 +++ MAINTAINERS | 4 +- drivers/pci/controller/dwc/Kconfig | 13 +- drivers/pci/controller/dwc/Makefile | 1 + drivers/pci/controller/dwc/pcie-uniphier-ep.c | 399 +++++++++++++++++++++ 5 files changed, 460 insertions(+), 4 deletions(-) create mode 100644 Documentation/devicetree/bindings/pci/uniphier-pcie-ep.txt create mode 100644 drivers/pci/controller/dwc/pcie-uniphier-ep.c -- 2.7.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] dt-bindings: PCI: Add UniPhier PCIe endpoint controller description 2019-12-12 2:02 [PATCH 0/2] PCI: Add new UniPhier PCIe endpoint driver Kunihiko Hayashi @ 2019-12-12 2:02 ` Kunihiko Hayashi 2019-12-19 22:03 ` Rob Herring 2019-12-12 2:02 ` [PATCH 2/2] PCI: uniphier: Add UniPhier PCIe endpoint controller support Kunihiko Hayashi 1 sibling, 1 reply; 5+ messages in thread From: Kunihiko Hayashi @ 2019-12-12 2:02 UTC (permalink / raw) To: Bjorn Helgaas, Lorenzo Pieralisi, Andrew Murray, Masahiro Yamada, Rob Herring, Mark Rutland Cc: devicetree, Kunihiko Hayashi, Masami Hiramatsu, linux-pci, linux-kernel, Jassi Brar, linux-arm-kernel Add DT bindings for PCIe controller implemented in UniPhier SoCs when configured in endpoint mode. This controller is based on the DesignWare PCIe core. Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> --- .../devicetree/bindings/pci/uniphier-pcie-ep.txt | 47 ++++++++++++++++++++++ MAINTAINERS | 2 +- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/pci/uniphier-pcie-ep.txt diff --git a/Documentation/devicetree/bindings/pci/uniphier-pcie-ep.txt b/Documentation/devicetree/bindings/pci/uniphier-pcie-ep.txt new file mode 100644 index 00000000..56cb891 --- /dev/null +++ b/Documentation/devicetree/bindings/pci/uniphier-pcie-ep.txt @@ -0,0 +1,47 @@ +Socionext UniPhier PCIe endpoint controller bindings + +This describes the devicetree bindings for PCIe endpoint controller +implemented on Socionext UniPhier SoCs. + +UniPhier PCIe endpoint controller is based on the Synopsys DesignWare +PCI core. It shares common functions with the PCIe DesignWare core driver +and inherits common properties defined in +Documentation/devicetree/bindings/pci/designware-pcie.txt. + +Required properties: +- compatible: Should be + "socionext,uniphier-pro5-pcie-ep" for Pro5 SoC +- reg: Specifies offset and length of the register set for the device. + According to the reg-names, appropriate register sets are required. +- reg-names: Must include the following entries: + "dbi" - controller configuration registers + "dbi2" - controller configuration registers for shadow + "link" - SoC-specific glue layer registers + "addr_space" - PCIe configuration space +- clocks: A phandle to the clock gate for PCIe glue layer including + the endpoint controller. +- resets: A phandle to the reset line for PCIe glue layer including + the endpoint controller. + +Optional properties: +- phys: A phandle to generic PCIe PHY. According to the phy-names, appropriate + phys are required. +- phy-names: Must be "pcie-phy". + +Example: + + pcie_ep: pcie-ep@66000000 { + compatible = "socionext,uniphier-pro5-pcie-ep", + "snps,dw-pcie-ep"; + status = "disabled"; + reg-names = "dbi", "dbi2", "link", "addr_space"; + reg = <0x66000000 0x1000>, <0x66001000 0x1000>, + <0x66010000 0x10000>, <0x67000000 0x400000>; + clocks = <&sys_clk 24>; + resets = <&sys_rst 24>; + num-ib-windows = <16>; + num-ob-windows = <16>; + num-lanes = <4>; + phy-names = "pcie-phy"; + phys = <&pcie_phy>; + }; diff --git a/MAINTAINERS b/MAINTAINERS index 9d3a5c5..4b6ec28 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12694,7 +12694,7 @@ PCIE DRIVER FOR SOCIONEXT UNIPHIER M: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> L: linux-pci@vger.kernel.org S: Maintained -F: Documentation/devicetree/bindings/pci/uniphier-pcie.txt +F: Documentation/devicetree/bindings/pci/uniphier-pcie*.txt F: drivers/pci/controller/dwc/pcie-uniphier.c PCIE DRIVER FOR ST SPEAR13XX -- 2.7.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] dt-bindings: PCI: Add UniPhier PCIe endpoint controller description 2019-12-12 2:02 ` [PATCH 1/2] dt-bindings: PCI: Add UniPhier PCIe endpoint controller description Kunihiko Hayashi @ 2019-12-19 22:03 ` Rob Herring 0 siblings, 0 replies; 5+ messages in thread From: Rob Herring @ 2019-12-19 22:03 UTC (permalink / raw) To: Kunihiko Hayashi Cc: Mark Rutland, devicetree, Lorenzo Pieralisi, Kunihiko Hayashi, Masami Hiramatsu, Jassi Brar, linux-pci, linux-kernel, Masahiro Yamada, Bjorn Helgaas, Andrew Murray, linux-arm-kernel On Thu, 12 Dec 2019 11:02:17 +0900, Kunihiko Hayashi wrote: > Add DT bindings for PCIe controller implemented in UniPhier SoCs > when configured in endpoint mode. This controller is based on > the DesignWare PCIe core. > > Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> > --- > .../devicetree/bindings/pci/uniphier-pcie-ep.txt | 47 ++++++++++++++++++++++ > MAINTAINERS | 2 +- > 2 files changed, 48 insertions(+), 1 deletion(-) > create mode 100644 Documentation/devicetree/bindings/pci/uniphier-pcie-ep.txt > Reviewed-by: Rob Herring <robh@kernel.org> _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/2] PCI: uniphier: Add UniPhier PCIe endpoint controller support 2019-12-12 2:02 [PATCH 0/2] PCI: Add new UniPhier PCIe endpoint driver Kunihiko Hayashi 2019-12-12 2:02 ` [PATCH 1/2] dt-bindings: PCI: Add UniPhier PCIe endpoint controller description Kunihiko Hayashi @ 2019-12-12 2:02 ` Kunihiko Hayashi 2020-01-15 2:16 ` Kunihiko Hayashi 1 sibling, 1 reply; 5+ messages in thread From: Kunihiko Hayashi @ 2019-12-12 2:02 UTC (permalink / raw) To: Bjorn Helgaas, Lorenzo Pieralisi, Andrew Murray, Masahiro Yamada, Rob Herring, Mark Rutland Cc: devicetree, Kunihiko Hayashi, Masami Hiramatsu, linux-pci, linux-kernel, Jassi Brar, linux-arm-kernel This introduces specific glue layer for UniPhier platform to support PCIe controller that is based on the DesignWare PCIe core, and this driver supports endpoint mode. This supports for Pro5 SoC only. Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> --- MAINTAINERS | 2 +- drivers/pci/controller/dwc/Kconfig | 13 +- drivers/pci/controller/dwc/Makefile | 1 + drivers/pci/controller/dwc/pcie-uniphier-ep.c | 399 ++++++++++++++++++++++++++ 4 files changed, 412 insertions(+), 3 deletions(-) create mode 100644 drivers/pci/controller/dwc/pcie-uniphier-ep.c diff --git a/MAINTAINERS b/MAINTAINERS index 4b6ec28..9ed0572 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12695,7 +12695,7 @@ M: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> L: linux-pci@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/pci/uniphier-pcie*.txt -F: drivers/pci/controller/dwc/pcie-uniphier.c +F: drivers/pci/controller/dwc/pcie-uniphier*.c PCIE DRIVER FOR ST SPEAR13XX M: Pratyush Anand <pratyush.anand@gmail.com> diff --git a/drivers/pci/controller/dwc/Kconfig b/drivers/pci/controller/dwc/Kconfig index 0ba988b..6bc661a 100644 --- a/drivers/pci/controller/dwc/Kconfig +++ b/drivers/pci/controller/dwc/Kconfig @@ -247,15 +247,24 @@ config PCIE_TEGRA194 controller found in NVIDIA Tegra194 SoC. config PCIE_UNIPHIER - bool "Socionext UniPhier PCIe controllers" + bool "Socionext UniPhier PCIe host controllers" depends on ARCH_UNIPHIER || COMPILE_TEST depends on OF && HAS_IOMEM depends on PCI_MSI_IRQ_DOMAIN select PCIE_DW_HOST help - Say Y here if you want PCIe controller support on UniPhier SoCs. + Say Y here if you want PCIe host controller support on UniPhier SoCs. This driver supports LD20 and PXs3 SoCs. +config PCIE_UNIPHIER_EP + bool "Socionext UniPhier PCIe endpoint controllers" + depends on ARCH_UNIPHIER || COMPILE_TEST + depends on OF && HAS_IOMEM + select PCIE_DW_EP + help + Say Y here if you want PCIe endpoint controller support on + UniPhier SoCs. This driver supports Pro5 SoC. + config PCIE_AL bool "Amazon Annapurna Labs PCIe controller" depends on OF && (ARM64 || COMPILE_TEST) diff --git a/drivers/pci/controller/dwc/Makefile b/drivers/pci/controller/dwc/Makefile index 69faff3..ba458b6 100644 --- a/drivers/pci/controller/dwc/Makefile +++ b/drivers/pci/controller/dwc/Makefile @@ -18,6 +18,7 @@ obj-$(CONFIG_PCIE_HISI_STB) += pcie-histb.o obj-$(CONFIG_PCI_MESON) += pci-meson.o obj-$(CONFIG_PCIE_TEGRA194) += pcie-tegra194.o obj-$(CONFIG_PCIE_UNIPHIER) += pcie-uniphier.o +obj-$(CONFIG_PCIE_UNIPHIER_EP) += pcie-uniphier-ep.o # The following drivers are for devices that use the generic ACPI # pci_root.c driver but don't support standard ECAM config access. diff --git a/drivers/pci/controller/dwc/pcie-uniphier-ep.c b/drivers/pci/controller/dwc/pcie-uniphier-ep.c new file mode 100644 index 00000000..7b5aa0f --- /dev/null +++ b/drivers/pci/controller/dwc/pcie-uniphier-ep.c @@ -0,0 +1,399 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * PCIe endpoint controller driver for UniPhier SoCs + * Copyright 2018 Socionext Inc. + * Author: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> + */ + +#include <linux/bitops.h> +#include <linux/bitfield.h> +#include <linux/clk.h> +#include <linux/delay.h> +#include <linux/init.h> +#include <linux/of_device.h> +#include <linux/pci.h> +#include <linux/phy/phy.h> +#include <linux/platform_device.h> +#include <linux/reset.h> + +#include "pcie-designware.h" + +/* Link Glue registers */ +#define PCL_RSTCTRL0 0x0010 +#define PCL_RSTCTRL_AXI_REG BIT(3) +#define PCL_RSTCTRL_AXI_SLAVE BIT(2) +#define PCL_RSTCTRL_AXI_MASTER BIT(1) +#define PCL_RSTCTRL_PIPE3 BIT(0) + +#define PCL_RSTCTRL1 0x0020 +#define PCL_RSTCTRL_PERST BIT(0) + +#define PCL_RSTCTRL2 0x0024 +#define PCL_RSTCTRL_PHY_RESET BIT(0) + +#define PCL_MODE 0x8000 +#define PCL_MODE_REGVAL BIT(0) + +#define PCL_APP_CLK_CTRL 0x8004 +#define PCL_APP_CLK_REQ BIT(0) + +#define PCL_APP_READY_CTRL 0x8008 +#define PCL_APP_LTSSM_ENABLE BIT(0) + +#define PCL_APP_MSI0 0x8040 +#define PCL_APP_VEN_MSI_TC_MASK GENMASK(10, 8) +#define PCL_APP_VEN_MSI_VECTOR_MASK GENMASK(4, 0) + +#define PCL_APP_MSI1 0x8044 +#define PCL_APP_MSI_REQ BIT(0) + +#define PCL_APP_INTX 0x8074 +#define PCL_APP_INTX_SYS_INT BIT(0) + +/* assertion time of intx in usec */ +#define PCL_INTX_WIDTH_USEC 30 + +struct uniphier_pcie_ep_priv { + void __iomem *base; + struct dw_pcie pci; + struct clk *clk, *clk_gio; + struct reset_control *rst, *rst_gio; + struct phy *phy; + const struct uniphier_pcie_ep_soc_data *data; +}; + +struct uniphier_pcie_ep_soc_data { + bool is_legacy; + const struct pci_epc_features features; +}; + +#define to_uniphier_pcie(x) dev_get_drvdata((x)->dev) + +static void uniphier_pcie_ltssm_enable(struct uniphier_pcie_ep_priv *priv, + bool enable) +{ + u32 val; + + val = readl(priv->base + PCL_APP_READY_CTRL); + if (enable) + val |= PCL_APP_LTSSM_ENABLE; + else + val &= ~PCL_APP_LTSSM_ENABLE; + writel(val, priv->base + PCL_APP_READY_CTRL); +} + +static void uniphier_pcie_phy_reset(struct uniphier_pcie_ep_priv *priv, + bool assert) +{ + u32 val; + + val = readl(priv->base + PCL_RSTCTRL2); + if (assert) + val |= PCL_RSTCTRL_PHY_RESET; + else + val &= ~PCL_RSTCTRL_PHY_RESET; + writel(val, priv->base + PCL_RSTCTRL2); +} + +static void uniphier_pcie_init_ep(struct uniphier_pcie_ep_priv *priv) +{ + u32 val; + + /* set EP mode */ + val = readl(priv->base + PCL_MODE); + val |= PCL_MODE_REGVAL; + writel(val, priv->base + PCL_MODE); + + /* clock request */ + val = readl(priv->base + PCL_APP_CLK_CTRL); + val &= ~PCL_APP_CLK_REQ; + writel(val, priv->base + PCL_APP_CLK_CTRL); + + /* deassert PIPE3 and AXI reset */ + val = readl(priv->base + PCL_RSTCTRL0); + val |= PCL_RSTCTRL_AXI_REG | PCL_RSTCTRL_AXI_SLAVE + | PCL_RSTCTRL_AXI_MASTER | PCL_RSTCTRL_PIPE3; + writel(val, priv->base + PCL_RSTCTRL0); + + uniphier_pcie_ltssm_enable(priv, false); +} + +static int uniphier_pcie_start_link(struct dw_pcie *pci) +{ + struct uniphier_pcie_ep_priv *priv = to_uniphier_pcie(pci); + + uniphier_pcie_ltssm_enable(priv, true); + + return 0; +} + +static void uniphier_pcie_stop_link(struct dw_pcie *pci) +{ + struct uniphier_pcie_ep_priv *priv = to_uniphier_pcie(pci); + + uniphier_pcie_ltssm_enable(priv, false); +} + +static void uniphier_pcie_ep_init(struct dw_pcie_ep *ep) +{ + struct dw_pcie *pci = to_dw_pcie_from_ep(ep); + enum pci_barno bar; + + for (bar = BAR_0; bar <= BAR_5; bar++) + dw_pcie_ep_reset_bar(pci, bar); +} + +static int uniphier_pcie_ep_raise_legacy_irq(struct dw_pcie_ep *ep) +{ + struct dw_pcie *pci = to_dw_pcie_from_ep(ep); + struct uniphier_pcie_ep_priv *priv = to_uniphier_pcie(pci); + u32 val; + + /* assert INTx */ + val = readl(priv->base + PCL_APP_INTX); + val |= PCL_APP_INTX_SYS_INT; + writel(val, priv->base + PCL_APP_INTX); + + udelay(PCL_INTX_WIDTH_USEC); + + /* deassert INTx */ + val = readl(priv->base + PCL_APP_INTX); + val &= ~PCL_APP_INTX_SYS_INT; + writel(val, priv->base + PCL_APP_INTX); + + return 0; +} + +static int uniphier_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep, + u8 func_no, u16 interrupt_num) +{ + struct dw_pcie *pci = to_dw_pcie_from_ep(ep); + struct uniphier_pcie_ep_priv *priv = to_uniphier_pcie(pci); + u32 val; + + val = FIELD_PREP(PCL_APP_VEN_MSI_TC_MASK, func_no) + | FIELD_PREP(PCL_APP_VEN_MSI_VECTOR_MASK, interrupt_num - 1); + writel(val, priv->base + PCL_APP_MSI0); + + val = readl(priv->base + PCL_APP_MSI1); + val |= PCL_APP_MSI_REQ; + writel(val, priv->base + PCL_APP_MSI1); + + return 0; +} + +static int uniphier_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no, + enum pci_epc_irq_type type, + u16 interrupt_num) +{ + struct dw_pcie *pci = to_dw_pcie_from_ep(ep); + + switch (type) { + case PCI_EPC_IRQ_LEGACY: + return uniphier_pcie_ep_raise_legacy_irq(ep); + case PCI_EPC_IRQ_MSI: + return uniphier_pcie_ep_raise_msi_irq(ep, func_no, + interrupt_num); + default: + dev_err(pci->dev, "UNKNOWN IRQ type (%d)\n", type); + } + + return 0; +} + +static const struct pci_epc_features* +uniphier_pcie_get_features(struct dw_pcie_ep *ep) +{ + struct dw_pcie *pci = to_dw_pcie_from_ep(ep); + struct uniphier_pcie_ep_priv *priv = to_uniphier_pcie(pci); + + return &priv->data->features; +} + +static const struct dw_pcie_ep_ops uniphier_pcie_ep_ops = { + .ep_init = uniphier_pcie_ep_init, + .raise_irq = uniphier_pcie_ep_raise_irq, + .get_features = uniphier_pcie_get_features, +}; + +static int uniphier_add_pcie_ep(struct uniphier_pcie_ep_priv *priv, + struct platform_device *pdev) +{ + struct dw_pcie *pci = &priv->pci; + struct dw_pcie_ep *ep = &pci->ep; + struct device *dev = &pdev->dev; + struct resource *res; + int ret; + + ep->ops = &uniphier_pcie_ep_ops; + + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi2"); + pci->dbi_base2 = devm_ioremap_resource(dev, res); + if (IS_ERR(pci->dbi_base2)) + return PTR_ERR(pci->dbi_base2); + + 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 = dw_pcie_ep_init(ep); + if (ret) { + dev_err(dev, "Failed to initialize endpoint (%d)\n", ret); + return ret; + } + + return 0; +} + +static int uniphier_pcie_ep_enable(struct uniphier_pcie_ep_priv *priv) +{ + int ret; + + ret = clk_prepare_enable(priv->clk); + if (ret) + return ret; + + ret = clk_prepare_enable(priv->clk_gio); + if (ret) + goto out_clk_disable; + + ret = reset_control_deassert(priv->rst); + if (ret) + goto out_clk_gio_disable; + + ret = reset_control_deassert(priv->rst_gio); + if (ret) + goto out_rst_assert; + + uniphier_pcie_init_ep(priv); + + if (priv->data->is_legacy) + uniphier_pcie_phy_reset(priv, true); + + ret = phy_init(priv->phy); + if (ret) + goto out_rst_gio_assert; + + if (priv->data->is_legacy) + uniphier_pcie_phy_reset(priv, false); + + return 0; + +out_rst_gio_assert: + reset_control_assert(priv->rst_gio); +out_rst_assert: + reset_control_assert(priv->rst); +out_clk_gio_disable: + clk_disable_unprepare(priv->clk_gio); +out_clk_disable: + clk_disable_unprepare(priv->clk); + + return ret; +} + +static const struct dw_pcie_ops dw_pcie_ops = { + .start_link = uniphier_pcie_start_link, + .stop_link = uniphier_pcie_stop_link, +}; + +static int uniphier_pcie_ep_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct uniphier_pcie_ep_priv *priv; + struct resource *res; + int ret; + + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + priv->data = of_device_get_match_data(dev); + if (WARN_ON(!priv->data)) + return -EINVAL; + + priv->pci.dev = dev; + priv->pci.ops = &dw_pcie_ops; + + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi"); + priv->pci.dbi_base = devm_pci_remap_cfg_resource(dev, res); + if (IS_ERR(priv->pci.dbi_base)) + return PTR_ERR(priv->pci.dbi_base); + + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "link"); + priv->base = devm_ioremap_resource(dev, res); + if (IS_ERR(priv->base)) + return PTR_ERR(priv->base); + + if (priv->data->is_legacy) { + priv->clk_gio = devm_clk_get(dev, "gio"); + if (IS_ERR(priv->clk)) + return PTR_ERR(priv->clk); + + priv->rst_gio = + devm_reset_control_get_shared(dev, "gio"); + if (IS_ERR(priv->rst_gio)) + return PTR_ERR(priv->rst_gio); + + priv->clk = devm_clk_get(dev, "link"); + if (IS_ERR(priv->clk)) + return PTR_ERR(priv->clk); + + priv->rst = + devm_reset_control_get_shared(dev, "link"); + if (IS_ERR(priv->rst)) + return PTR_ERR(priv->rst); + } else { + priv->clk = devm_clk_get(dev, NULL); + if (IS_ERR(priv->clk)) + return PTR_ERR(priv->clk); + + priv->rst = devm_reset_control_get_shared(dev, NULL); + if (IS_ERR(priv->rst)) + return PTR_ERR(priv->rst); + } + + priv->phy = devm_phy_optional_get(dev, "pcie-phy"); + if (IS_ERR(priv->phy)) + return PTR_ERR(priv->phy); + + platform_set_drvdata(pdev, priv); + + ret = uniphier_pcie_ep_enable(priv); + if (ret) + return ret; + + return uniphier_add_pcie_ep(priv, pdev); +} + +static const struct uniphier_pcie_ep_soc_data uniphier_pro5_data = { + .is_legacy = true, + .features = { + .linkup_notifier = false, + .msi_capable = true, + .msix_capable = false, + .align = 1 << 16, + .bar_fixed_64bit = BIT(BAR_0) | BIT(BAR_2) | BIT(BAR_4), + .reserved_bar = BIT(BAR_4), + }, +}; + +static const struct of_device_id uniphier_pcie_ep_match[] = { + { + .compatible = "socionext,uniphier-pro5-pcie-ep", + .data = &uniphier_pro5_data, + }, + { /* sentinel */ }, +}; + +static struct platform_driver uniphier_pcie_ep_driver = { + .probe = uniphier_pcie_ep_probe, + .driver = { + .name = "uniphier-pcie-ep", + .of_match_table = uniphier_pcie_ep_match, + .suppress_bind_attrs = true, + }, +}; +builtin_platform_driver(uniphier_pcie_ep_driver); -- 2.7.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] PCI: uniphier: Add UniPhier PCIe endpoint controller support 2019-12-12 2:02 ` [PATCH 2/2] PCI: uniphier: Add UniPhier PCIe endpoint controller support Kunihiko Hayashi @ 2020-01-15 2:16 ` Kunihiko Hayashi 0 siblings, 0 replies; 5+ messages in thread From: Kunihiko Hayashi @ 2020-01-15 2:16 UTC (permalink / raw) To: Bjorn Helgaas, Lorenzo Pieralisi, Andrew Murray Cc: Mark Rutland, devicetree, Masami Hiramatsu, Jassi Brar, linux-pci, linux-kernel, Masahiro Yamada, Rob Herring, linux-arm-kernel Hi, Gentle ping. Is there any comments about this? Thank you, On Thu, 12 Dec 2019 11:02:18 +0900 Kunihiko Hayashi <hayashi.kunihiko@socionext.com> wrote: > This introduces specific glue layer for UniPhier platform to support > PCIe controller that is based on the DesignWare PCIe core, and > this driver supports endpoint mode. This supports for Pro5 SoC only. > > Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> > --- > MAINTAINERS | 2 +- > drivers/pci/controller/dwc/Kconfig | 13 +- > drivers/pci/controller/dwc/Makefile | 1 + > drivers/pci/controller/dwc/pcie-uniphier-ep.c | 399 ++++++++++++++++++++++++++ > 4 files changed, 412 insertions(+), 3 deletions(-) > create mode 100644 drivers/pci/controller/dwc/pcie-uniphier-ep.c > > diff --git a/MAINTAINERS b/MAINTAINERS > index 4b6ec28..9ed0572 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -12695,7 +12695,7 @@ M: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> > L: linux-pci@vger.kernel.org > S: Maintained > F: Documentation/devicetree/bindings/pci/uniphier-pcie*.txt > -F: drivers/pci/controller/dwc/pcie-uniphier.c > +F: drivers/pci/controller/dwc/pcie-uniphier*.c > > PCIE DRIVER FOR ST SPEAR13XX > M: Pratyush Anand <pratyush.anand@gmail.com> > diff --git a/drivers/pci/controller/dwc/Kconfig b/drivers/pci/controller/dwc/Kconfig > index 0ba988b..6bc661a 100644 > --- a/drivers/pci/controller/dwc/Kconfig > +++ b/drivers/pci/controller/dwc/Kconfig > @@ -247,15 +247,24 @@ config PCIE_TEGRA194 > controller found in NVIDIA Tegra194 SoC. > > config PCIE_UNIPHIER > - bool "Socionext UniPhier PCIe controllers" > + bool "Socionext UniPhier PCIe host controllers" > depends on ARCH_UNIPHIER || COMPILE_TEST > depends on OF && HAS_IOMEM > depends on PCI_MSI_IRQ_DOMAIN > select PCIE_DW_HOST > help > - Say Y here if you want PCIe controller support on UniPhier SoCs. > + Say Y here if you want PCIe host controller support on UniPhier SoCs. > This driver supports LD20 and PXs3 SoCs. > > +config PCIE_UNIPHIER_EP > + bool "Socionext UniPhier PCIe endpoint controllers" > + depends on ARCH_UNIPHIER || COMPILE_TEST > + depends on OF && HAS_IOMEM > + select PCIE_DW_EP > + help > + Say Y here if you want PCIe endpoint controller support on > + UniPhier SoCs. This driver supports Pro5 SoC. > + > config PCIE_AL > bool "Amazon Annapurna Labs PCIe controller" > depends on OF && (ARM64 || COMPILE_TEST) > diff --git a/drivers/pci/controller/dwc/Makefile b/drivers/pci/controller/dwc/Makefile > index 69faff3..ba458b6 100644 > --- a/drivers/pci/controller/dwc/Makefile > +++ b/drivers/pci/controller/dwc/Makefile > @@ -18,6 +18,7 @@ obj-$(CONFIG_PCIE_HISI_STB) += pcie-histb.o > obj-$(CONFIG_PCI_MESON) += pci-meson.o > obj-$(CONFIG_PCIE_TEGRA194) += pcie-tegra194.o > obj-$(CONFIG_PCIE_UNIPHIER) += pcie-uniphier.o > +obj-$(CONFIG_PCIE_UNIPHIER_EP) += pcie-uniphier-ep.o > > # The following drivers are for devices that use the generic ACPI > # pci_root.c driver but don't support standard ECAM config access. > diff --git a/drivers/pci/controller/dwc/pcie-uniphier-ep.c b/drivers/pci/controller/dwc/pcie-uniphier-ep.c > new file mode 100644 > index 00000000..7b5aa0f > --- /dev/null > +++ b/drivers/pci/controller/dwc/pcie-uniphier-ep.c > @@ -0,0 +1,399 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * PCIe endpoint controller driver for UniPhier SoCs > + * Copyright 2018 Socionext Inc. > + * Author: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> > + */ > + > +#include <linux/bitops.h> > +#include <linux/bitfield.h> > +#include <linux/clk.h> > +#include <linux/delay.h> > +#include <linux/init.h> > +#include <linux/of_device.h> > +#include <linux/pci.h> > +#include <linux/phy/phy.h> > +#include <linux/platform_device.h> > +#include <linux/reset.h> > + > +#include "pcie-designware.h" > + > +/* Link Glue registers */ > +#define PCL_RSTCTRL0 0x0010 > +#define PCL_RSTCTRL_AXI_REG BIT(3) > +#define PCL_RSTCTRL_AXI_SLAVE BIT(2) > +#define PCL_RSTCTRL_AXI_MASTER BIT(1) > +#define PCL_RSTCTRL_PIPE3 BIT(0) > + > +#define PCL_RSTCTRL1 0x0020 > +#define PCL_RSTCTRL_PERST BIT(0) > + > +#define PCL_RSTCTRL2 0x0024 > +#define PCL_RSTCTRL_PHY_RESET BIT(0) > + > +#define PCL_MODE 0x8000 > +#define PCL_MODE_REGVAL BIT(0) > + > +#define PCL_APP_CLK_CTRL 0x8004 > +#define PCL_APP_CLK_REQ BIT(0) > + > +#define PCL_APP_READY_CTRL 0x8008 > +#define PCL_APP_LTSSM_ENABLE BIT(0) > + > +#define PCL_APP_MSI0 0x8040 > +#define PCL_APP_VEN_MSI_TC_MASK GENMASK(10, 8) > +#define PCL_APP_VEN_MSI_VECTOR_MASK GENMASK(4, 0) > + > +#define PCL_APP_MSI1 0x8044 > +#define PCL_APP_MSI_REQ BIT(0) > + > +#define PCL_APP_INTX 0x8074 > +#define PCL_APP_INTX_SYS_INT BIT(0) > + > +/* assertion time of intx in usec */ > +#define PCL_INTX_WIDTH_USEC 30 > + > +struct uniphier_pcie_ep_priv { > + void __iomem *base; > + struct dw_pcie pci; > + struct clk *clk, *clk_gio; > + struct reset_control *rst, *rst_gio; > + struct phy *phy; > + const struct uniphier_pcie_ep_soc_data *data; > +}; > + > +struct uniphier_pcie_ep_soc_data { > + bool is_legacy; > + const struct pci_epc_features features; > +}; > + > +#define to_uniphier_pcie(x) dev_get_drvdata((x)->dev) > + > +static void uniphier_pcie_ltssm_enable(struct uniphier_pcie_ep_priv *priv, > + bool enable) > +{ > + u32 val; > + > + val = readl(priv->base + PCL_APP_READY_CTRL); > + if (enable) > + val |= PCL_APP_LTSSM_ENABLE; > + else > + val &= ~PCL_APP_LTSSM_ENABLE; > + writel(val, priv->base + PCL_APP_READY_CTRL); > +} > + > +static void uniphier_pcie_phy_reset(struct uniphier_pcie_ep_priv *priv, > + bool assert) > +{ > + u32 val; > + > + val = readl(priv->base + PCL_RSTCTRL2); > + if (assert) > + val |= PCL_RSTCTRL_PHY_RESET; > + else > + val &= ~PCL_RSTCTRL_PHY_RESET; > + writel(val, priv->base + PCL_RSTCTRL2); > +} > + > +static void uniphier_pcie_init_ep(struct uniphier_pcie_ep_priv *priv) > +{ > + u32 val; > + > + /* set EP mode */ > + val = readl(priv->base + PCL_MODE); > + val |= PCL_MODE_REGVAL; > + writel(val, priv->base + PCL_MODE); > + > + /* clock request */ > + val = readl(priv->base + PCL_APP_CLK_CTRL); > + val &= ~PCL_APP_CLK_REQ; > + writel(val, priv->base + PCL_APP_CLK_CTRL); > + > + /* deassert PIPE3 and AXI reset */ > + val = readl(priv->base + PCL_RSTCTRL0); > + val |= PCL_RSTCTRL_AXI_REG | PCL_RSTCTRL_AXI_SLAVE > + | PCL_RSTCTRL_AXI_MASTER | PCL_RSTCTRL_PIPE3; > + writel(val, priv->base + PCL_RSTCTRL0); > + > + uniphier_pcie_ltssm_enable(priv, false); > +} > + > +static int uniphier_pcie_start_link(struct dw_pcie *pci) > +{ > + struct uniphier_pcie_ep_priv *priv = to_uniphier_pcie(pci); > + > + uniphier_pcie_ltssm_enable(priv, true); > + > + return 0; > +} > + > +static void uniphier_pcie_stop_link(struct dw_pcie *pci) > +{ > + struct uniphier_pcie_ep_priv *priv = to_uniphier_pcie(pci); > + > + uniphier_pcie_ltssm_enable(priv, false); > +} > + > +static void uniphier_pcie_ep_init(struct dw_pcie_ep *ep) > +{ > + struct dw_pcie *pci = to_dw_pcie_from_ep(ep); > + enum pci_barno bar; > + > + for (bar = BAR_0; bar <= BAR_5; bar++) > + dw_pcie_ep_reset_bar(pci, bar); > +} > + > +static int uniphier_pcie_ep_raise_legacy_irq(struct dw_pcie_ep *ep) > +{ > + struct dw_pcie *pci = to_dw_pcie_from_ep(ep); > + struct uniphier_pcie_ep_priv *priv = to_uniphier_pcie(pci); > + u32 val; > + > + /* assert INTx */ > + val = readl(priv->base + PCL_APP_INTX); > + val |= PCL_APP_INTX_SYS_INT; > + writel(val, priv->base + PCL_APP_INTX); > + > + udelay(PCL_INTX_WIDTH_USEC); > + > + /* deassert INTx */ > + val = readl(priv->base + PCL_APP_INTX); > + val &= ~PCL_APP_INTX_SYS_INT; > + writel(val, priv->base + PCL_APP_INTX); > + > + return 0; > +} > + > +static int uniphier_pcie_ep_raise_msi_irq(struct dw_pcie_ep *ep, > + u8 func_no, u16 interrupt_num) > +{ > + struct dw_pcie *pci = to_dw_pcie_from_ep(ep); > + struct uniphier_pcie_ep_priv *priv = to_uniphier_pcie(pci); > + u32 val; > + > + val = FIELD_PREP(PCL_APP_VEN_MSI_TC_MASK, func_no) > + | FIELD_PREP(PCL_APP_VEN_MSI_VECTOR_MASK, interrupt_num - 1); > + writel(val, priv->base + PCL_APP_MSI0); > + > + val = readl(priv->base + PCL_APP_MSI1); > + val |= PCL_APP_MSI_REQ; > + writel(val, priv->base + PCL_APP_MSI1); > + > + return 0; > +} > + > +static int uniphier_pcie_ep_raise_irq(struct dw_pcie_ep *ep, u8 func_no, > + enum pci_epc_irq_type type, > + u16 interrupt_num) > +{ > + struct dw_pcie *pci = to_dw_pcie_from_ep(ep); > + > + switch (type) { > + case PCI_EPC_IRQ_LEGACY: > + return uniphier_pcie_ep_raise_legacy_irq(ep); > + case PCI_EPC_IRQ_MSI: > + return uniphier_pcie_ep_raise_msi_irq(ep, func_no, > + interrupt_num); > + default: > + dev_err(pci->dev, "UNKNOWN IRQ type (%d)\n", type); > + } > + > + return 0; > +} > + > +static const struct pci_epc_features* > +uniphier_pcie_get_features(struct dw_pcie_ep *ep) > +{ > + struct dw_pcie *pci = to_dw_pcie_from_ep(ep); > + struct uniphier_pcie_ep_priv *priv = to_uniphier_pcie(pci); > + > + return &priv->data->features; > +} > + > +static const struct dw_pcie_ep_ops uniphier_pcie_ep_ops = { > + .ep_init = uniphier_pcie_ep_init, > + .raise_irq = uniphier_pcie_ep_raise_irq, > + .get_features = uniphier_pcie_get_features, > +}; > + > +static int uniphier_add_pcie_ep(struct uniphier_pcie_ep_priv *priv, > + struct platform_device *pdev) > +{ > + struct dw_pcie *pci = &priv->pci; > + struct dw_pcie_ep *ep = &pci->ep; > + struct device *dev = &pdev->dev; > + struct resource *res; > + int ret; > + > + ep->ops = &uniphier_pcie_ep_ops; > + > + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi2"); > + pci->dbi_base2 = devm_ioremap_resource(dev, res); > + if (IS_ERR(pci->dbi_base2)) > + return PTR_ERR(pci->dbi_base2); > + > + 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 = dw_pcie_ep_init(ep); > + if (ret) { > + dev_err(dev, "Failed to initialize endpoint (%d)\n", ret); > + return ret; > + } > + > + return 0; > +} > + > +static int uniphier_pcie_ep_enable(struct uniphier_pcie_ep_priv *priv) > +{ > + int ret; > + > + ret = clk_prepare_enable(priv->clk); > + if (ret) > + return ret; > + > + ret = clk_prepare_enable(priv->clk_gio); > + if (ret) > + goto out_clk_disable; > + > + ret = reset_control_deassert(priv->rst); > + if (ret) > + goto out_clk_gio_disable; > + > + ret = reset_control_deassert(priv->rst_gio); > + if (ret) > + goto out_rst_assert; > + > + uniphier_pcie_init_ep(priv); > + > + if (priv->data->is_legacy) > + uniphier_pcie_phy_reset(priv, true); > + > + ret = phy_init(priv->phy); > + if (ret) > + goto out_rst_gio_assert; > + > + if (priv->data->is_legacy) > + uniphier_pcie_phy_reset(priv, false); > + > + return 0; > + > +out_rst_gio_assert: > + reset_control_assert(priv->rst_gio); > +out_rst_assert: > + reset_control_assert(priv->rst); > +out_clk_gio_disable: > + clk_disable_unprepare(priv->clk_gio); > +out_clk_disable: > + clk_disable_unprepare(priv->clk); > + > + return ret; > +} > + > +static const struct dw_pcie_ops dw_pcie_ops = { > + .start_link = uniphier_pcie_start_link, > + .stop_link = uniphier_pcie_stop_link, > +}; > + > +static int uniphier_pcie_ep_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct uniphier_pcie_ep_priv *priv; > + struct resource *res; > + int ret; > + > + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); > + if (!priv) > + return -ENOMEM; > + > + priv->data = of_device_get_match_data(dev); > + if (WARN_ON(!priv->data)) > + return -EINVAL; > + > + priv->pci.dev = dev; > + priv->pci.ops = &dw_pcie_ops; > + > + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi"); > + priv->pci.dbi_base = devm_pci_remap_cfg_resource(dev, res); > + if (IS_ERR(priv->pci.dbi_base)) > + return PTR_ERR(priv->pci.dbi_base); > + > + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "link"); > + priv->base = devm_ioremap_resource(dev, res); > + if (IS_ERR(priv->base)) > + return PTR_ERR(priv->base); > + > + if (priv->data->is_legacy) { > + priv->clk_gio = devm_clk_get(dev, "gio"); > + if (IS_ERR(priv->clk)) > + return PTR_ERR(priv->clk); > + > + priv->rst_gio = > + devm_reset_control_get_shared(dev, "gio"); > + if (IS_ERR(priv->rst_gio)) > + return PTR_ERR(priv->rst_gio); > + > + priv->clk = devm_clk_get(dev, "link"); > + if (IS_ERR(priv->clk)) > + return PTR_ERR(priv->clk); > + > + priv->rst = > + devm_reset_control_get_shared(dev, "link"); > + if (IS_ERR(priv->rst)) > + return PTR_ERR(priv->rst); > + } else { > + priv->clk = devm_clk_get(dev, NULL); > + if (IS_ERR(priv->clk)) > + return PTR_ERR(priv->clk); > + > + priv->rst = devm_reset_control_get_shared(dev, NULL); > + if (IS_ERR(priv->rst)) > + return PTR_ERR(priv->rst); > + } > + > + priv->phy = devm_phy_optional_get(dev, "pcie-phy"); > + if (IS_ERR(priv->phy)) > + return PTR_ERR(priv->phy); > + > + platform_set_drvdata(pdev, priv); > + > + ret = uniphier_pcie_ep_enable(priv); > + if (ret) > + return ret; > + > + return uniphier_add_pcie_ep(priv, pdev); > +} > + > +static const struct uniphier_pcie_ep_soc_data uniphier_pro5_data = { > + .is_legacy = true, > + .features = { > + .linkup_notifier = false, > + .msi_capable = true, > + .msix_capable = false, > + .align = 1 << 16, > + .bar_fixed_64bit = BIT(BAR_0) | BIT(BAR_2) | BIT(BAR_4), > + .reserved_bar = BIT(BAR_4), > + }, > +}; > + > +static const struct of_device_id uniphier_pcie_ep_match[] = { > + { > + .compatible = "socionext,uniphier-pro5-pcie-ep", > + .data = &uniphier_pro5_data, > + }, > + { /* sentinel */ }, > +}; > + > +static struct platform_driver uniphier_pcie_ep_driver = { > + .probe = uniphier_pcie_ep_probe, > + .driver = { > + .name = "uniphier-pcie-ep", > + .of_match_table = uniphier_pcie_ep_match, > + .suppress_bind_attrs = true, > + }, > +}; > +builtin_platform_driver(uniphier_pcie_ep_driver); > -- > 2.7.4 --- Best Regards, Kunihiko Hayashi _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-01-15 2:17 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-12-12 2:02 [PATCH 0/2] PCI: Add new UniPhier PCIe endpoint driver Kunihiko Hayashi 2019-12-12 2:02 ` [PATCH 1/2] dt-bindings: PCI: Add UniPhier PCIe endpoint controller description Kunihiko Hayashi 2019-12-19 22:03 ` Rob Herring 2019-12-12 2:02 ` [PATCH 2/2] PCI: uniphier: Add UniPhier PCIe endpoint controller support Kunihiko Hayashi 2020-01-15 2:16 ` Kunihiko Hayashi
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).