Message ID | 20210104122232.24071-2-kishon@ti.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | PCI: J7200/J721E PCIe bindings | expand |
On 17:52-20210104, Kishon Vijay Abraham I wrote: > Cadence IP in J721E supports a maximum of 32 outbound regions. However > commit 4e5833884f66 ("arm64: dts: ti: k3-j721e-main: Add PCIe device > tree nodes") incorrectly added this as 16 outbound regions. Now that > "cdns,max-outbound-regions" is an optional property with default value > as 32, remove "cdns,max-outbound-regions" from endpoint DT node. > > Fixes: 4e5833884f66 ("arm64: dts: ti: k3-j721e-main: Add PCIe device tree nodes") ^^ Is this a backward compatible fixup. If I were to apply this on v5.10, wont we have a broken PCIe functionality? Drop the fixes if this is not backward compatible fixup (unless ofcourse the driver fixup is backported all the way back as well - I am assuming will be done in a manner to preserve compatibility with older dtb?) On master right now: $ git grep "cdns,max-outbound-regions" . Documentation/devicetree/bindings/pci/cdns,cdns-pcie-ep.yaml: cdns,max-outbound-regions = <16>; Documentation/devicetree/bindings/pci/cdns-pcie-ep.yaml: cdns,max-outbound-regions: Documentation/devicetree/bindings/pci/cdns-pcie-host.yaml: cdns,max-outbound-regions: arch/arm64/boot/dts/ti/k3-j721e-main.dtsi: cdns,max-outbound-regions = <16>; arch/arm64/boot/dts/ti/k3-j721e-main.dtsi: cdns,max-outbound-regions = <16>; arch/arm64/boot/dts/ti/k3-j721e-main.dtsi: cdns,max-outbound-regions = <16>; arch/arm64/boot/dts/ti/k3-j721e-main.dtsi: cdns,max-outbound-regions = <16>; drivers/pci/controller/cadence/pcie-cadence-ep.c: of_property_read_u32(np, "cdns,max-outbound-regions", &ep->max_regions); > Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> > --- > arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 4 ---- > 1 file changed, 4 deletions(-) >
diff --git a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi index b32df591c766..1c11da612c67 100644 --- a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi +++ b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi @@ -651,7 +651,6 @@ power-domains = <&k3_pds 239 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 239 1>; clock-names = "fck"; - cdns,max-outbound-regions = <16>; max-functions = /bits/ 8 <6>; max-virtual-functions = /bits/ 16 <4 4 4 4 0 0>; dma-coherent; @@ -700,7 +699,6 @@ power-domains = <&k3_pds 240 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 240 1>; clock-names = "fck"; - cdns,max-outbound-regions = <16>; max-functions = /bits/ 8 <6>; max-virtual-functions = /bits/ 16 <4 4 4 4 0 0>; dma-coherent; @@ -749,7 +747,6 @@ power-domains = <&k3_pds 241 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 241 1>; clock-names = "fck"; - cdns,max-outbound-regions = <16>; max-functions = /bits/ 8 <6>; max-virtual-functions = /bits/ 16 <4 4 4 4 0 0>; dma-coherent; @@ -798,7 +795,6 @@ power-domains = <&k3_pds 242 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 242 1>; clock-names = "fck"; - cdns,max-outbound-regions = <16>; max-functions = /bits/ 8 <6>; max-virtual-functions = /bits/ 16 <4 4 4 4 0 0>; dma-coherent;
Cadence IP in J721E supports a maximum of 32 outbound regions. However commit 4e5833884f66 ("arm64: dts: ti: k3-j721e-main: Add PCIe device tree nodes") incorrectly added this as 16 outbound regions. Now that "cdns,max-outbound-regions" is an optional property with default value as 32, remove "cdns,max-outbound-regions" from endpoint DT node. Fixes: 4e5833884f66 ("arm64: dts: ti: k3-j721e-main: Add PCIe device tree nodes") Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> --- arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 4 ---- 1 file changed, 4 deletions(-)