PCI: mediatek: add support AN7583 + YAML rework
Subsystems (6)
v2 cover PCI: mediatek: add support AN7583 + YAML rework
This little series convert the PCIe GEN2 Documentation to YAML schema and adds support for Airoha AN7583 GEN2 PCIe Controller.
Changes v2:
- Add cover letter
- Describe skip_pcie_rstb variable
- Fix hifsys schema (missing syscon)
- Address comments on the YAML schema for PCIe GEN2
- Keep alphabetical order for AN7583
Christian Marangi (4):
dt-bindings: clock: mediatek: Fix wrong compatible list for hifsys
YAML
dt-bindings: PCI: mediatek: Convert to YAML schema
dt-bindings: PCI: mediatek: Add support for Airoha AN7583
PCI: mediatek: add support for Airoha AN7583 SoC
.../clock/mediatek,mt2701-hifsys.yaml | 8 +- .../bindings/pci/mediatek-pcie-mt7623.yaml | 173 ++++++ .../devicetree/bindings/pci/mediatek-pcie.txt | 289 ---------- .../bindings/pci/mediatek-pcie.yaml | 514 ++++++++++++++++++ drivers/pci/controller/pcie-mediatek.c | 85 ++- 5 files changed, 755 insertions(+), 314 deletions(-) create mode 100644 Documentation/devicetree/bindings/pci/mediatek-pcie-mt7623.yaml delete mode 100644 Documentation/devicetree/bindings/pci/mediatek-pcie.txt create mode 100644 Documentation/devicetree/bindings/pci/mediatek-pcie.yaml
Signature · 1 line
2.51.0
PATCH v2 1/4 dt-bindings: clock: mediatek: Fix wrong compatible list for hifsys YAML
While converting the hifsys to YAML schema, the "syscon" compatible was dropped for the mt7623 and the mt2701 compatible.
Add back the compatible to mute DTBs warning on "make dtbs_check" and reflect real state of the .dtsi.
--- .../devicetree/bindings/clock/mediatek,mt2701-hifsys.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/clock/mediatek,mt2701-hifsys.yaml +5 -3
@@ -16,13 +16,15 @@ maintainers: properties: compatible: oneOf: - - enum: - - mediatek,mt2701-hifsys - - mediatek,mt7622-hifsys + - items: + - const: mediatek,mt2701-hifsys + - const: syscon + - const: mediatek,mt7622-hifsys - items: - enum: - mediatek,mt7623-hifsys - const: mediatek,mt2701-hifsys + - const: syscon reg: maxItems: 1
Signature · 1 line
2.51.0
Rob Herring (Arm)
maintainerRe: [PATCH v2 1/4] dt-bindings: clock: mediatek: Fix wrong compatible list for hifsys YAML
Quoted 11 lines · Christian Marangi
While converting the hifsys to YAML schema, the "syscon" compatible was dropped for the mt7623 and the mt2701 compatible.
Add back the compatible to mute DTBs warning on "make
dtbs_check" and reflect real state of the .dtsi.Signed-off-by Christian Marangi <[email protected]>--- .../devicetree/bindings/clock/mediatek,mt2701-hifsys.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
My bot found errors running 'make dt_binding_check' on your patch:
yamllint warnings/errors:
dtschema/dtc warnings/errors:
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/clock/mediatek,mt2701-hifsys.example.dtb: clock-controller@1a000000 (mediatek,mt2701-hifsys): compatible: 'oneOf' conditional failed, one must be fixed:
['mediatek,mt2701-hifsys'] is too short 'mediatek,mt7622-hifsys' was expected 'mediatek,mt2701-hifsys' is not one of ['mediatek,mt7623-hifsys'] from schema $id: http://devicetree.org/schemas/clock/mediatek,mt2701-hifsys.yaml#
doc reference errors (make refcheckdocs):
See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/[email protected]
The base for the series is generally the latest rc1. A different dependency should be noted in *this* patch.
If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date:
pip3 install dtschema --upgrade
Please check and re-submit after running the above command yourself. Note that DT_SCHEMA_FILES can be set to your schema file to speed up checking your schema. However, it must be unset to test all examples with your schema.
Rob Herring
maintainerRe: [PATCH v2 1/4] dt-bindings: clock: mediatek: Fix wrong compatible list for hifsys YAML
In reply to Christian MarangiQuoted 2 lines · Christian Marangi
While converting the hifsys to YAML schema, the "syscon" compatible was dropped for the mt7623 and the mt2701 compatible.
Is "syscon" really needed? AFAICT, the clock and reset drivers don't need it.
Quoted 35 lines
Add back the compatible to mute DTBs warning on "make
dtbs_check" and reflect real state of the .dtsi.Signed-off-by Christian Marangi <[email protected]>--- .../devicetree/bindings/clock/mediatek,mt2701-hifsys.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)Documentation/devicetree/bindings/clock/mediatek,mt2701-hifsys.yaml +5
-3@@ -16,13 +16,15 @@ maintainers: properties: compatible: oneOf: - - enum: - - mediatek,mt2701-hifsys - - mediatek,mt7622-hifsys + - items: + - const: mediatek,mt2701-hifsys + - const: syscon + - const: mediatek,mt7622-hifsys - items: - enum: - mediatek,mt7623-hifsys - const: mediatek,mt2701-hifsys + - const: syscon reg: maxItems: 1Signature · 1 line
2.51.0
Re: [PATCH v2 1/4] dt-bindings: clock: mediatek: Fix wrong compatible list for hifsys YAML
Quoted 7 lines · Rob Herring
Quoted 2 lines · Christian Marangi
While converting the hifsys to YAML schema, the "syscon" compatible was dropped for the mt7623 and the mt2701 compatible.
Is "syscon" really needed? AFAICT, the clock and reset drivers don't need it.
Ok I also searched downstream and can't find any patch that would make use of syscon. Guess I will replace this patch with a patch that drop the syscon from the dts.
Quoted 35 lines
Quoted 35 lines
Add back the compatible to mute DTBs warning on "make
dtbs_check" and reflect real state of the .dtsi.Signed-off-by Christian Marangi <[email protected]>--- .../devicetree/bindings/clock/mediatek,mt2701-hifsys.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)Documentation/devicetree/bindings/clock/mediatek,mt2701-hifsys.yaml +5
-3@@ -16,13 +16,15 @@ maintainers: properties: compatible: oneOf: - - enum: - - mediatek,mt2701-hifsys - - mediatek,mt7622-hifsys + - items: + - const: mediatek,mt2701-hifsys + - const: syscon + - const: mediatek,mt7622-hifsys - items: - enum: - mediatek,mt7623-hifsys - const: mediatek,mt2701-hifsys + - const: syscon reg: maxItems: 1Signature · 1 line
2.51.0
Signature · 1 line
Ansuel
PATCH v2 2/4 dt-bindings: PCI: mediatek: Convert to YAML schema
In reply to Christian MarangiConvert the PCI mediatek Documentation to YAML schema to enable validation of the supported GEN1/2 Mediatek PCIe controller.
While converting, lots of cleanup were done from the .txt with better specifying what is supported by the various PCIe controller variant and drop of redundant info that are part of the standard PCIe Host Bridge schema.
To reduce schema complexity the .txt is split in 2 YAML, one for mt7623/mt2701 and the other for every other compatible.
--- .../bindings/pci/mediatek-pcie-mt7623.yaml | 173 ++++++++ .../devicetree/bindings/pci/mediatek-pcie.txt | 289 ------------- .../bindings/pci/mediatek-pcie.yaml | 404 ++++++++++++++++++ 3 files changed, 577 insertions(+), 289 deletions(-) create mode 100644 Documentation/devicetree/bindings/pci/mediatek-pcie-mt7623.yaml delete mode 100644 Documentation/devicetree/bindings/pci/mediatek-pcie.txt create mode 100644 Documentation/devicetree/bindings/pci/mediatek-pcie.yaml
Documentation/devicetree/bindings/pci/mediatek-pcie-mt7623.yaml new file +173 -0
@@ -0,0 +1,173 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/pci/mediatek-pcie-mt7623.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: PCIe controller on MediaTek SoCs + +maintainers: + - Christian Marangi <[email protected]> + +properties: + compatible: + enum: + - mediatek,mt2701-pcie + - mediatek,mt7623-pcie + + reg: + minItems: 4 + maxItems: 4 + + reg-names: + items: + - const: subsys + - const: port0 + - const: port1 + - const: port2 + + clocks: + minItems: 4 + maxItems: 4 + + clock-names: + items: + - const: free_ck + - const: sys_ck0 + - const: sys_ck1 + - const: sys_ck2 + + resets: + minItems: 3 + maxItems: 3 + + reset-names: + items: + - const: pcie-rst0 + - const: pcie-rst1 + - const: pcie-rst2 + + phys: + minItems: 3 + maxItems: 3 + + phy-names: + items: + - const: pcie-phy0 + - const: pcie-phy1 + - const: pcie-phy2 + + power-domains: + maxItems: 1 + +required: + - compatible + - reg + - reg-names + - ranges + - clocks + - clock-names + - '#interrupt-cells' + - resets + - reset-names + - phys + - phy-names + - power-domains + - pcie@0,0 + - pcie@1,0 + - pcie@2,0 + +allOf: + - $ref: /schemas/pci/pci-host-bridge.yaml# + +unevaluatedProperties: false + +examples: + # MT7623 + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/interrupt-controller/irq.h> + #include <dt-bindings/clock/mt2701-clk.h> + #include <dt-bindings/reset/mt2701-resets.h> + #include <dt-bindings/phy/phy.h> + #include <dt-bindings/power/mt2701-power.h> + + soc { + #address-cells = <2>; + #size-cells = <2>; + + hifsys: syscon@1a000000 { + compatible = "mediatek,mt7623-hifsys", + "mediatek,mt2701-hifsys", + "syscon"; + reg = <0 0x1a000000 0 0x1000>; + #clock-cells = <1>; + #reset-cells = <1>; + }; + + pcie@1a140000 { + compatible = "mediatek,mt7623-pcie"; + device_type = "pci"; + reg = <0 0x1a140000 0 0x1000>, /* PCIe shared registers */ + <0 0x1a142000 0 0x1000>, /* Port0 registers */ + <0 0x1a143000 0 0x1000>, /* Port1 registers */ + <0 0x1a144000 0 0x1000>; /* Port2 registers */ + reg-names = "subsys", "port0", "port1", "port2"; + #address-cells = <3>; + #size-cells = <2>; + #interrupt-cells = <1>; + interrupt-map-mask = <0xf800 0 0 0>; + interrupt-map = <0x0000 0 0 0 &sysirq GIC_SPI 193 IRQ_TYPE_LEVEL_LOW>, + <0x0800 0 0 0 &sysirq GIC_SPI 194 IRQ_TYPE_LEVEL_LOW>, + <0x1000 0 0 0 &sysirq GIC_SPI 195 IRQ_TYPE_LEVEL_LOW>; + clocks = <&topckgen CLK_TOP_ETHIF_SEL>, + <&hifsys CLK_HIFSYS_PCIE0>, + <&hifsys CLK_HIFSYS_PCIE1>, + <&hifsys CLK_HIFSYS_PCIE2>; + clock-names = "free_ck", "sys_ck0", "sys_ck1", "sys_ck2"; + resets = <&hifsys MT2701_HIFSYS_PCIE0_RST>, + <&hifsys MT2701_HIFSYS_PCIE1_RST>, + <&hifsys MT2701_HIFSYS_PCIE2_RST>; + reset-names = "pcie-rst0", "pcie-rst1", "pcie-rst2"; + phys = <&pcie0_phy PHY_TYPE_PCIE>, <&pcie1_phy PHY_TYPE_PCIE>, + <&pcie2_phy PHY_TYPE_PCIE>; + phy-names = "pcie-phy0", "pcie-phy1", "pcie-phy2"; + power-domains = <&scpsys MT2701_POWER_DOMAIN_HIF>; + bus-range = <0x00 0xff>; + ranges = <0x81000000 0 0x1a160000 0 0x1a160000 0 0x00010000 /* I/O space */ + 0x83000000 0 0x60000000 0 0x60000000 0 0x10000000>; /* memory space */ + + pcie@0,0 { + device_type = "pci"; + reg = <0x0000 0 0 0 0>; + #address-cells = <3>; + #size-cells = <2>; + #interrupt-cells = <1>; + interrupt-map-mask = <0 0 0 0>; + interrupt-map = <0 0 0 0 &sysirq GIC_SPI 193 IRQ_TYPE_LEVEL_LOW>; + ranges; + }; + + pcie@1,0 { + device_type = "pci"; + reg = <0x0800 0 0 0 0>; + #address-cells = <3>; + #size-cells = <2>; + #interrupt-cells = <1>; + interrupt-map-mask = <0 0 0 0>; + interrupt-map = <0 0 0 0 &sysirq GIC_SPI 194 IRQ_TYPE_LEVEL_LOW>; + ranges; + }; + + pcie@2,0 { + device_type = "pci"; + reg = <0x1000 0 0 0 0>; + #address-cells = <3>; + #size-cells = <2>; + #interrupt-cells = <1>; + interrupt-map-mask = <0 0 0 0>; + interrupt-map = <0 0 0 0 &sysirq GIC_SPI 195 IRQ_TYPE_LEVEL_LOW>; + ranges; + }; + }; + };
Documentation/devicetree/bindings/pci/mediatek-pcie.txt deleted +0 -289
289 lines not on this page · raw message
Documentation/devicetree/bindings/pci/mediatek-pcie.yaml new file +404 -0
404 lines not on this page · raw message
Signature · 1 line
2.51.0
PATCH v2 3/4 dt-bindings: PCI: mediatek: Add support for Airoha AN7583
In reply to Christian MarangiIntroduce Airoha AN7583 SoC compatible in mediatek PCIe controller binding.
Similar to GEN3, the Airoha AN7583 GEN2 PCIe controller require the PBUS csr property to permit the correct functionality of the PCIe controller.
--- .../bindings/pci/mediatek-pcie.yaml | 110 ++++++++++++++++++ 1 file changed, 110 insertions(+)
Documentation/devicetree/bindings/pci/mediatek-pcie.yaml +110 -0
@@ -13,6 +13,7 @@ properties: compatible: oneOf: - enum: + - airoha,an7583-pcie - mediatek,mt2712-pcie - mediatek,mt7622-pcie - mediatek,mt7629-pcie
@@ -61,6 +62,17 @@ properties: power-domains: maxItems: 1 + mediatek,pbus-csr: + $ref: /schemas/types.yaml#/definitions/phandle-array + items: + - items: + - description: phandle to pbus-csr syscon + - description: offset of pbus-csr base address register + - description: offset of pbus-csr base address mask register + description: + Phandle with two arguments to the syscon node used to detect if + a given address is accessible on PCIe controller. + '#interrupt-cells': const: 1
@@ -96,6 +108,45 @@ required: allOf: - $ref: /schemas/pci/pci-host-bridge.yaml# + - if: + properties: + compatible: + const: airoha,an7583-pcie + then: + properties: + reg: + maxItems: 1 + + reg-names: + const: port1 + + clocks: + maxItems: 1 + + clock-names: + const: sys_ck1 + + reset: + maxItems: 1 + + reset-names: + const: pcie-rst1 + + phys: + maxItems: 1 + + phy-names: + const: pcie-phy1 + + power-domain: false + + required: + - resets + - reset-names + - phys + - phy-names + - mediatek,pbus-csr + - if: properties: compatible:
@@ -131,6 +182,8 @@ allOf: power-domains: false + mediatek,pbus-csr: false + required: - phys - phy-names
@@ -169,6 +222,8 @@ allOf: phy-names: false + mediatek,pbus-csr: false + required: - power-domains
@@ -209,6 +264,8 @@ allOf: items: - enum: [ pcie-phy0, pcie-phy1 ] + mediatek,pbus-csr: false + required: - power-domains
@@ -243,6 +300,8 @@ allOf: power-domain: false + mediatek,pbus-csr: false + unevaluatedProperties: false examples:
@@ -402,3 +461,54 @@ examples: }; }; }; + + # AN7583 + - | + #include <dt-bindings/interrupt-controller/irq.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/clock/en7523-clk.h> + + soc_3 { + #address-cells = <2>; + #size-cells = <2>; + + pcie@1fa92000 { + compatible = "airoha,an7583-pcie"; + device_type = "pci"; + linux,pci-domain = <1>; + #address-cells = <3>; + #size-cells = <2>; + + reg = <0x0 0x1fa92000 0x0 0x1670>; + reg-names = "port1"; + + clocks = <&scuclk EN7523_CLK_PCIE>; + clock-names = "sys_ck1"; + + phys = <&pciephy>; + phy-names = "pcie-phy1"; + + ranges = <0x02000000 0 0x24000000 0x0 0x24000000 0 0x4000000>; + + resets = <&scuclk>; /* AN7583_PCIE1_RST */ + reset-names = "pcie-rst1"; + + mediatek,pbus-csr = <&pbus_csr 0x8 0xc>; + + interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "pcie_irq"; + bus-range = <0x00 0xff>; + #interrupt-cells = <1>; + interrupt-map-mask = <0 0 0 7>; + interrupt-map = <0 0 0 1 &pcie_intc1 0>, + <0 0 0 2 &pcie_intc1 1>, + <0 0 0 3 &pcie_intc1 2>, + <0 0 0 4 &pcie_intc1 3>; + + pcie_intc1_4: interrupt-controller { + interrupt-controller; + #address-cells = <0>; + #interrupt-cells = <1>; + }; + }; + };
Signature · 1 line
2.51.0
PATCH v2 4/4 PCI: mediatek: add support for Airoha AN7583 SoC
In reply to Christian MarangiAdd support for the second PCIe line present on Airoha AN7583 SoC.
This is based on the Mediatek Gen1/2 PCIe driver and similar to Gen3 also require workaround for the reset signals.
Introduce a new bool to skip having to reset signals and also introduce some additional logic to configure the PBUS registers required for Airoha SoC.
--- drivers/pci/controller/pcie-mediatek.c | 85 +++++++++++++++++++------- 1 file changed, 63 insertions(+), 22 deletions(-)
drivers/pci/controller/pcie-mediatek.c +63 -22
@@ -147,6 +147,7 @@ struct mtk_pcie_port;* @need_fix_class_id: whether this host's class ID needed to be fixed or not * @need_fix_device_id: whether this host's device ID needed to be fixed or not * @no_msi: Bridge has no MSI support, and relies on an external block +* @skip_pcie_rstb: Skip calling RSTB bits on PCIe probe * @device_id: device ID which this host need to be fixed * @ops: pointer to configuration access functions * @startup: pointer to controller setting functions
@@ -156,6 +157,7 @@ struct mtk_pcie_soc {bool need_fix_class_id;bool need_fix_device_id;bool no_msi; +bool skip_pcie_rstb;unsigned int device_id;struct pci_ops *ops;int (*startup)(struct mtk_pcie_port *port);
@@ -679,28 +681,30 @@ static int mtk_pcie_startup_port_v2(struct mtk_pcie_port *port)regmap_update_bits (pcie->cfg,PCIE_SYS_CFG_V2 , val, val); } -/* Assert all reset signals */ -writel (0 , port->base +PCIE_RST_CTRL ); - -/* -* Enable PCIe link down reset, if link status changed from link up to -* link down, this will reset MAC control registers and configuration -* space. -*/ -writel (PCIE_LINKDOWN_RST_EN , port->base +PCIE_RST_CTRL ); - -/* -* Described in PCIe CEM specification sections 2.2 (PERST# Signal) and -* 2.2.1 (Initial Power-Up (G3 to S0)). The deassertion of PERST# should -* be delayed 100ms (TPVPERL) for the power and clock to become stable. -*/ -msleep (100 ); - -/* De-assert PHY, PE, PIPE, MAC and configuration reset */ - val =readl (port->base +PCIE_RST_CTRL ); - val |=PCIE_PHY_RSTB |PCIE_PERSTB |PCIE_PIPE_SRSTB | -PCIE_MAC_SRSTB |PCIE_CRSTB ; -writel (val, port->base +PCIE_RST_CTRL ); +if (!soc->skip_pcie_rstb) { +/* Assert all reset signals */ +writel (0 , port->base +PCIE_RST_CTRL ); + +/* +* Enable PCIe link down reset, if link status changed from link up to +* link down, this will reset MAC control registers and configuration +* space. +*/ +writel (PCIE_LINKDOWN_RST_EN , port->base +PCIE_RST_CTRL ); + +/* +* Described in PCIe CEM specification sections 2.2 (PERST# Signal) and +* 2.2.1 (Initial Power-Up (G3 to S0)). The deassertion of PERST# should +* be delayed 100ms (TPVPERL) for the power and clock to become stable. +*/ +msleep (100 ); + +/* De-assert PHY, PE, PIPE, MAC and configuration reset */ + val =readl (port->base +PCIE_RST_CTRL ); + val |=PCIE_PHY_RSTB |PCIE_PERSTB |PCIE_PIPE_SRSTB | +PCIE_MAC_SRSTB |PCIE_CRSTB ; +writel (val, port->base +PCIE_RST_CTRL ); + }/* Set up vendor ID and class code */ if (soc->need_fix_class_id) {
@@ -1105,6 +1109,33 @@ static int mtk_pcie_probe(struct platform_device *pdev)if (err) goto put_resources; +if (device_is_compatible (dev,"airoha,an7583-pcie" )) { +struct resource_entry *entry; +struct regmap *pbus_regmap; +resource_size_t addr; +u32 args[2 ], size; + +/* +* Configure PBus base address and base address mask to allow the +* hw to detect if a given address is accessible on PCIe controller. +*/ + pbus_regmap =syscon_regmap_lookup_by_phandle_args (dev->of_node, +"mediatek,pbus-csr" , +ARRAY_SIZE (args), + args); +if (IS_ERR (pbus_regmap)) +return PTR_ERR (pbus_regmap); + + entry =resource_list_first_type (&host->windows,IORESOURCE_MEM ); +if (!entry) +return -ENODEV ; + + addr = entry->res->start - entry->offset; +regmap_write (pbus_regmap, args[0 ],lower_32_bits (addr)); + size =lower_32_bits (resource_size (entry->res)); +regmap_write (pbus_regmap, args[1 ],GENMASK (31 ,__fls (size))); + } +return 0 ; put_resources:
@@ -1205,6 +1236,15 @@ static const struct mtk_pcie_soc mtk_pcie_soc_mt7622 = { .setup_irq = mtk_pcie_setup_irq, }; +static const struct mtk_pcie_soc mtk_pcie_soc_an7583 = { + .skip_pcie_rstb = true, + .need_fix_class_id = true, + .need_fix_device_id = false, + .ops = &mtk_pcie_ops_v2, + .startup = mtk_pcie_startup_port_v2, + .setup_irq = mtk_pcie_setup_irq, +}; +static const struct mtk_pcie_soc mtk_pcie_soc_mt7629 = { .need_fix_class_id = true, .need_fix_device_id = true,
@@ -1215,6 +1255,7 @@ static const struct mtk_pcie_soc mtk_pcie_soc_mt7629 = { };static const struct of_device_id mtk_pcie_ids[] = { + { .compatible ="airoha,an7583-pcie" , .data = &mtk_pcie_soc_an7583 }, { .compatible ="mediatek,mt2701-pcie" , .data = &mtk_pcie_soc_v1 }, { .compatible ="mediatek,mt7623-pcie" , .data = &mtk_pcie_soc_v1 }, { .compatible ="mediatek,mt2712-pcie" , .data = &mtk_pcie_soc_mt2712 },
Signature · 1 line
2.51.0