On Tue, 2020-09-22 at 17:31 -0600, Rob Herring wrote: > On Mon, Sep 14, 2020 at 07:26:56PM +0800, Chuanjia Liu wrote: > > Split the PCIe node and add pciecfg node to fix MSI issue. > > What's the MSI issue? > > This is not a compatible change. Please explain why that's okay. Hi, Rob Thanks for your review! In current architecture, MSI domain will be inherited from the root bridge, and all of the devices will share the same MSI domain. Hence that, the PCIe devices will not work properly if the irq number which required is more than 32. Because of 2712/7622 is two independent PCIe controllers not one PCIe controller two port，So we split PCIe node to comply with hardware design and fix msi issue. > > > > > Signed-off-by: Chuanjia Liu <chuanjia.liu@xxxxxxxxxxxx> > > Acked-by: Ryder Lee <ryder.lee@xxxxxxxxxxxx> > > --- > > .../bindings/pci/mediatek-pcie-cfg.yaml | 37 +++++ > > .../devicetree/bindings/pci/mediatek-pcie.txt | 139 +++++++++++------- > > 2 files changed, 123 insertions(+), 53 deletions(-) > > create mode 100644 Documentation/devicetree/bindings/pci/mediatek-pcie-cfg.yaml > > > > diff --git a/Documentation/devicetree/bindings/pci/mediatek-pcie-cfg.yaml b/Documentation/devicetree/bindings/pci/mediatek-pcie-cfg.yaml > > new file mode 100644 > > index 000000000000..cd72973c99d5 > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/pci/mediatek-pcie-cfg.yaml > > @@ -0,0 +1,37 @@ > > +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause > > +%YAML 1.2 > > +--- > > +$id: http://devicetree.org/schemas/pci/mediatek-pcie-cfg.yaml# > > +$schema: http://devicetree.org/meta-schemas/core.yaml# > > + > > +title: Mediatek PCIECFG controller > > + > > +maintainers: > > + - Chuanjia Liu <chuanjia.liu@xxxxxxxxxxxx> > > + - Jianjun Wang <jianjun.wang@xxxxxxxxxxxx> > > + > > +description: | > > + The MediaTek PCIECFG controller controls some feature about > > + LTSSM, ASPM and so on. > > + > > +properties: > > + compatible: > > + items: > > + - enum: > > + - mediatek,generic-pciecfg > > + - const: syscon > > + > > + reg: > > + maxItems: 1 > > + > > +required: > > + - compatible > > + - reg > > additionalProperties: false Thanks，I will add it in next version. > > > + > > +examples: > > + - | > > + pciecfg: pciecfg@1a140000 { > > + compatible = "mediatek,generic-pciecfg", "syscon"; > > + reg = <0x1a140000 0x1000>; > > + }; > > +... > > diff --git a/Documentation/devicetree/bindings/pci/mediatek-pcie.txt b/Documentation/devicetree/bindings/pci/mediatek-pcie.txt > > index 7468d666763a..f849703dfb17 100644 > > --- a/Documentation/devicetree/bindings/pci/mediatek-pcie.txt > > +++ b/Documentation/devicetree/bindings/pci/mediatek-pcie.txt > > @@ -8,7 +8,7 @@ Required properties: > > "mediatek,mt7623-pcie" > > "mediatek,mt7629-pcie" > > - device_type: Must be "pci" > > -- reg: Base addresses and lengths of the PCIe subsys and root ports. > > +- reg: Base addresses and lengths of the root ports. > > - reg-names: Names of the above areas to use during resource lookup. > > - #address-cells: Address representation for root ports (must be 3) > > - #size-cells: Size representation for root ports (must be 2) > > @@ -19,10 +19,10 @@ Required properties: > > - sys_ckN :transaction layer and data link layer clock > > Required entries for MT2701/MT7623: > > - free_ck :for reference clock of PCIe subsys > > - Required entries for MT2712/MT7622: > > + Required entries for MT2712/MT7622/MT7629: > > Seems like a unrelated change. Yes，I will remove it in next version > > > - ahb_ckN :AHB slave interface operating clock for CSR access and RC > > initiated MMIO access > > - Required entries for MT7622: > > + Required entries for MT7622/MT7629: > > - axi_ckN :application layer MMIO channel operating clock > > - aux_ckN :pe2_mac_bridge and pe2_mac_core operating clock when > > pcie_mac_ck/pcie_pipe_ck is turned off > > @@ -47,7 +47,7 @@ Required properties for MT7623/MT2701: > > - reset-names: Must be "pcie-rst0", "pcie-rst1", "pcie-rstN".. based on the > > number of root ports. > > > > -Required properties for MT2712/MT7622: > > +Required properties for MT2712/MT7622/MT7629: > > -interrupts: A list of interrupt outputs of the controller, must have one > > entry for each PCIe port > > > > @@ -143,56 +143,73 @@ Examples for MT7623: > > > > Examples for MT2712: > > > > - pcie: pcie@11700000 { > > + pcie1: pcie@112ff000 { > > compatible = "mediatek,mt2712-pcie"; > > device_type = "pci"; > > - reg = <0 0x11700000 0 0x1000>, > > - <0 0x112ff000 0 0x1000>; > > - reg-names = "port0", "port1"; > > + reg = <0 0x112ff000 0 0x1000>; > > + reg-names = "port1"; > > #address-cells = <3>; > > #size-cells = <2>; > > - interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>, > > - <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>; > > - clocks = <&topckgen CLK_TOP_PE2_MAC_P0_SEL>, > > - <&topckgen CLK_TOP_PE2_MAC_P1_SEL>, > > - <&pericfg CLK_PERI_PCIE0>, > > + interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>; > > + interrupt-names = "pcie_irq"; > > + clocks = <&topckgen CLK_TOP_PE2_MAC_P1_SEL>, > > <&pericfg CLK_PERI_PCIE1>; > > - clock-names = "sys_ck0", "sys_ck1", "ahb_ck0", "ahb_ck1"; > > - phys = <&pcie0_phy PHY_TYPE_PCIE>, <&pcie1_phy PHY_TYPE_PCIE>; > > - phy-names = "pcie-phy0", "pcie-phy1"; > > + clock-names = "sys_ck1", "ahb_ck1"; > > + phys = <&u3port1 PHY_TYPE_PCIE>; > > + phy-names = "pcie-phy1"; > > bus-range = <0x00 0xff>; > > - ranges = <0x82000000 0 0x20000000 0x0 0x20000000 0 0x10000000>; > > + ranges = <0x82000000 0 0x11400000 0x0 0x11400000 0 0x300000>; > > + status = "disabled"; > > Don't show status in examples. Thanks，I will remove it in next version. > > > > > - pcie0: pcie@0,0 { > > - reg = <0x0000 0 0 0 0>; > > + slot1: pcie@1,0 { > > Since you are breaking everything, you don't really need these child > nodes. Just move interrupt-map and interrupt-controller up to the parent > like other PCI host bindings. In my opinion, interrupt-map and interrupt-controller can be placed in parent or child node. I put it on child node for driver compatibility with the old and new DTS format. > > > + reg = <0x0800 0 0 0 0>; > > #address-cells = <3>; > > #size-cells = <2>; > > #interrupt-cells = <1>; > > ranges; > > interrupt-map-mask = <0 0 0 7>; > > - interrupt-map = <0 0 0 1 &pcie_intc0 0>, > > - <0 0 0 2 &pcie_intc0 1>, > > - <0 0 0 3 &pcie_intc0 2>, > > - <0 0 0 4 &pcie_intc0 3>; > > - pcie_intc0: interrupt-controller { > > + 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: interrupt-controller { > > interrupt-controller; > > #address-cells = <0>; > > #interrupt-cells = <1>; > > }; > > }; > > + }; > > > > - pcie1: pcie@1,0 { > > - reg = <0x0800 0 0 0 0>; > > + pcie0: pcie@11700000 { > > + compatible = "mediatek,mt2712-pcie"; > > + device_type = "pci"; > > + reg = <0 0x11700000 0 0x1000>; > > + reg-names = "port0"; > > + #address-cells = <3>; > > + #size-cells = <2>; > > + interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>; > > + interrupt-names = "pcie_irq"; > > + clocks = <&topckgen CLK_TOP_PE2_MAC_P0_SEL>, > > + <&pericfg CLK_PERI_PCIE0>; > > + clock-names = "sys_ck0", "ahb_ck0"; > > + phys = <&u3port0 PHY_TYPE_PCIE>; > > + phy-names = "pcie-phy0"; > > + bus-range = <0x00 0xff>; > > + ranges = <0x82000000 0 0x20000000 0x0 0x20000000 0 0x10000000>; > > + status = "disabled"; > > + > > + slot0: pcie@0,0 { > > + reg = <0x0000 0 0 0 0>; > > #address-cells = <3>; > > #size-cells = <2>; > > #interrupt-cells = <1>; > > ranges; > > 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: interrupt-controller { > > + interrupt-map = <0 0 0 1 &pcie_intc0 0>, > > + <0 0 0 2 &pcie_intc0 1>, > > + <0 0 0 3 &pcie_intc0 2>, > > + <0 0 0 4 &pcie_intc0 3>; > > + pcie_intc0: interrupt-controller { > > interrupt-controller; > > #address-cells = <0>; > > #interrupt-cells = <1>; > > @@ -202,39 +219,30 @@ Examples for MT2712: > > > > Examples for MT7622: > > > > - pcie: pcie@1a140000 { > > + pcie0: pcie@1a143000 { > > compatible = "mediatek,mt7622-pcie"; > > device_type = "pci"; > > - reg = <0 0x1a140000 0 0x1000>, > > - <0 0x1a143000 0 0x1000>, > > - <0 0x1a145000 0 0x1000>; > > - reg-names = "subsys", "port0", "port1"; > > + reg = <0 0x1a143000 0 0x1000>; > > + reg-names = "port0"; > > #address-cells = <3>; > > #size-cells = <2>; > > - interrupts = <GIC_SPI 228 IRQ_TYPE_LEVEL_LOW>, > > - <GIC_SPI 229 IRQ_TYPE_LEVEL_LOW>; > > + interrupts = <GIC_SPI 228 IRQ_TYPE_LEVEL_LOW>; > > + interrupt-names = "pcie_irq"; > > clocks = <&pciesys CLK_PCIE_P0_MAC_EN>, > > - <&pciesys CLK_PCIE_P1_MAC_EN>, > > <&pciesys CLK_PCIE_P0_AHB_EN>, > > - <&pciesys CLK_PCIE_P1_AHB_EN>, > > <&pciesys CLK_PCIE_P0_AUX_EN>, > > - <&pciesys CLK_PCIE_P1_AUX_EN>, > > <&pciesys CLK_PCIE_P0_AXI_EN>, > > - <&pciesys CLK_PCIE_P1_AXI_EN>, > > <&pciesys CLK_PCIE_P0_OBFF_EN>, > > - <&pciesys CLK_PCIE_P1_OBFF_EN>, > > - <&pciesys CLK_PCIE_P0_PIPE_EN>, > > - <&pciesys CLK_PCIE_P1_PIPE_EN>; > > - clock-names = "sys_ck0", "sys_ck1", "ahb_ck0", "ahb_ck1", > > - "aux_ck0", "aux_ck1", "axi_ck0", "axi_ck1", > > - "obff_ck0", "obff_ck1", "pipe_ck0", "pipe_ck1"; > > - phys = <&pcie0_phy PHY_TYPE_PCIE>, <&pcie1_phy PHY_TYPE_PCIE>; > > - phy-names = "pcie-phy0", "pcie-phy1"; > > + <&pciesys CLK_PCIE_P0_PIPE_EN>; > > + clock-names = "sys_ck0", "ahb_ck0", "aux_ck0", > > + "axi_ck0", "obff_ck0", "pipe_ck0"; > > + > > power-domains = <&scpsys MT7622_POWER_DOMAIN_HIF0>; > > bus-range = <0x00 0xff>; > > - ranges = <0x82000000 0 0x20000000 0x0 0x20000000 0 0x10000000>; > > + ranges = <0x82000000 0 0x20000000 0x0 0x20000000 0 0x8000000>; > > + status = "disabled"; > > > > - pcie0: pcie@0,0 { > > + slot0: pcie@0,0 { > > reg = <0x0000 0 0 0 0>; > > #address-cells = <3>; > > #size-cells = <2>; > > @@ -251,8 +259,33 @@ Examples for MT7622: > > #interrupt-cells = <1>; > > }; > > }; > > + }; > > + > > + pcie1: pcie@1a145000 { > > + compatible = "mediatek,mt7622-pcie"; > > + device_type = "pci"; > > + reg = <0 0x1a145000 0 0x1000>; > > + reg-names = "port1"; > > + #address-cells = <3>; > > + #size-cells = <2>; > > + interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_LOW>; > > + interrupt-names = "pcie_irq"; > > + clocks = <&pciesys CLK_PCIE_P1_MAC_EN>, > > + /* designer has connect RC1 with p0_ahb clock */ > > + <&pciesys CLK_PCIE_P0_AHB_EN>, > > + <&pciesys CLK_PCIE_P1_AUX_EN>, > > + <&pciesys CLK_PCIE_P1_AXI_EN>, > > + <&pciesys CLK_PCIE_P1_OBFF_EN>, > > + <&pciesys CLK_PCIE_P1_PIPE_EN>; > > + clock-names = "sys_ck1", "ahb_ck1", "aux_ck1", > > + "axi_ck1", "obff_ck1", "pipe_ck1"; > > + > > + power-domains = <&scpsys MT7622_POWER_DOMAIN_HIF0>; > > + bus-range = <0x00 0xff>; > > + ranges = <0x82000000 0 0x28000000 0x0 0x28000000 0 0x8000000>; > > + status = "disabled"; > > > > - pcie1: pcie@1,0 { > > + slot1: pcie@1,0 { > > reg = <0x0800 0 0 0 0>; > > #address-cells = <3>; > > #size-cells = <2>; > > -- > > 2.18.0 > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@xxxxxxxxxxxxxxxxxxx > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
