Introduction of PCIe support on STi platform
Subsystems (4)
v2 cover Introduction of PCIe support on STi platform
The STi platform SoC embed a designware based PCIe controller. This serie include the driver for the controller and DT for the stih407-family and for the stih418-b2264 into which it is used.
Within the DT and the binding, only st,stih407-pcie compatible is used.
Rob, could you clarify if I need to mention both compatible (st,stih407-pcie and snps,dw-pcie) or if st,stih407-pcie is enought ?
RESEND since not all patches made their way to the mailing list on previous attempt.
v2: update of the pcie-st driver to add possibility to build as module
and remove the __init of the probe
Alain Volmat (5):
dt-bindings: pci: st-pcie: PCIe controller found on STi platforms
pci: dwc: pcie-st: Add PCIe driver for STi platforms
MAINTAINERS: add entry for ST STI PCIE driver
ARM: dts: sti: add the PCIe controller node within stih407-family
ARM: dts: sti: enable PCIe on the stih418-b2264 board
.../devicetree/bindings/pci/snps,dw-pcie.yaml | 2 +- .../devicetree/bindings/pci/st,st-pcie.yaml | 112 +++++ MAINTAINERS | 6 + arch/arm/boot/dts/stih407-family.dtsi | 40 ++ arch/arm/boot/dts/stih418-b2264.dts | 5 + drivers/pci/controller/dwc/Kconfig | 11 + drivers/pci/controller/dwc/Makefile | 1 + drivers/pci/controller/dwc/pcie-sti.c | 386 ++++++++++++++++++ 8 files changed, 562 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/pci/st,st-pcie.yaml create mode 100644 drivers/pci/controller/dwc/pcie-sti.c
Signature · 1 line
2.25.1
PATCH RESEND v2 1/5 dt-bindings: pci: st-pcie: PCIe controller found on STi platforms
Addition of the bindings for the Designware based PCIe controller that can be found on STi platforms such as STiH407, STiH410 or STiH418.
--- .../devicetree/bindings/pci/snps,dw-pcie.yaml | 2 +- .../devicetree/bindings/pci/st,st-pcie.yaml | 112 ++++++++++++++++++ 2 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/pci/st,st-pcie.yaml
Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml +1 -1
@@ -35,7 +35,7 @@ properties: maxItems: 5 items: enum: [ dbi, dbi2, config, atu, app, elbi, mgmt, ctrl, parf, cfg, link, - ulreg, smu, mpu, apb, phy ] + ulreg, smu, mpu, apb, phy, mem-window ] num-lanes: description: |
Documentation/devicetree/bindings/pci/st,st-pcie.yaml new file +112 -0
112 lines not on this page · raw message
Signature · 1 line
2.25.1
Re: [PATCH RESEND v2 1/5] dt-bindings: pci: st-pcie: PCIe controller found on STi platforms
Quoted 48 lines · Alain Volmat
Addition of the bindings for the Designware based PCIe controller that can be found on STi platforms such as STiH407, STiH410 or STiH418.
Signed-off-by Alain Volmat <[email protected]>--- .../devicetree/bindings/pci/snps,dw-pcie.yaml | 2 +- .../devicetree/bindings/pci/st,st-pcie.yaml | 112 ++++++++++++++++++ 2 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/pci/st,st-pcie.yamlDocumentation/devicetree/bindings/pci/snps,dw-pcie.yaml +1
-1@@ -35,7 +35,7 @@ properties: maxItems: 5 items: enum: [ dbi, dbi2, config, atu, app, elbi, mgmt, ctrl, parf, cfg, link, - ulreg, smu, mpu, apb, phy ] + ulreg, smu, mpu, apb, phy, mem-window ] num-lanes: description: |Documentation/devicetree/bindings/pci/st,st-pcie.yaml new file +19
-0@@ -0,0 +1,112 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/pci/st,st-pcie.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: PCIe RC controller on ST STi platform + +maintainers: + - Alain Volmat <[email protected]> + +allOf: + - $ref: /schemas/pci/snps,dw-pcie.yaml# + +properties: + compatible: + const: st,stih407-pcie + + reg:
Documentation/devicetree/bindings/pci/st,st-pcie.yaml line 29
Quoted 10 lines
Documentation/devicetree/bindings/pci/st,st-pcie.yaml new file +10
-0+ items: + - description: Controller control and status registers. + - description: PCIe configuration registers. + - description: Memory made available to the controller + + reg-names: + items: + - const: dbi + - const: config + - const: mem-window
I guess "mem-window" is the range for inbound DMA? Other controllers should have similar ranges. Can we use the same DT reg names used by other controllers instead of adding something new and STi-specific?
Documentation/devicetree/bindings/pci/st,st-pcie.yaml line 43
Quoted 13 lines
Documentation/devicetree/bindings/pci/st,st-pcie.yaml new file +13
-0+ interrupts: + maxItems: 1 + + resets: + items: + - description: Controller reset + - description: Powerdown reset (optional) + minItems: 1 + + reset-names: + items: + - const: softreset + - const: powerdown
"softreset" and "powerdown" appear only in this binding. Are they really unique to STi, or can we use the same names used for other controllers?
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH RESEND v2 2/5 pci: dwc: pcie-st: Add PCIe driver for STi platforms
In reply to Alain VolmatAddition of the PCIe driver (supporting RC) for controllers found on some STi platforms such as STiH407, STiH410 or STiH418.
The controller is based on the designware PCIe controller.
---
v2: update of the pcie-st driver to add possibility to build as module
and remove the __init of the probe
drivers/pci/controller/dwc/Kconfig | 11 + drivers/pci/controller/dwc/Makefile | 1 + drivers/pci/controller/dwc/pcie-sti.c | 386 ++++++++++++++++++++++++++ 3 files changed, 398 insertions(+) create mode 100644 drivers/pci/controller/dwc/pcie-sti.c
drivers/pci/controller/dwc/Kconfig +11 -0
@@ -384,4 +384,15 @@ config PCIE_FU740 Say Y here if you want PCIe controller support for the SiFive FU740. +config PCIE_STI + tristate "STMicroelectronics PCIe Controller for STi SoCs" + depends on ARCH_STI || COMPILE_TEST + depends on OF && PCI_MSI_IRQ_DOMAIN + select PCIE_DW_HOST + help + Enable PCIe controller support on STMicroelectronics STi SoCs. + This controller is based on Designware hardware and therefore + the driver re-uses the Designware core functions to implement + the driver. + endmenu
drivers/pci/controller/dwc/Makefile +1 -0
@@ -21,6 +21,7 @@ obj-$(CONFIG_PCIE_KEEMBAY) += pcie-keembay.o obj-$(CONFIG_PCIE_KIRIN) += pcie-kirin.o obj-$(CONFIG_PCIE_HISI_STB) += pcie-histb.o obj-$(CONFIG_PCI_MESON) += pci-meson.o +obj-$(CONFIG_PCIE_STI) += pcie-sti.o obj-$(CONFIG_PCIE_TEGRA194) += pcie-tegra194.o obj-$(CONFIG_PCIE_UNIPHIER) += pcie-uniphier.o obj-$(CONFIG_PCIE_UNIPHIER_EP) += pcie-uniphier-ep.o
drivers/pci/controller/dwc/pcie-sti.c new file +386 -0
386 lines not on this page · raw message
Signature · 1 line
2.25.1
Re: [PATCH RESEND v2 2/5] pci: dwc: pcie-st: Add PCIe driver for STi platforms
Hi Alain
Some minor remarks below
You can add my reviewed-by
Thanks
Patrice
Quoted 54 lines · Alain Volmat
Addition of the PCIe driver (supporting RC) for controllers found on some STi platforms such as STiH407, STiH410 or STiH418.
The controller is based on the designware PCIe controller.Signed-off-by Alain Volmat <[email protected]>---
v2: update of the pcie-st driver to add possibility to build as module
and remove the__initof the probedrivers/pci/controller/dwc/Kconfig | 11 + drivers/pci/controller/dwc/Makefile | 1 + drivers/pci/controller/dwc/pcie-sti.c | 386 ++++++++++++++++++++++++++ 3 files changed, 398 insertions(+) create mode 100644 drivers/pci/controller/dwc/pcie-sti.cdrivers/pci/controller/dwc/Kconfig +11
-0@@ -384,4 +384,15 @@ config PCIE_FU740 Say Y here if you want PCIe controller support for the SiFive FU740. +config PCIE_STI + tristate "STMicroelectronics PCIe Controller for STi SoCs" + depends on ARCH_STI || COMPILE_TEST + depends on OF && PCI_MSI_IRQ_DOMAIN + select PCIE_DW_HOST + help + Enable PCIe controller support on STMicroelectronics STi SoCs. + This controller is based on Designware hardware and therefore + the driver re-uses the Designware core functions to implement + the driver. + endmenudrivers/pci/controller/dwc/Makefile +1
-0@@ -21,6 +21,7 @@ obj-$(CONFIG_PCIE_KEEMBAY) += pcie-keembay.o obj-$(CONFIG_PCIE_KIRIN) += pcie-kirin.o obj-$(CONFIG_PCIE_HISI_STB) += pcie-histb.o obj-$(CONFIG_PCI_MESON) += pci-meson.o +obj-$(CONFIG_PCIE_STI) += pcie-sti.o obj-$(CONFIG_PCIE_TEGRA194) += pcie-tegra194.o obj-$(CONFIG_PCIE_UNIPHIER) += pcie-uniphier.o obj-$(CONFIG_PCIE_UNIPHIER_EP) += pcie-uniphier-ep.odrivers/pci/controller/dwc/pcie-sti.c new file +0
-0
drivers/pci/controller/dwc/pcie-sti.c line 3
Quoted 3 lines
drivers/pci/controller/dwc/pcie-sti.c new file +3
-0@@ -0,0 +1,386 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright (C) 2021 STMicroelectronics
2022
Quoted 20 lines
drivers/pci/controller/dwc/pcie-sti.c new file +20
-0+* +* STMicroelectronics PCI express Driver for STi SoCs. +* ST PCIe IPs are built around a Synopsys IP Core. +* +* Authors: Fabrice Gasnier <[email protected]> +* Alain Volmat <[email protected]> +*/ + +#include <linux/delay.h> +#include <linux/interrupt.h> +#include <linux/mfd/syscon.h> +#include <linux/module.h> +#include <linux/of_address.h> +#include <linux/of_gpio.h> +#include <linux/of_pci.h> +#include <linux/of_platform.h> +#include <linux/phy/phy.h> +#include <linux/regmap.h> +#include <linux/reset.h> +
drivers/pci/controller/dwc/pcie-sti.c line 33
Quoted 10 lines
drivers/pci/controller/dwc/pcie-sti.c new file +10
-0+#include "pcie-designware.h" + +/* RC_ADDRESS_TRANSLATION Registers */ +#define TRANSLATION_CONTROL 0x900 +/* Controls if area is inclusive or exclusive */ +#define RC_PASS_ADDR_RANGE BIT(1) + +/* Base of area reserved for config accesses. Fixed size of 64K. */ +#define CFG_BASE_ADDRESS 0x92c +#define CFG_REGION_SIZE 65536
s/65536/SZ_64K
Quoted 88 lines
drivers/pci/controller/dwc/pcie-sti.c new file +88
-0+#define CFG_SPACE1_OFFSET 0x1000 + +/* First 4K of config space has this BDF (bus,device,function) */ +#define FUNC0_BDF_NUM 0x930 + +/* Mem regions */ +#define IN0_MEM_ADDR_START 0x964 +#define IN0_MEM_ADDR_LIMIT 0x968 +#define IN1_MEM_ADDR_START 0x974 +#define IN1_MEM_ADDR_LIMIT 0x978 + +/* syscfg1 bits */ +#define PCIE_APP_LTSSM_ENABLE BIT(2) +/* syscfg0 bits */ +#define PCIE_TYPE_ROOT_COMPLEX BIT(0) + +/* st,syscfg offsets */ +#define SYSCFG0_REG 1 +#define SYSCFG1_REG 2 + +#define to_st_pcie (x) dev_get_drvdata((x)->dev) + +/** +* struct st_pcie - private data of the controller +* @dw: designware pcie +* @syscfg0: PCIe conf register setting root complex, regmap offset +* @syscfg1: PCIe conf register for PCIE_APP_LTSSM_ENABLE, regmap offset +* @phy: associated pcie phy +* @lmi: memory made available to the controller +* @regmap: Syscfg registers bank in which PCIe port is configured +* @pwr: power control +* @rst: reset control +* @reset_gpio: optional reset gpio +* @config_window_start: start address of 64K config space area +*/ +struct st_pcie { +struct dw_pcie *dw; +int syscfg0; +int syscfg1; +struct phy *phy; +struct resource *lmi; +struct regmap *regmap; +struct reset_control *pwr; +struct reset_control *rst; +struct gpio_desc *reset_gpio; +phys_addr_t config_window_start; +}; + +/* +* The PCI express core IP expects the following arrangement on it's address +* bus (slv_haddr) when driving config cycles. +* bus_number [31:24] +* dev_number [23:19] +* func_number [18:16] +* unused [15:12] +* ext_reg_number [11:8] +* reg_number [7:2] +* +* Bits [15:12] are unused. +* +* In the glue logic there is a 64K region of address space that can be +* written/read to generate config cycles. The base address of this is +* controlled by CFG_BASE_ADDRESS. There are 8 16 bit registers called +* FUNC0_BDF_NUM to FUNC8_BDF_NUM. These split the bottom half of the 64K +* window into 8 regions at 4K boundaries. These control the bus, device and +* function number you are trying to talk to. +* +* The decision on whether to generate a type 0 or type 1 access is controlled +* by bits 15:12 of the address you write to. If they are zero, then a type 0 +* is generated, if anything else it will be a type 1. Thus the bottom 4K +* region controlled by FUNC0_BDF_NUM can only generate type 0, all the others +* can only generate type 1. +* +* We only use FUNC0_BDF_NUM and FUNC1_BDF_NUM. Which one you use is selected +* by bit 12 of the address you write to. The selected register is then used +* for the top 16 bits of the slv_haddr to form the bus/dev/func, bit 15:12 are +* wired to zero, and bits 11:2 form the address of the register you want to +* read in config space. +* +* We always write FUNC0_BDF_NUM as a 32 bit write. So if we want type 1 +* accesses we have to shift by 16 so in effect we are writing to FUNC1_BDF_NUM +*/ +static inline u32 bdf_num (int bus,int devfn,int is_root_bus) +{ +return ((bus <<8 ) | devfn) << (is_root_bus ?0 :16 ); +} + +static void __iomem *st_pcie_other_map_bus (struct pci_bus *bus,unsigned int devfn,int where)
drivers/pci/controller/dwc/pcie-sti.c line 131
Quoted 10 lines
drivers/pci/controller/dwc/pcie-sti.c new file +10
-0+{ +struct pcie_port *pp = bus->sysdata; +struct dw_pcie *dw =to_dw_pcie_from_pp (pp); +u32 bdf; + + bdf =bdf_num (bus->number, devfn,pci_is_root_bus (bus)); + +/* Set the config packet devfn */ +dw_pcie_writel_dbi (dw,FUNC0_BDF_NUM , bdf); +dw_pcie_readl_dbi (dw,FUNC0_BDF_NUM );
Can you add an explaination about this sequence write/read the same register ?
Quoted 72 lines
drivers/pci/controller/dwc/pcie-sti.c new file +72
-0+ +return pp->va_cfg0_base + where + (pci_is_root_bus (bus->parent) ?0 :CFG_SPACE1_OFFSET ); +} + +static struct pci_ops st_child_pcie_ops = { + .map_bus = st_pcie_other_map_bus, + .read = pci_generic_config_read, + .write = pci_generic_config_write, +}; + +static void st_pcie_hw_setup (struct dw_pcie *dw) +{ +struct st_pcie *pcie =to_st_pcie (dw); + +/* Set up the config window to the top of the PCI address space */ +dw_pcie_writel_dbi (dw,CFG_BASE_ADDRESS , pcie->config_window_start); + +/* +* Open up memory to the PCI controller. We could do slightly +* better than this and exclude the kernel text segment and bss etc. +* They are base/limit registers so can be of arbitrary alignment +* presumably +*/ +dw_pcie_writel_dbi (dw,IN0_MEM_ADDR_START , pcie->lmi->start); +dw_pcie_writel_dbi (dw,IN0_MEM_ADDR_LIMIT , pcie->lmi->end); + +/* Disable the 2nd region */ +dw_pcie_writel_dbi (dw,IN1_MEM_ADDR_START , ~0 ); +dw_pcie_writel_dbi (dw,IN1_MEM_ADDR_LIMIT ,0 ); + +dw_pcie_writel_dbi (dw,TRANSLATION_CONTROL ,RC_PASS_ADDR_RANGE ); +} + +static int st_pcie_init (struct pcie_port *pp) +{ +struct dw_pcie *dw =to_dw_pcie_from_pp (pp); +struct st_pcie *pcie =to_st_pcie (dw); +int ret; + +/* Set device type : Root Complex */ + ret =regmap_write (pcie->regmap, pcie->syscfg0,PCIE_TYPE_ROOT_COMPLEX ); +if (ret <0 ) { +dev_err (dw->dev,"unable to set device type\n" ); +return ret; + } + + ret =reset_control_deassert (pcie->pwr); +if (ret) { +dev_err (dw->dev,"unable to bring out of powerdown\n" ); +return ret; + } + + ret =reset_control_deassert (pcie->rst); +if (ret) { +dev_err (dw->dev,"unable to bring out of softreset\n" ); +return ret; + } + +/* let the controller initialize in the proper mode (RC) after reset */ +usleep_range (1000 ,2000 ); + +return ret; +} + +static int st_pcie_control_ltssm (struct dw_pcie *dw,bool enable) +{ +struct st_pcie *pcie =to_st_pcie (dw); + +return regmap_update_bits (pcie->regmap, pcie->syscfg1,PCIE_APP_LTSSM_ENABLE , +FIELD_PREP (PCIE_APP_LTSSM_ENABLE , enable)); +} +
drivers/pci/controller/dwc/pcie-sti.c line 213
Quoted 10 lines
drivers/pci/controller/dwc/pcie-sti.c new file +10
-0+static int st_pcie_host_init (struct pcie_port *pp) +{ +struct dw_pcie *dw =to_dw_pcie_from_pp (pp); +struct st_pcie *pcie =to_st_pcie (dw); +int err; + + pcie->config_window_start = pp->cfg0_base; + +/* +* "Override" default ops provided by designware driver as STI
s/STI/STi
Quoted 173 lines
drivers/pci/controller/dwc/pcie-sti.c new file +173
-0+* PCIe uses its own translation unit rather than iATU +*/ + pp->bridge->child_ops = &st_child_pcie_ops; + +/* +* We have to initialise the PCIe cell on some hardware before we can +* talk to the phy +*/ + err =st_pcie_init (pp); +if (err) +return err; + + err =st_pcie_control_ltssm (dw, false); +if (err) { +dev_err (dw->dev,"disable ltssm failed, %d\n" , err); +return err; + } + +/* Init the associated miphy */ + err =phy_init (pcie->phy); +if (err <0 ) { +dev_err (dw->dev,"Cannot init PHY: %d\n" , err); +return err; + } + +return 0 ; +} + +static int st_pcie_start_link (struct dw_pcie *dw) +{ +struct st_pcie *pcie =to_st_pcie (dw); +int err; + +/* Do all the register poking */ +st_pcie_hw_setup (dw); + +if (pcie->reset_gpio) { +/* Assert the PERST# signal */ +gpiod_set_value (pcie->reset_gpio,1 ); + +/* PERST# signal must stay asserted for at least 100us (Tperst-clk) */ +usleep_range (100 ,200 ); + +/* Release PERST# signal */ +gpiod_set_value (pcie->reset_gpio,0 ); + } + +/* Re-enable the link, link training must begin shortly after reset */ + err =st_pcie_control_ltssm (dw, true); +if (err) { +dev_err (dw->dev,"enable ltssm failed, %d\n" , err); +return err; + } + + err =dw_pcie_wait_for_link (dw); +if (err) { +dev_err (dw->dev,"wait for link failed, %d\n" , err); +return err; + } + +/* +* PCIe specification states that you should not issue any config +* requests until 100ms after asserting reset, so we enforce that here +*/ +if (pcie->reset_gpio) +msleep (100 ); + +return 0 ; +} + +static struct dw_pcie_host_ops st_pcie_host_ops = { + .host_init = st_pcie_host_init, +}; + +static const struct dw_pcie_ops dw_pcie_ops = { + .start_link = st_pcie_start_link, +}; + +static int st_pcie_probe (struct platform_device *pdev) +{ +struct st_pcie *pcie; +struct dw_pcie *dw; +struct device_node *np = pdev->dev.of_node; +struct pcie_port *pp; +int ret; + + pcie =devm_kzalloc (&pdev->dev,sizeof (*pcie),GFP_KERNEL ); +if (!pcie) +return -ENOMEM ; + + dw =devm_kzalloc (&pdev->dev,sizeof (*dw),GFP_KERNEL ); +if (!dw) +return -ENOMEM ; + pcie->dw = dw; + dw->dev = &pdev->dev; + dw->ops = &dw_pcie_ops; + + pp = &dw->pp; + pp->ops = &st_pcie_host_ops; + +/* mem regions */ + pcie->lmi =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"mem-window" ); +if (!pcie->lmi) +return -ENXIO ; + +/* regmap registers for PCIe IP configuration */ + pcie->regmap =syscon_regmap_lookup_by_phandle (np,"st,syscfg" ); +if (IS_ERR (pcie->regmap)) +return dev_err_probe (&pdev->dev,PTR_ERR (pcie->regmap), +"No syscfg phandle specified\n" ); + + ret =of_property_read_u32_index (np,"st,syscfg" ,SYSCFG0_REG , &pcie->syscfg0); +if (ret) { +dev_err (&pdev->dev,"can't get syscfg0 offset (%d)\n" , ret); +return ret; + } + + ret =of_property_read_u32_index (np,"st,syscfg" ,SYSCFG1_REG , &pcie->syscfg1); +if (ret) { +dev_err (&pdev->dev,"can't get syscfg1 offset (%d)\n" , ret); +return ret; + } + +/* powerdown / resets */ + pcie->pwr =devm_reset_control_get_optional (&pdev->dev,"powerdown" ); +if (IS_ERR (pcie->pwr)) +return dev_err_probe (&pdev->dev,PTR_ERR (pcie->pwr), +"Error getting powerdown reset control\n" ); + + pcie->rst =devm_reset_control_get (&pdev->dev,"softreset" ); +if (IS_ERR (pcie->rst)) +return dev_err_probe (&pdev->dev,PTR_ERR (pcie->rst), +"Error getting softreset control\n" ); + +/* phy */ + pcie->phy =devm_phy_get (&pdev->dev,"pcie" ); +if (IS_ERR (pcie->phy)) +return dev_err_probe (&pdev->dev,PTR_ERR (pcie->phy),"no PHY configured\n" ); + +/* Claim the GPIO for PRST# if available, keep it de-asserted */ + pcie->reset_gpio =devm_gpiod_get_optional (&pdev->dev,"reset" ,GPIOD_OUT_LOW ); +if (IS_ERR (pcie->reset_gpio)) +return dev_err_probe (&pdev->dev,PTR_ERR (pcie->reset_gpio), +"Cannot request reset-gpios\n" ); + +platform_set_drvdata (pdev, pcie); + + ret =dw_pcie_host_init (pp); +if (ret) +return dev_err_probe (&pdev->dev, ret,"failed to initialize host\n" ); + +return 0 ; +} + +static const struct of_device_id st_pcie_of_match[] = { + { .compatible ="st,stih407-pcie" , }, + { }, +}; +MODULE_DEVICE_TABLE (of, st_pcie_of_match); + +static struct platform_driver st_pcie_driver__refdata = { + .probe = st_pcie_probe, + .driver = { + .name ="st-pcie" , + .of_match_table = st_pcie_of_match, + }, +}; +module_platform_driver (st_pcie_driver); + +MODULE_AUTHOR ("Fabrice Gasnier <[email protected]>" ); +MODULE_AUTHOR ("Alain Volmat <[email protected]>" ); +MODULE_DESCRIPTION ("STi PCIe Controller driver" ); +MODULE_LICENSE ("GPL v2" );
Re: [PATCH RESEND v2 2/5] pci: dwc: pcie-st: Add PCIe driver for STi platforms
In reply to Alain VolmatQuoted 4 lines · Alain Volmat
Addition of the PCIe driver (supporting RC) for controllers found on some STi platforms such as STiH407, STiH410 or STiH418.
The controller is based on the designware PCIe controller.
Please follow the subject and commit log conventions in drivers/pci/controller. Update capitalization, use imperative mood, blank lines between paragraphs, etc. Wrap to fill 75 columns in the commit log.
Follow OEM usage ("DesignWare"), also below in Kconfig help text and comments.
In commit logs, comments, etc, use "PCIe" consistently, not "PCI express" or "pcie". Similarly, use "PHY" instead of "phy"; "GPIO" instead of "gpio".
Quoted 122 lines
Signed-off-by Alain Volmat <[email protected]>---
v2: update of the pcie-st driver to add possibility to build as module
and remove the__initof the probedrivers/pci/controller/dwc/Kconfig | 11 + drivers/pci/controller/dwc/Makefile | 1 + drivers/pci/controller/dwc/pcie-sti.c | 386 ++++++++++++++++++++++++++ 3 files changed, 398 insertions(+) create mode 100644 drivers/pci/controller/dwc/pcie-sti.cdrivers/pci/controller/dwc/Kconfig +11
-0@@ -384,4 +384,15 @@ config PCIE_FU740 Say Y here if you want PCIe controller support for the SiFive FU740. +config PCIE_STI + tristate "STMicroelectronics PCIe Controller for STi SoCs" + depends on ARCH_STI || COMPILE_TEST + depends on OF && PCI_MSI_IRQ_DOMAIN + select PCIE_DW_HOST + help + Enable PCIe controller support on STMicroelectronics STi SoCs. + This controller is based on Designware hardware and therefore + the driver re-uses the Designware core functions to implement + the driver. + endmenudrivers/pci/controller/dwc/Makefile +1
-0@@ -21,6 +21,7 @@ obj-$(CONFIG_PCIE_KEEMBAY) += pcie-keembay.o obj-$(CONFIG_PCIE_KIRIN) += pcie-kirin.o obj-$(CONFIG_PCIE_HISI_STB) += pcie-histb.o obj-$(CONFIG_PCI_MESON) += pci-meson.o +obj-$(CONFIG_PCIE_STI) += pcie-sti.o obj-$(CONFIG_PCIE_TEGRA194) += pcie-tegra194.o obj-$(CONFIG_PCIE_UNIPHIER) += pcie-uniphier.o obj-$(CONFIG_PCIE_UNIPHIER_EP) += pcie-uniphier-ep.odrivers/pci/controller/dwc/pcie-sti.c new file +73
-0@@ -0,0 +1,386 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright (C) 2021 STMicroelectronics +* +* STMicroelectronics PCI express Driver for STi SoCs. +* ST PCIe IPs are built around a Synopsys IP Core. +* +* Authors: Fabrice Gasnier <[email protected]> +* Alain Volmat <[email protected]> +*/ + +#include <linux/delay.h> +#include <linux/interrupt.h> +#include <linux/mfd/syscon.h> +#include <linux/module.h> +#include <linux/of_address.h> +#include <linux/of_gpio.h> +#include <linux/of_pci.h> +#include <linux/of_platform.h> +#include <linux/phy/phy.h> +#include <linux/regmap.h> +#include <linux/reset.h> + +#include "pcie-designware.h" + +/* RC_ADDRESS_TRANSLATION Registers */ +#define TRANSLATION_CONTROL 0x900 +/* Controls if area is inclusive or exclusive */ +#define RC_PASS_ADDR_RANGE BIT(1) + +/* Base of area reserved for config accesses. Fixed size of 64K. */ +#define CFG_BASE_ADDRESS 0x92c +#define CFG_REGION_SIZE 65536 +#define CFG_SPACE1_OFFSET 0x1000 + +/* First 4K of config space has this BDF (bus,device,function) */ +#define FUNC0_BDF_NUM 0x930 + +/* Mem regions */ +#define IN0_MEM_ADDR_START 0x964 +#define IN0_MEM_ADDR_LIMIT 0x968 +#define IN1_MEM_ADDR_START 0x974 +#define IN1_MEM_ADDR_LIMIT 0x978 + +/* syscfg1 bits */ +#define PCIE_APP_LTSSM_ENABLE BIT(2) +/* syscfg0 bits */ +#define PCIE_TYPE_ROOT_COMPLEX BIT(0) + +/* st,syscfg offsets */ +#define SYSCFG0_REG 1 +#define SYSCFG1_REG 2 + +#define to_st_pcie (x) dev_get_drvdata((x)->dev) + +/** +* struct st_pcie - private data of the controller +* @dw: designware pcie +* @syscfg0: PCIe conf register setting root complex, regmap offset +* @syscfg1: PCIe conf register for PCIE_APP_LTSSM_ENABLE, regmap offset +* @phy: associated pcie phy +* @lmi: memory made available to the controller +* @regmap: Syscfg registers bank in which PCIe port is configured +* @pwr: power control +* @rst: reset control +* @reset_gpio: optional reset gpio +* @config_window_start: start address of 64K config space area +*/ +struct st_pcie { +struct dw_pcie *dw; +int syscfg0; +int syscfg1; +struct phy *phy;
drivers/pci/controller/dwc/pcie-sti.c line 83
Quoted 10 lines
drivers/pci/controller/dwc/pcie-sti.c new file +10
-0+struct resource *lmi; +struct regmap *regmap; +struct reset_control *pwr; +struct reset_control *rst; +struct gpio_desc *reset_gpio; +phys_addr_t config_window_start; +}; + +/* +* The PCI express core IP expects the following arrangement on it's address
s/PCI express/PCIe/
s/it's/its/
Quoted 28 lines
drivers/pci/controller/dwc/pcie-sti.c new file +28
-0+* bus (slv_haddr) when driving config cycles. +* bus_number [31:24] +* dev_number [23:19] +* func_number [18:16] +* unused [15:12] +* ext_reg_number [11:8] +* reg_number [7:2] +* +* Bits [15:12] are unused. +* +* In the glue logic there is a 64K region of address space that can be +* written/read to generate config cycles. The base address of this is +* controlled by CFG_BASE_ADDRESS. There are 8 16 bit registers called +* FUNC0_BDF_NUM to FUNC8_BDF_NUM. These split the bottom half of the 64K +* window into 8 regions at 4K boundaries. These control the bus, device and +* function number you are trying to talk to. +* +* The decision on whether to generate a type 0 or type 1 access is controlled +* by bits 15:12 of the address you write to. If they are zero, then a type 0 +* is generated, if anything else it will be a type 1. Thus the bottom 4K +* region controlled by FUNC0_BDF_NUM can only generate type 0, all the others +* can only generate type 1. +* +* We only use FUNC0_BDF_NUM and FUNC1_BDF_NUM. Which one you use is selected +* by bit 12 of the address you write to. The selected register is then used +* for the top 16 bits of the slv_haddr to form the bus/dev/func, bit 15:12 are +* wired to zero, and bits 11:2 form the address of the register you want to +* read in config space.
drivers/pci/controller/dwc/pcie-sti.c line 121
Quoted 10 lines
drivers/pci/controller/dwc/pcie-sti.c new file +10
-0+* +* We always write FUNC0_BDF_NUM as a 32 bit write. So if we want type 1 +* accesses we have to shift by 16 so in effect we are writing to FUNC1_BDF_NUM +*/ +static inline u32 bdf_num (int bus,int devfn,int is_root_bus) +{ +return ((bus <<8 ) | devfn) << (is_root_bus ?0 :16 ); +} + +static void __iomem *st_pcie_other_map_bus (struct pci_bus *bus,unsigned int devfn,int where)
Wrap to fit in 80 columns (see other drivers for examples). Wrap rest of file similarly.
Quoted 59 lines
drivers/pci/controller/dwc/pcie-sti.c new file +59
-0+{ +struct pcie_port *pp = bus->sysdata; +struct dw_pcie *dw =to_dw_pcie_from_pp (pp); +u32 bdf; + + bdf =bdf_num (bus->number, devfn,pci_is_root_bus (bus)); + +/* Set the config packet devfn */ +dw_pcie_writel_dbi (dw,FUNC0_BDF_NUM , bdf); +dw_pcie_readl_dbi (dw,FUNC0_BDF_NUM ); + +return pp->va_cfg0_base + where + (pci_is_root_bus (bus->parent) ?0 :CFG_SPACE1_OFFSET ); +} + +static struct pci_ops st_child_pcie_ops = { + .map_bus = st_pcie_other_map_bus, + .read = pci_generic_config_read, + .write = pci_generic_config_write, +}; + +static void st_pcie_hw_setup (struct dw_pcie *dw) +{ +struct st_pcie *pcie =to_st_pcie (dw); + +/* Set up the config window to the top of the PCI address space */ +dw_pcie_writel_dbi (dw,CFG_BASE_ADDRESS , pcie->config_window_start); + +/* +* Open up memory to the PCI controller. We could do slightly +* better than this and exclude the kernel text segment and bss etc. +* They are base/limit registers so can be of arbitrary alignment +* presumably +*/ +dw_pcie_writel_dbi (dw,IN0_MEM_ADDR_START , pcie->lmi->start); +dw_pcie_writel_dbi (dw,IN0_MEM_ADDR_LIMIT , pcie->lmi->end); + +/* Disable the 2nd region */ +dw_pcie_writel_dbi (dw,IN1_MEM_ADDR_START , ~0 ); +dw_pcie_writel_dbi (dw,IN1_MEM_ADDR_LIMIT ,0 ); + +dw_pcie_writel_dbi (dw,TRANSLATION_CONTROL ,RC_PASS_ADDR_RANGE ); +} + +static int st_pcie_init (struct pcie_port *pp) +{ +struct dw_pcie *dw =to_dw_pcie_from_pp (pp); +struct st_pcie *pcie =to_st_pcie (dw); +int ret; + +/* Set device type : Root Complex */ + ret =regmap_write (pcie->regmap, pcie->syscfg0,PCIE_TYPE_ROOT_COMPLEX ); +if (ret <0 ) { +dev_err (dw->dev,"unable to set device type\n" ); +return ret; + } + + ret =reset_control_deassert (pcie->pwr); +if (ret) { +dev_err (dw->dev,"unable to bring out of powerdown\n" );
drivers/pci/controller/dwc/pcie-sti.c line 190
Quoted 10 lines
drivers/pci/controller/dwc/pcie-sti.c new file +10
-0+return ret; + } + + ret =reset_control_deassert (pcie->rst); +if (ret) { +dev_err (dw->dev,"unable to bring out of softreset\n" ); +return ret; + } + +/* let the controller initialize in the proper mode (RC) after reset */
Capitalize comments consistently. Not sure what this comment is telling us anyway. RC mode is determined above. I assume this delay an STi-specific thing? A reference to how this was derived might be a useful thing, e.g., a section number in the STi spec.
Quoted 15 lines
drivers/pci/controller/dwc/pcie-sti.c new file +15
-0+usleep_range (1000 ,2000 ); + +return ret; +} + +static int st_pcie_control_ltssm (struct dw_pcie *dw,bool enable) +{ +struct st_pcie *pcie =to_st_pcie (dw); + +return regmap_update_bits (pcie->regmap, pcie->syscfg1,PCIE_APP_LTSSM_ENABLE , +FIELD_PREP (PCIE_APP_LTSSM_ENABLE , enable)); +} + +static int st_pcie_host_init (struct pcie_port *pp) +{
drivers/pci/controller/dwc/pcie-sti.c line 215
Quoted 10 lines
drivers/pci/controller/dwc/pcie-sti.c new file +10
-0+struct dw_pcie *dw =to_dw_pcie_from_pp (pp); +struct st_pcie *pcie =to_st_pcie (dw); +int err; + + pcie->config_window_start = pp->cfg0_base; + +/* +* "Override" default ops provided by designware driver as STI +* PCIe uses its own translation unit rather than iATU +*/
No need for the scare quotes around "override". You are in fact overriding the ops.
drivers/pci/controller/dwc/pcie-sti.c line 228
Quoted 13 lines
drivers/pci/controller/dwc/pcie-sti.c new file +13
-0+ pp->bridge->child_ops = &st_child_pcie_ops; + +/* +* We have to initialise the PCIe cell on some hardware before we can +* talk to the phy +*/ + err =st_pcie_init (pp); +if (err) +return err; + + err =st_pcie_control_ltssm (dw, false); +if (err) { +dev_err (dw->dev,"disable ltssm failed, %d\n" , err);
s/ltssm/LTSSM/
Quoted 9 lines
drivers/pci/controller/dwc/pcie-sti.c new file +9
-0+return err; + } + +/* Init the associated miphy */ + err =phy_init (pcie->phy); +if (err <0 ) { +dev_err (dw->dev,"Cannot init PHY: %d\n" , err); +return err; + }
drivers/pci/controller/dwc/pcie-sti.c line 247
Quoted 10 lines
drivers/pci/controller/dwc/pcie-sti.c new file +10
-0+ +return 0 ; +} + +static int st_pcie_start_link (struct dw_pcie *dw) +{ +struct st_pcie *pcie =to_st_pcie (dw); +int err; + +/* Do all the register poking */
Pointless comment.
drivers/pci/controller/dwc/pcie-sti.c line 254
Quoted 7 lines
drivers/pci/controller/dwc/pcie-sti.c new file +7
-0+st_pcie_hw_setup (dw); + +if (pcie->reset_gpio) { +/* Assert the PERST# signal */ +gpiod_set_value (pcie->reset_gpio,1 ); + +/* PERST# signal must stay asserted for at least 100us (Tperst-clk) */
Thanks for this reference to a specific delay from the spec!
Quoted 58 lines
drivers/pci/controller/dwc/pcie-sti.c new file +58
-0+usleep_range (100 ,200 ); +/* Release PERST# signal */ +gpiod_set_value (pcie->reset_gpio,0 ); + } + +/* Re-enable the link, link training must begin shortly after reset */ + err =st_pcie_control_ltssm (dw, true); +if (err) { +dev_err (dw->dev,"enable ltssm failed, %d\n" , err); +return err; + } + + err =dw_pcie_wait_for_link (dw); +if (err) { +dev_err (dw->dev,"wait for link failed, %d\n" , err); +return err; + } + +/* +* PCIe specification states that you should not issue any config +* requests until 100ms after asserting reset, so we enforce that here +*/ +if (pcie->reset_gpio) +msleep (100 ); + +return 0 ; +} + +static struct dw_pcie_host_ops st_pcie_host_ops = { + .host_init = st_pcie_host_init, +}; + +static const struct dw_pcie_ops dw_pcie_ops = { + .start_link = st_pcie_start_link, +}; + +static int st_pcie_probe (struct platform_device *pdev) +{ +struct st_pcie *pcie; +struct dw_pcie *dw; +struct device_node *np = pdev->dev.of_node; +struct pcie_port *pp; +int ret; + + pcie =devm_kzalloc (&pdev->dev,sizeof (*pcie),GFP_KERNEL ); +if (!pcie) +return -ENOMEM ; + + dw =devm_kzalloc (&pdev->dev,sizeof (*dw),GFP_KERNEL ); +if (!dw) +return -ENOMEM ; + pcie->dw = dw; + dw->dev = &pdev->dev; + dw->ops = &dw_pcie_ops; + + pp = &dw->pp; + pp->ops = &st_pcie_host_ops; +
drivers/pci/controller/dwc/pcie-sti.c line 323
Quoted 10 lines
drivers/pci/controller/dwc/pcie-sti.c new file +10
-0+/* mem regions */ + pcie->lmi =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"mem-window" ); +if (!pcie->lmi) +return -ENXIO ; + +/* regmap registers for PCIe IP configuration */ + pcie->regmap =syscon_regmap_lookup_by_phandle (np,"st,syscfg" ); +if (IS_ERR (pcie->regmap)) +return dev_err_probe (&pdev->dev,PTR_ERR (pcie->regmap), +"No syscfg phandle specified\n" );
Make your error messages all capitalized or all uncapitalized. I think uncapitalized is more typical in drivers/pci/
Quoted 65 lines
drivers/pci/controller/dwc/pcie-sti.c new file +62
-0+ ret =of_property_read_u32_index (np,"st,syscfg" ,SYSCFG0_REG , &pcie->syscfg0); +if (ret) { +dev_err (&pdev->dev,"can't get syscfg0 offset (%d)\n" , ret); +return ret; + } + + ret =of_property_read_u32_index (np,"st,syscfg" ,SYSCFG1_REG , &pcie->syscfg1); +if (ret) { +dev_err (&pdev->dev,"can't get syscfg1 offset (%d)\n" , ret); +return ret; + } + +/* powerdown / resets */ + pcie->pwr =devm_reset_control_get_optional (&pdev->dev,"powerdown" ); +if (IS_ERR (pcie->pwr)) +return dev_err_probe (&pdev->dev,PTR_ERR (pcie->pwr), +"Error getting powerdown reset control\n" ); + + pcie->rst =devm_reset_control_get (&pdev->dev,"softreset" ); +if (IS_ERR (pcie->rst)) +return dev_err_probe (&pdev->dev,PTR_ERR (pcie->rst), +"Error getting softreset control\n" ); + +/* phy */ + pcie->phy =devm_phy_get (&pdev->dev,"pcie" ); +if (IS_ERR (pcie->phy)) +return dev_err_probe (&pdev->dev,PTR_ERR (pcie->phy),"no PHY configured\n" ); + +/* Claim the GPIO for PRST# if available, keep it de-asserted */ + pcie->reset_gpio =devm_gpiod_get_optional (&pdev->dev,"reset" ,GPIOD_OUT_LOW ); +if (IS_ERR (pcie->reset_gpio)) +return dev_err_probe (&pdev->dev,PTR_ERR (pcie->reset_gpio), +"Cannot request reset-gpios\n" ); + +platform_set_drvdata (pdev, pcie); + + ret =dw_pcie_host_init (pp); +if (ret) +return dev_err_probe (&pdev->dev, ret,"failed to initialize host\n" ); + +return 0 ; +} + +static const struct of_device_id st_pcie_of_match[] = { + { .compatible ="st,stih407-pcie" , }, + { }, +}; +MODULE_DEVICE_TABLE (of, st_pcie_of_match); + +static struct platform_driver st_pcie_driver__refdata = { + .probe = st_pcie_probe, + .driver = { + .name ="st-pcie" , + .of_match_table = st_pcie_of_match, + }, +}; +module_platform_driver (st_pcie_driver); + +MODULE_AUTHOR ("Fabrice Gasnier <[email protected]>" ); +MODULE_AUTHOR ("Alain Volmat <[email protected]>" ); +MODULE_DESCRIPTION ("STi PCIe Controller driver" ); +MODULE_LICENSE ("GPL v2" );Signature · 1 line
2.25.1
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH RESEND v2 3/5 MAINTAINERS: add entry for ST STI PCIE driver
In reply to Alain VolmatAdd PCIE Driver entry for STI family from ST Microelectronics.
--- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+)
MAINTAINERS +6 -0
@@ -14666,6 +14666,12 @@ L: [email protected] S: Maintained F: drivers/pci/controller/dwc/pci-exynos.c +PCI DRIVER FOR ST STI PLATFORM +M: Alain Volmat <[email protected]> +L: [email protected] +S: Maintained +F: drivers/pci/controller/dwc/pcie-sti.c + PCI DRIVER FOR SYNOPSYS DESIGNWARE M: Jingoo Han <[email protected]> M: Gustavo Pimentel <[email protected]>
Signature · 1 line
2.25.1
Re: [PATCH RESEND v2 3/5] MAINTAINERS: add entry for ST STI PCIE driver
Hi Alain
Quoted 14 lines · Alain Volmat
Add PCIE Driver entry for STI family from ST Microelectronics.
Signed-off-by Alain Volmat <[email protected]>--- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+)MAINTAINERS +0
-0@@ -14666,6 +14666,12 @@ L: [email protected] S: Maintained F: drivers/pci/controller/dwc/pci-exynos.c
MAINTAINERS L: [email protected] · line 14677
Quoted 10 lines
MAINTAINERS +6
-0+PCI DRIVER FOR ST STI PLATFORM +M: Alain Volmat <[email protected]> +L: [email protected] +S: Maintained +F: drivers/pci/controller/dwc/pcie-sti.c + PCI DRIVER FOR SYNOPSYS DESIGNWARE M: Jingoo Han <[email protected]> M: Gustavo Pimentel <[email protected]>
Thanks
Patrice
PATCH RESEND v2 4/5 ARM: dts: sti: add the PCIe controller node within stih407-family
In reply to Alain VolmatAdd the pcie1 entry within stih407-family dtsi.
--- arch/arm/boot/dts/stih407-family.dtsi | 40 +++++++++++++++++++++++++++ 1 file changed, 40 insertions(+)
arch/arm/boot/dts/stih407-family.dtsi +40 -0
@@ -631,6 +631,46 @@ spifsm: spifsm@9022000{ status = "disabled"; }; + pcie1: pcie@9b10000 { + compatible = "st,stih407-pcie"; + device_type = "pci"; + reg = <0x09b10000 0x00001000>, /* cntrl registers */ + <0x3fff0000 0x00010000>, /* config space */ + <0x40000000 0xc0000000>; /* lmi mem window */ + + reg-names = "dbi", + "config", + "mem-window"; + + st,syscfg = <&syscfg_core 0xdc 0xe4>; + + #interrupt-cells = <1>; + interrupts = <GIC_SPI 175 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "msi"; + interrupt-map-mask = <0 0 0 7>; + interrupt-map = <0 0 0 1 &intc GIC_SPI 171 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 2 &intc GIC_SPI 172 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 3 &intc GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 4 &intc GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>; + + #address-cells = <3>; + #size-cells = <2>; + /* non-prefetchable and prefetchable */ + ranges = <0x82000000 0 0x30000000 0x30000000 0 0x05550000>, + <0xc2000000 0 0x35550000 0x35550000 0 0x0AAA0000>; + bus-range = <0x00 0xff>; + + resets = <&softreset STIH407_PCIE1_SOFTRESET>, + <&powerdown STIH407_PCIE1_POWERDOWN>; + + reset-names = "softreset", "powerdown"; + + phys = <&phy_port1 PHY_TYPE_PCIE>; + phy-names = "pcie"; + + status = "disabled"; + }; + sata0: sata@9b20000 { compatible = "st,ahci"; reg = <0x9b20000 0x1000>;
Signature · 1 line
2.25.1
Re: [PATCH RESEND v2 4/5] ARM: dts: sti: add the PCIe controller node within stih407-family
Hi Alain
Quoted 48 lines · Alain Volmat
Add the pcie1 entry within stih407-family dtsi.
Signed-off-by Alain Volmat <[email protected]>--- arch/arm/boot/dts/stih407-family.dtsi | 40 +++++++++++++++++++++++++++ 1 file changed, 40 insertions(+)arch/arm/boot/dts/stih407-family.dtsi +33
-0@@ -631,6 +631,46 @@ spifsm: spifsm@9022000{ status = "disabled"; }; + pcie1: pcie@9b10000 { + compatible = "st,stih407-pcie"; + device_type = "pci"; + reg = <0x09b10000 0x00001000>, /* cntrl registers */ + <0x3fff0000 0x00010000>, /* config space */ + <0x40000000 0xc0000000>; /* lmi mem window */ + + reg-names = "dbi", + "config", + "mem-window"; + + st,syscfg = <&syscfg_core 0xdc 0xe4>; + + #interrupt-cells = <1>; + interrupts = <GIC_SPI 175 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "msi"; + interrupt-map-mask = <0 0 0 7>; + interrupt-map = <0 0 0 1 &intc GIC_SPI 171 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 2 &intc GIC_SPI 172 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 3 &intc GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>, + <0 0 0 4 &intc GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>; + + #address-cells = <3>; + #size-cells = <2>; + /* non-prefetchable and prefetchable */ + ranges = <0x82000000 0 0x30000000 0x30000000 0 0x05550000>, + <0xc2000000 0 0x35550000 0x35550000 0 0x0AAA0000>; + bus-range = <0x00 0xff>; + + resets = <&softreset STIH407_PCIE1_SOFTRESET>, + <&powerdown STIH407_PCIE1_POWERDOWN>; + + reset-names = "softreset", "powerdown";
arch/arm/boot/dts/stih407-family.dtsi spifsm: spifsm@9022000{ · line 676
Quoted 10 lines
arch/arm/boot/dts/stih407-family.dtsi +7
-0+ + phys = <&phy_port1 PHY_TYPE_PCIE>; + phy-names = "pcie"; + + status = "disabled"; + }; + sata0: sata@9b20000 { compatible = "st,ahci"; reg = <0x9b20000 0x1000>;
Thanks
Patrice
PATCH RESEND v2 5/5 ARM: dts: sti: enable PCIe on the stih418-b2264 board
In reply to Alain VolmatEnable the PCIe controller with proper reset gpio pin for this board.
--- arch/arm/boot/dts/stih418-b2264.dts | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm/boot/dts/stih418-b2264.dts +5 -0
@@ -130,6 +130,11 @@ &ohci1 { status = "okay"; }; +&pcie1 { + reset-gpios = <&pio34 5 GPIO_ACTIVE_LOW>; + status = "okay"; +}; + &pwm1 { status = "okay"; };
Signature · 1 line
2.25.1
Re: [PATCH RESEND v2 5/5] ARM: dts: sti: enable PCIe on the stih418-b2264 board
Hi Alain
Quoted 13 lines · Alain Volmat
Enable the PCIe controller with proper reset gpio pin for this board.
Signed-off-by Alain Volmat <[email protected]>--- arch/arm/boot/dts/stih418-b2264.dts | 5 +++++ 1 file changed, 5 insertions(+)arch/arm/boot/dts/stih418-b2264.dts +0
-0@@ -130,6 +130,11 @@ &ohci1 { status = "okay";
arch/arm/boot/dts/stih418-b2264.dts &ohci1 { · line 140
Quoted 10 lines
arch/arm/boot/dts/stih418-b2264.dts +5
-0}; +&pcie1 { + reset-gpios = <&pio34 5 GPIO_ACTIVE_LOW>; + status = "okay"; +}; + &pwm1 { status = "okay"; };
Thanks
Patrice