PCI: mediatek: add support AN7583 + YAML rework
Subsystems (5)
v4 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 v4:
- Additional fix/improvement for YAML conversion
- Add review tag
- Fix wording on hifsys patch
- Rework PCI driver to flags and improve PBus logic Changes v3:
- Rework patch 1 to drop syscon compatible 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 (5):
ARM: dts: mediatek: drop wrong syscon hifsys compatible for
MT2701/7623
dt-bindings: PCI: mediatek: Convert to YAML schema
dt-bindings: PCI: mediatek: Add support for Airoha AN7583
PCI: mediatek: convert bool to single flags entry and bitmap
PCI: mediatek: add support for Airoha AN7583 SoC
.../bindings/pci/mediatek-pcie-mt7623.yaml | 164 +++++++ .../devicetree/bindings/pci/mediatek-pcie.txt | 289 ------------ .../bindings/pci/mediatek-pcie.yaml | 428 ++++++++++++++++++ arch/arm/boot/dts/mediatek/mt2701.dtsi | 2 +- arch/arm/boot/dts/mediatek/mt7623.dtsi | 3 +- drivers/pci/controller/pcie-mediatek.c | 120 +++-- 6 files changed, 680 insertions(+), 326 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 v4 1/5 ARM: dts: mediatek: drop wrong syscon hifsys compatible for MT2701/7623
The syscon compatible for the hifsys node for Mediatek MT2701/MT7623 SoC was wrongly added following the pattern of other clock node but it's actually not needed as the register are not used by other device on the SoC.
On top of this it's against the schema for hifsys YAML and causes a dtbs_check warning.
Drop the "syscon" compatible to mute the warning and reflect the compatible property described in the mediatek,mt2701-hifsys.yaml schema.
--- arch/arm/boot/dts/mediatek/mt2701.dtsi | 2 +- arch/arm/boot/dts/mediatek/mt7623.dtsi | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-)
arch/arm/boot/dts/mediatek/mt2701.dtsi +1 -1
@@ -597,7 +597,7 @@ larb1: larb@16010000 { }; hifsys: syscon@1a000000 { - compatible = "mediatek,mt2701-hifsys", "syscon"; + compatible = "mediatek,mt2701-hifsys"; reg = <0 0x1a000000 0 0x1000>; #clock-cells = <1>; #reset-cells = <1>;
arch/arm/boot/dts/mediatek/mt7623.dtsi +1 -2
@@ -744,8 +744,7 @@ vdecsys: syscon@16000000 { hifsys: syscon@1a000000 { compatible = "mediatek,mt7623-hifsys", - "mediatek,mt2701-hifsys", - "syscon"; + "mediatek,mt2701-hifsys"; reg = <0 0x1a000000 0 0x1000>; #clock-cells = <1>; #reset-cells = <1>;
Signature · 1 line
2.51.0
PATCH v4 2/5 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 | 164 +++++++++ .../devicetree/bindings/pci/mediatek-pcie.txt | 289 ---------------- .../bindings/pci/mediatek-pcie.yaml | 318 ++++++++++++++++++ 3 files changed, 482 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 +164 -0
@@ -0,0 +1,164 @@ +# 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>; + + 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 +318 -0
318 lines not on this page · raw message
Signature · 1 line
2.51.0
PATCH v4 3/5 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
@@ -55,6 +56,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
@@ -90,6 +102,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:
@@ -106,6 +157,8 @@ allOf: power-domains: false + mediatek,pbus-csr: false + required: - phys - phy-names
@@ -123,6 +176,8 @@ allOf: phy-names: false + mediatek,pbus-csr: false + required: - power-domains
@@ -135,6 +190,8 @@ allOf: clocks: minItems: 6 + mediatek,pbus-csr: false + required: - power-domains
@@ -157,6 +214,8 @@ allOf: power-domain: false + mediatek,pbus-csr: false + unevaluatedProperties: false examples:
@@ -316,3 +375,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
Rob Herring (Arm)
maintainerRe: [PATCH v4 3/5] dt-bindings: PCI: mediatek: Add support for Airoha AN7583
Quoted 12 lines · Christian Marangi
Introduce 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.
Signed-off-by Christian Marangi <[email protected]>--- .../bindings/pci/mediatek-pcie.yaml | 110 ++++++++++++++++++ 1 file changed, 110 insertions(+)
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/pci/mediatek-pcie.example.dtb: pcie@1fa92000 (airoha,an7583-pcie): Unevaluated properties are not allowed ('resets' was unexpected)
from schema $id: http://devicetree.org/schemas/pci/mediatek-pcie.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 v4 3/5] dt-bindings: PCI: mediatek: Add support for Airoha AN7583
In reply to Christian MarangiQuoted 6 lines · Christian Marangi
Introduce 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.
I guess I didn't get my point across before. Test your crap before sending or I'm going to stop reviewing your stuff.
Quoted 38 lines
Signed-off-by Christian Marangi <[email protected]>--- .../bindings/pci/mediatek-pcie.yaml | 110 ++++++++++++++++++ 1 file changed, 110 insertions(+)Documentation/devicetree/bindings/pci/mediatek-pcie.yaml +12
-0@@ -13,6 +13,7 @@ properties: compatible: oneOf: - enum: + - airoha,an7583-pcie - mediatek,mt2712-pcie - mediatek,mt7622-pcie - mediatek,mt7629-pcie@@ -55,6 +56,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@@ -90,6 +102,45 @@ required: allOf:
Documentation/devicetree/bindings/pci/mediatek-pcie.yaml required: · line 112
Quoted 10 lines
Documentation/devicetree/bindings/pci/mediatek-pcie.yaml +8
-0- $ref: /schemas/pci/pci-host-bridge.yaml# + - if: + properties: + compatible: + const: airoha,an7583-pcie + then: + properties: + reg: + maxItems: 1
That's already the maximum. Drop.
Documentation/devicetree/bindings/pci/mediatek-pcie.yaml required: · line 124
Quoted 12 lines
Documentation/devicetree/bindings/pci/mediatek-pcie.yaml +12
-0+ + reg-names: + const: port1 + + clocks: + maxItems: 1 + + clock-names: + const: sys_ck1 + + reset: + maxItems: 1
That's already the maximum. Drop.
Documentation/devicetree/bindings/pci/mediatek-pcie.yaml required: · line 130
Quoted 6 lines
Documentation/devicetree/bindings/pci/mediatek-pcie.yaml +6
-0+ + reset-names: + const: pcie-rst1 + + phys: + maxItems: 1
That's already the maximum. Drop.
Quoted 110 lines
Documentation/devicetree/bindings/pci/mediatek-pcie.yaml +72
-0+ + phy-names: + const: pcie-phy1 + + power-domain: false + + required: + - resets + - reset-names + - phys + - phy-names + - mediatek,pbus-csr + - if: properties: compatible:@@ -106,6 +157,8 @@ allOf: power-domains: false + mediatek,pbus-csr: false + required: - phys - phy-names@@ -123,6 +176,8 @@ allOf: phy-names: false + mediatek,pbus-csr: false + required: - power-domains@@ -135,6 +190,8 @@ allOf: clocks: minItems: 6 + mediatek,pbus-csr: false + required: - power-domains@@ -157,6 +214,8 @@ allOf: power-domain: false + mediatek,pbus-csr: false + unevaluatedProperties: false examples:@@ -316,3 +375,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 v4 4/5 PCI: mediatek: convert bool to single flags entry and bitmap
In reply to Christian MarangiTo clean Mediatek SoC PCIe struct, convert all the bool to a bitmap and use a single flags to reference all the values. This permits cleaner addition of new flag without having to define a new bool in the struct.
--- drivers/pci/controller/pcie-mediatek.c | 28 +++++++++++++++----------- 1 file changed, 16 insertions(+), 12 deletions(-)
drivers/pci/controller/pcie-mediatek.c +16 -12
@@ -142,24 +142,29 @@struct mtk_pcie_port ; +enum mtk_pcie_flags { +NEED_FIX_CLASS_ID =BIT (0 ),/* host's class ID needed to be fixed */ +NEED_FIX_DEVICE_ID =BIT (1 ),/* host's device ID needed to be fixed */ +NO_MSI =BIT (2 ),/* Bridge has no MSI support, and relies on an +* external block +*/ +}; +/** * struct mtk_pcie_soc - differentiate between host generations -* @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 * @device_id: device ID which this host need to be fixed * @ops: pointer to configuration access functions * @startup: pointer to controller setting functions * @setup_irq: pointer to initialize IRQ functions +* @flags: pcie device flags. */ struct mtk_pcie_soc { -bool need_fix_class_id; -bool need_fix_device_id; -bool no_msi;unsigned int device_id;struct pci_ops *ops;int (*startup)(struct mtk_pcie_port *port);int (*setup_irq)(struct mtk_pcie_port *port,struct device_node *node); +u32 flags; };/**
@@ -703,7 +708,7 @@ static int mtk_pcie_startup_port_v2(struct mtk_pcie_port *port)writel (val, port->base +PCIE_RST_CTRL );/* Set up vendor ID and class code */ -if (soc->need_fix_class_id) { +if (soc->flags &NEED_FIX_CLASS_ID ) { val =PCI_VENDOR_ID_MEDIATEK ;writew (val, port->base +PCIE_CONF_VEND_ID );
@@ -711,7 +716,7 @@ static int mtk_pcie_startup_port_v2(struct mtk_pcie_port *port)writew (val, port->base +PCIE_CONF_CLASS_ID ); } -if (soc->need_fix_device_id) +if (soc->flags &NEED_FIX_DEVICE_ID )writew (soc->device_id, port->base +PCIE_CONF_DEVICE_ID );/* 100ms timeout value should be enough for Gen1/2 training */
@@ -1099,7 +1104,7 @@ static int mtk_pcie_probe(struct platform_device *pdev) host->ops = pcie->soc->ops; host->sysdata = pcie; - host->msi_domain = pcie->soc->no_msi; + host->msi_domain = !!(pcie->soc->flags &NO_MSI ); err =pci_host_probe (host);if (err)
@@ -1187,9 +1192,9 @@ static const struct dev_pm_ops mtk_pcie_pm_ops = { };static const struct mtk_pcie_soc mtk_pcie_soc_v1 = { - .no_msi = true, .ops = &mtk_pcie_ops, .startup = mtk_pcie_startup_port, + .flags =NO_MSI , };static const struct mtk_pcie_soc mtk_pcie_soc_mt2712 = {
@@ -1199,19 +1204,18 @@ static const struct mtk_pcie_soc mtk_pcie_soc_mt2712 = { };static const struct mtk_pcie_soc mtk_pcie_soc_mt7622 = { - .need_fix_class_id = true, .ops = &mtk_pcie_ops_v2, .startup = mtk_pcie_startup_port_v2, .setup_irq = mtk_pcie_setup_irq, + .flags =NEED_FIX_CLASS_ID , };static const struct mtk_pcie_soc mtk_pcie_soc_mt7629 = { - .need_fix_class_id = true, - .need_fix_device_id = true, .device_id =PCI_DEVICE_ID_MEDIATEK_7629 , .ops = &mtk_pcie_ops_v2, .startup = mtk_pcie_startup_port_v2, .setup_irq = mtk_pcie_setup_irq, + .flags =NEED_FIX_CLASS_ID |NEED_FIX_DEVICE_ID , };static const struct of_device_id mtk_pcie_ids[] = {
Signature · 1 line
2.51.0
PATCH v4 5/5 PCI: mediatek: add support for Airoha AN7583 SoC
In reply to Christian MarangiAdd support for the second PCIe Root Complex 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 flag to skip having to reset signals and also introduce some additional logic to configure the PBUS registers required for Airoha SoC.
While at it, also add additional info on the PERST# Signal delay comments and use dedicated macro.
--- drivers/pci/controller/pcie-mediatek.c | 92 ++++++++++++++++++++------ 1 file changed, 70 insertions(+), 22 deletions(-)
drivers/pci/controller/pcie-mediatek.c +70 -22
@@ -148,6 +148,7 @@ enum mtk_pcie_flags {NO_MSI =BIT (2 ),/* Bridge has no MSI support, and relies on an * external block */ + SKIP_PCIE_RSTB = BIT(3), /* Skip calling RSTB bits on PCIe probe */ };/**
@@ -684,28 +685,32 @@ 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->flags &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 revision 3.0 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 (PCIE_T_PVPERL_MS ); + +/* 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->flags &NEED_FIX_CLASS_ID ) {
@@ -826,6 +831,41 @@ static int mtk_pcie_startup_port(struct mtk_pcie_port *port)return 0 ; } +static int mtk_pcie_startup_port_an7583 (struct mtk_pcie_port *port) +{ +struct mtk_pcie *pcie = port->pcie; +struct device *dev = pcie->dev; +struct pci_host_bridge *host; +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); + + host =pci_host_bridge_from_priv (pcie); + 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 mtk_pcie_startup_port_v2 (port); +} +static void mtk_pcie_enable_port (struct mtk_pcie_port *port) {struct mtk_pcie *pcie = port->pcie;
@@ -1210,6 +1250,13 @@ static const struct mtk_pcie_soc mtk_pcie_soc_mt7622 = { .flags = NEED_FIX_CLASS_ID, }; +static const struct mtk_pcie_soc mtk_pcie_soc_an7583 = { + .ops = &mtk_pcie_ops_v2, + .startup = mtk_pcie_startup_port_an7583, + .setup_irq = mtk_pcie_setup_irq, + .flags =NEED_FIX_CLASS_ID |SKIP_PCIE_RSTB , +}; +static const struct mtk_pcie_soc mtk_pcie_soc_mt7629 = { .device_id =PCI_DEVICE_ID_MEDIATEK_7629 , .ops = &mtk_pcie_ops_v2,
@@ -1219,6 +1266,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