Skip to contentSkip to conversation

arm64: zynqmp: Update MALI 400 interrupt and clock names

PATCH Superseded Parth Gajjar 4 participants 7 messages Mar 7, 2023 – Mar 14, 2023

Subsystems (4)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover arm64: zynqmp: Update MALI 400 interrupt and clock names

Motivation for the commit is to utilize the upstream community device tree so that the either modified ARM Mali 400 driver or upstream lima driver can be used.

Parth Gajjar (2):
arm64: zynqmp: Update MALI 400 interrupt and clock names
dt-bindings: gpu: mali-utgard: Add xlnx,zynqmp-mali compatible

 Documentation/devicetree/bindings/gpu/arm,mali-utgard.yaml | 1 +
 arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi             | 2 +-
 arch/arm64/boot/dts/xilinx/zynqmp.dtsi                     | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/2 arm64: zynqmp: Update MALI 400 interrupt and clock names

Motivation for the commit is to utilize the upstream community device tree so that the either modified ARM Mali 400 driver or upstream lima driver can be used.

---
 arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 2 +-
 arch/arm64/boot/dts/xilinx/zynqmp.dtsi         | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi +1 -1
index ff2f34ce380c..ac8ed4a434d0 100644
@@ -133,7 +133,7 @@
 };
 
 &gpu {
-	clocks = <&zynqmp_clk GPU_REF>, <&zynqmp_clk GPU_PP0_REF>, <&zynqmp_clk GPU_PP1_REF>;
+	clocks = <&zynqmp_clk GPU_REF>, <&zynqmp_clk GPU_PP0_REF>;
 };
 
 &lpd_dma_chan1 {
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +3 -3
index 96cba469ab5d..6a210cb9bce9 100644
@@ -448,12 +448,12 @@
 
 		gpu: gpu@fd4b0000 {
 			status = "disabled";
-			compatible = "arm,mali-400", "arm,mali-utgard";
+			compatible = "xlnx,zynqmp-mali", "arm,mali-400";
 			reg = <0x0 0xfd4b0000 0x0 0x10000>;
 			interrupt-parent = <&gic>;
 			interrupts = <0 132 4>, <0 132 4>, <0 132 4>, <0 132 4>, <0 132 4>, <0 132 4>;
-			interrupt-names = "IRQGP", "IRQGPMMU", "IRQPP0", "IRQPPMMU0", "IRQPP1", "IRQPPMMU1";
-			clock-names = "gpu", "gpu_pp0", "gpu_pp1";
+			interrupt-names = "gp", "gpmmu", "pp0", "ppmmu0", "pp1", "ppmmu1";
+			clock-names = "bus", "core";
 			power-domains = <&zynqmp_firmware PD_GPU>;
 		};
 
Signature · 1 line
2.17.1
maintainer
#2 lore raw
Quoted 34 lines · Parth Gajjar

Motivation for the commit is to utilize the upstream community device tree so that the either modified ARM Mali 400 driver or upstream lima driver can be used.

---
  arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 2 +-
  arch/arm64/boot/dts/xilinx/zynqmp.dtsi         | 6 +++---
  2 files changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi +1 -1
index ff2f34ce380c..ac8ed4a434d0 100644
@@ -133,7 +133,7 @@
  };
 
  &gpu {
-	clocks = <&zynqmp_clk GPU_REF>, <&zynqmp_clk GPU_PP0_REF>, <&zynqmp_clk GPU_PP1_REF>;
+	clocks = <&zynqmp_clk GPU_REF>, <&zynqmp_clk GPU_PP0_REF>;
  };
 
  &lpd_dma_chan1 {
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +1 -1
index 96cba469ab5d..6a210cb9bce9 100644
@@ -448,12 +448,12 @@
 
  		gpu: gpu@fd4b0000 {
  			status = "disabled";
-			compatible = "arm,mali-400", "arm,mali-utgard";
+			compatible = "xlnx,zynqmp-mali", "arm,mali-400";

arch/arm64/boot/dts/xilinx/zynqmp.dtsi line 459

Quoted 10 lines
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +2 -2
  			reg = <0x0 0xfd4b0000 0x0 0x10000>;
  			interrupt-parent = <&gic>;
  			interrupts = <0 132 4>, <0 132 4>, <0 132 4>, <0 132 4>, <0 132 4>, <0 132 4>;
-			interrupt-names = "IRQGP", "IRQGPMMU", "IRQPP0", "IRQPPMMU0", "IRQPP1", "IRQPPMMU1";
-			clock-names = "gpu", "gpu_pp0", "gpu_pp1";
+			interrupt-names = "gp", "gpmmu", "pp0", "ppmmu0", "pp1", "ppmmu1";
+			clock-names = "bus", "core";
  			power-domains = <&zynqmp_firmware PD_GPU>;
  		};
 

This patch can't be applied because gpu is not in upstream kernel. Please based it on the latest tree and resend.

Also this should be 2/2 not 1/2.

Thanks,
Michal

#3 lore raw
Quoted 37 lines · Michal Simek
Quoted 34 lines · Parth Gajjar

Motivation for the commit is to utilize the upstream community device tree so that the either modified ARM Mali 400 driver or upstream lima driver can be used.

---
  arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 2 +- arch/arm64/boot/dts/xilinx/zynqmp.dtsi         | 6 +++---

  2 files changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi +1 -1
index ff2f34ce380c..ac8ed4a434d0 100644
@@ -133,7 +133,7 @@
   };
   &gpu {
-    clocks = <&zynqmp_clk GPU_REF>, <&zynqmp_clk GPU_PP0_REF>, <&zynqmp_clk GPU_PP1_REF>;
+    clocks = <&zynqmp_clk GPU_REF>, <&zynqmp_clk GPU_PP0_REF>;
   };
   &lpd_dma_chan1 {
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +1 -1
index 96cba469ab5d..6a210cb9bce9 100644
@@ -448,12 +448,12 @@
           gpu: gpu@fd4b0000 {
               status = "disabled";
-            compatible = "arm,mali-400", "arm,mali-utgard";
+            compatible = "xlnx,zynqmp-mali", "arm,mali-400";
               reg = <0x0 0xfd4b0000 0x0 0x10000>;
               interrupt-parent = <&gic>;
               interrupts = <0 132 4>, <0 132 4>, <0 132 4>, <0 132 4>, <0 132 4>, <0 132 4>;
Quoted 8 lines

arch/arm64/boot/dts/xilinx/zynqmp.dtsi line 458

Quoted 6 lines
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +2 -2
-            interrupt-names = "IRQGP", "IRQGPMMU", "IRQPP0", "IRQPPMMU0", "IRQPP1", "IRQPPMMU1";
-            clock-names = "gpu", "gpu_pp0", "gpu_pp1";
+            interrupt-names = "gp", "gpmmu", "pp0", "ppmmu0", "pp1", "ppmmu1";
+            clock-names = "bus", "core";
               power-domains = <&zynqmp_firmware PD_GPU>;
           };

This patch can't be applied because gpu is not in upstream kernel. Please based it on the latest tree and resend.

lima support isn't in the upstream kernel? It should be.

--Mark

Quoted 4 lines

Also this should be 2/2 not 1/2.

Thanks,
Michal

maintainer
#4 lore raw
Quoted 51 lines · Mark Hatle
Quoted 39 lines · Michal Simek
Quoted 36 lines · Parth Gajjar

Motivation for the commit is to utilize the upstream community device tree so that the either modified ARM Mali 400 driver or upstream lima driver can be used.

---
  arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 2 +- arch/arm64/boot/dts/xilinx/zynqmp.dtsi         | 6 +++---

  2 files changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi +1 -1
index ff2f34ce380c..ac8ed4a434d0 100644
@@ -133,7 +133,7 @@
   };
   &gpu {
-    clocks = <&zynqmp_clk GPU_REF>, <&zynqmp_clk GPU_PP0_REF>, <&zynqmp_clk 
 GPU_PP1_REF>;
+    clocks = <&zynqmp_clk GPU_REF>, <&zynqmp_clk GPU_PP0_REF>;
   };
   &lpd_dma_chan1 {
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +1 -2
index 96cba469ab5d..6a210cb9bce9 100644
@@ -448,12 +448,12 @@
           gpu: gpu@fd4b0000 {
               status = "disabled";
-            compatible = "arm,mali-400", "arm,mali-utgard";
+            compatible = "xlnx,zynqmp-mali", "arm,mali-400";
               reg = <0x0 0xfd4b0000 0x0 0x10000>;
               interrupt-parent = <&gic>;
               interrupts = <0 132 4>, <0 132 4>, <0 132 4>, <0 132 4>, <0 132 4>, <0 132 4>;
-            interrupt-names = "IRQGP", "IRQGPMMU", "IRQPP0", "IRQPPMMU0", 
Quoted 8 lines

arch/arm64/boot/dts/xilinx/zynqmp.dtsi line 458

Quoted 6 lines
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +2 -1
 "IRQPP1", "IRQPPMMU1";
-            clock-names = "gpu", "gpu_pp0", "gpu_pp1";
+            interrupt-names = "gp", "gpmmu", "pp0", "ppmmu0", "pp1", "ppmmu1";
+            clock-names = "bus", "core";
               power-domains = <&zynqmp_firmware PD_GPU>;
           };

This patch can't be applied because gpu is not in upstream kernel. Please based it on the latest tree and resend.

Quoted 1 line

lima support isn't in the upstream kernel?  It should be.

DT node which describes gpu is not in upstream kernel. Driver should be there.

M

#5 lore raw

PATCH 2/2 dt-bindings: gpu: mali-utgard: Add xlnx,zynqmp-mali compatible

In reply to Parth Gajjar

Xilinx zynqmp SoC contains Mali400, so add its specific compatible to bindings.

---
 Documentation/devicetree/bindings/gpu/arm,mali-utgard.yaml | 1 +
 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/gpu/arm,mali-utgard.yaml +1 -0
index 318122d95eb5..0fae1ef013be 100644
@@ -33,6 +33,7 @@ properties:
               - rockchip,rk3228-mali
               - samsung,exynos4210-mali
               - stericsson,db8500-mali
+              - xlnx,zynqmp-mali
           - const: arm,mali-400
       - items:
           - enum:
Signature · 1 line
2.17.1
maintainer Acked-by on v1 2/2
#6 lore raw

Re: [RESENT PATCH 2/2] dt-bindings: gpu: mali-utgard: Add xlnx,zynqmp-mali compatible

Quoted 9 lines · Parth Gajjar

Xilinx zynqmp SoC contains Mali400, so add its specific compatible to bindings.

---
 Documentation/devicetree/bindings/gpu/arm,mali-utgard.yaml | 1 +
 1 file changed, 1 insertion(+)