[PATCH 0/3] Document clocks of Adreno 505/506/510

[PATCH 0/3] Document clocks of Adreno 505/506/510

[Barnabás Czémán]

This patch set documents Adreno 505/506/510 clocks
with the missing alwayson clock and enforce their order.

Signed-off-by: Barnabás Czémán <barnabas.czeman@mainlining.org>
---
Barnabás Czémán (3):
      dt-bindings: display/msm/gpu: Document clocks of Adreno 505/506/510
      arm64: dts: qcom: msm8953: sort adreno clocks
      arm64: dts: qcom: msm8976: sort adreno clocks

 .../devicetree/bindings/display/msm/gpu.yaml       | 83 +++++++++++++++++++++-
 arch/arm64/boot/dts/qcom/msm8953.dtsi              | 16 ++---
 arch/arm64/boot/dts/qcom/msm8976.dtsi              | 12 ++--
 3 files changed, 96 insertions(+), 15 deletions(-)
---
base-commit: bc8aa6cdadcc00862f2b5720e5de2e17f696a081
change-id: 20250421-a5xx-schema-a9b649bc8d5e

Best regards,
-- 
Barnabás Czémán <barnabas.czeman@mainlining.org>

[PATCH 1/3] dt-bindings: display/msm/gpu: Document clocks of Adreno 505/506/510

[Barnabás Czémán]

Adreno 505/506/510 have previously undocumented alwayson clock.
Document clocks for them and enforce their order.

Signed-off-by: Barnabás Czémán <barnabas.czeman@mainlining.org>
---
 .../devicetree/bindings/display/msm/gpu.yaml       | 83 +++++++++++++++++++++-
 1 file changed, 82 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/display/msm/gpu.yaml b/Documentation/devicetree/bindings/display/msm/gpu.yaml
index 6ddc72fd85b04537ea270754a897b4e7eb269641..2bf562708f566018aff80b7b5e02f1dd7e0da26e 100644
--- a/Documentation/devicetree/bindings/display/msm/gpu.yaml
+++ b/Documentation/devicetree/bindings/display/msm/gpu.yaml
@@ -146,7 +146,19 @@ allOf:
       properties:
         compatible:
           contains:
-            pattern: '^qcom,adreno-[3-5][0-9][0-9]\.[0-9]+$'
+            enum:
+              - qcom,adreno-305.18
+              - qcom,adreno-306.0
+              - qcom,adreno-306.32
+              - qcom,adreno-320.2
+              - qcom,adreno-330.1
+              - qcom,adreno-330.2
+              - qcom,adreno-405.0
+              - qcom,adreno-508.0
+              - qcom,adreno-509.0
+              - qcom,adreno-512.0
+              - qcom,adreno-530.2
+              - qcom,adreno-540.1
 
     then:
       properties:
@@ -180,6 +192,75 @@ allOf:
         - clocks
         - clock-names
 
+  - if:
+      properties:
+        compatible:
+          contains:
+            enum:
+              - qcom,adreno-505.0
+              - qcom,adreno-506.0
+
+    then:
+      properties:
+        clocks:
+          minItems: 6
+          maxItems: 6
+
+        clock-names:
+          items:
+            - const: alt_mem_iface
+              description: GPU Alternative Memory Interface clock
+            - const: alwayson
+              description: GPU Always-On clock
+            - const: core
+              description: GPU Core clock
+            - const: iface
+              description: GPU Interface clock
+            - const: mem_iface
+              description: GPU Memory Interface clock
+            - const: rbbmtimer
+              description: GPU RBBM Timer for Adreno 5xx series
+          minItems: 6
+          maxItems: 6
+
+      required:
+        - clocks
+        - clock-names
+
+  - if:
+      properties:
+        compatible:
+          contains:
+            enum:
+              - qcom,adreno-510.0
+
+    then:
+      properties:
+        clocks:
+          minItems: 6
+          maxItems: 6
+
+        clock-names:
+          items:
+            - const: alwayson
+              description: GPU Always-On clock
+            - const: core
+              description: GPU Core clock
+            - const: iface
+              description: GPU Interface clock
+            - const: mem
+              description: GPU Memory clock
+            - const: mem_iface
+              description: GPU Memory Interface clock
+            - const: rbbmtimer
+              description: GPU RBBM Timer for Adreno 5xx series
+          minItems: 6
+          maxItems: 6
+
+      required:
+        - clocks
+        - clock-names
+
   - if:
       properties:
         compatible:

-- 
2.49.0

Re: [PATCH 1/3] dt-bindings: display/msm/gpu: Document clocks of Adreno 505/506/510

[Rob Herring (Arm)]

On Mon, 21 Apr 2025 05:09:21 +0200, Barnabás Czémán wrote:
> Adreno 505/506/510 have previously undocumented alwayson clock.
> Document clocks for them and enforce their order.
> 
> Signed-off-by: Barnabás Czémán <barnabas.czeman@mainlining.org>
> ---
>  .../devicetree/bindings/display/msm/gpu.yaml       | 83 +++++++++++++++++++++-
>  1 file changed, 82 insertions(+), 1 deletion(-)
> 

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/display/msm/gpu.yaml: allOf:1:then:properties:clock-names: {'items': [{'const': 'alt_mem_iface', 'description': 'GPU Alternative Memory Interface clock'}, {'const': 'alwayson', 'description': 'GPU Always-On clock'}, {'const': 'core', 'description': 'GPU Core clock'}, {'const': 'iface', 'description': 'GPU Interface clock'}, {'const': 'mem_iface', 'description': 'GPU Memory Interface clock'}, {'const': 'rbbmtimer', 'description': 'GPU RBBM Timer for Adreno 5xx series'}], 'minItems': 6, 'maxItems': 6} should not be valid under {'required': ['maxItems']}
	hint: "maxItems" is not needed with an "items" list
	from schema $id: http://devicetree.org/meta-schemas/items.yaml#
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/display/msm/gpu.yaml: allOf:1:then:properties:clock-names: 'oneOf' conditional failed, one must be fixed:
	[{'const': 'alt_mem_iface', 'description': 'GPU Alternative Memory Interface clock'}, {'const': 'alwayson', 'description': 'GPU Always-On clock'}, {'const': 'core', 'description': 'GPU Core clock'}, {'const': 'iface', 'description': 'GPU Interface clock'}, {'const': 'mem_iface', 'description': 'GPU Memory Interface clock'}, {'const': 'rbbmtimer', 'description': 'GPU RBBM Timer for Adreno 5xx series'}] is too long
	[{'const': 'alt_mem_iface', 'description': 'GPU Alternative Memory Interface clock'}, {'const': 'alwayson', 'description': 'GPU Always-On clock'}, {'const': 'core', 'description': 'GPU Core clock'}, {'const': 'iface', 'description': 'GPU Interface clock'}, {'const': 'mem_iface', 'description': 'GPU Memory Interface clock'}, {'const': 'rbbmtimer', 'description': 'GPU RBBM Timer for Adreno 5xx series'}] is too short
	False schema does not allow 6
	1 was expected
	6 is greater than the maximum of 2
	6 is greater than the maximum of 3
	6 is greater than the maximum of 4
	6 is greater than the maximum of 5
	hint: "minItems" is only needed if less than the "items" list length
	from schema $id: http://devicetree.org/meta-schemas/items.yaml#
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/display/msm/gpu.yaml: allOf:2:then:properties:clock-names: {'items': [{'const': 'alwayson', 'description': 'GPU Always-On clock'}, {'const': 'core', 'description': 'GPU Core clock'}, {'const': 'iface', 'description': 'GPU Interface clock'}, {'const': 'mem', 'description': 'GPU Memory clock'}, {'const': 'mem_iface', 'description': 'GPU Memory Interface clock'}, {'const': 'rbbmtimer', 'description': 'GPU RBBM Timer for Adreno 5xx series'}], 'minItems': 6, 'maxItems': 6} should not be valid under {'required': ['maxItems']}
	hint: "maxItems" is not needed with an "items" list
	from schema $id: http://devicetree.org/meta-schemas/items.yaml#
/builds/robherring/dt-review-ci/linux/Documentation/devicetree/bindings/display/msm/gpu.yaml: allOf:2:then:properties:clock-names: 'oneOf' conditional failed, one must be fixed:
	[{'const': 'alwayson', 'description': 'GPU Always-On clock'}, {'const': 'core', 'description': 'GPU Core clock'}, {'const': 'iface', 'description': 'GPU Interface clock'}, {'const': 'mem', 'description': 'GPU Memory clock'}, {'const': 'mem_iface', 'description': 'GPU Memory Interface clock'}, {'const': 'rbbmtimer', 'description': 'GPU RBBM Timer for Adreno 5xx series'}] is too long
	[{'const': 'alwayson', 'description': 'GPU Always-On clock'}, {'const': 'core', 'description': 'GPU Core clock'}, {'const': 'iface', 'description': 'GPU Interface clock'}, {'const': 'mem', 'description': 'GPU Memory clock'}, {'const': 'mem_iface', 'description': 'GPU Memory Interface clock'}, {'const': 'rbbmtimer', 'description': 'GPU RBBM Timer for Adreno 5xx series'}] is too short
	False schema does not allow 6
	1 was expected
	6 is greater than the maximum of 2
	6 is greater than the maximum of 3
	6 is greater than the maximum of 4
	6 is greater than the maximum of 5
	hint: "minItems" is only needed if less than the "items" list length
	from schema $id: http://devicetree.org/meta-schemas/items.yaml#

doc reference errors (make refcheckdocs):

See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/20250421-a5xx-schema-v1-1-7d96b889322a@mainlining.org

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.

[PATCH 2/3] arm64: dts: qcom: msm8953: sort adreno clocks

[Barnabás Czémán]

Sort adreno clocks in alphabetical order.

Signed-off-by: Barnabás Czémán <barnabas.czeman@mainlining.org>
---
 arch/arm64/boot/dts/qcom/msm8953.dtsi | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/msm8953.dtsi b/arch/arm64/boot/dts/qcom/msm8953.dtsi
index 4793a60fa946195d3220b6c44dec170d443f56db..8a7e80c959fad09f950fe202eba76d3aae01d1ea 100644
--- a/arch/arm64/boot/dts/qcom/msm8953.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8953.dtsi
@@ -1052,18 +1052,18 @@ gpu: gpu@1c00000 {
 			reg-names = "kgsl_3d0_reg_memory";
 			interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
 
-			clocks = <&gcc GCC_OXILI_GFX3D_CLK>,
+			clocks = <&gcc GCC_BIMC_GPU_CLK>,
+				 <&gcc GCC_OXILI_AON_CLK>,
+				 <&gcc GCC_OXILI_GFX3D_CLK>,
 				 <&gcc GCC_OXILI_AHB_CLK>,
 				 <&gcc GCC_BIMC_GFX_CLK>,
-				 <&gcc GCC_BIMC_GPU_CLK>,
-				 <&gcc GCC_OXILI_TIMER_CLK>,
-				 <&gcc GCC_OXILI_AON_CLK>;
-			clock-names = "core",
+				 <&gcc GCC_OXILI_TIMER_CLK>;
+			clock-names = "alt_mem_iface",
+				      "alwayson",
+				      "core",
 				      "iface",
 				      "mem_iface",
-				      "alt_mem_iface",
-				      "rbbmtimer",
-				      "alwayson";
+				      "rbbmtimer";
 			power-domains = <&gcc OXILI_GX_GDSC>;
 
 			iommus = <&gpu_iommu 0>;

-- 
2.49.0

Re: [PATCH 2/3] arm64: dts: qcom: msm8953: sort adreno clocks

[Dmitry Baryshkov]

On Mon, Apr 21, 2025 at 05:09:22AM +0200, Barnabás Czémán wrote:
> Sort adreno clocks in alphabetical order.

Why? The order of the clocks here matches the order in which they should
be brought up.

> 
> Signed-off-by: Barnabás Czémán <barnabas.czeman@mainlining.org>
> ---
>  arch/arm64/boot/dts/qcom/msm8953.dtsi | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/msm8953.dtsi b/arch/arm64/boot/dts/qcom/msm8953.dtsi
> index 4793a60fa946195d3220b6c44dec170d443f56db..8a7e80c959fad09f950fe202eba76d3aae01d1ea 100644
> --- a/arch/arm64/boot/dts/qcom/msm8953.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8953.dtsi
> @@ -1052,18 +1052,18 @@ gpu: gpu@1c00000 {
>  			reg-names = "kgsl_3d0_reg_memory";
>  			interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
>  
> -			clocks = <&gcc GCC_OXILI_GFX3D_CLK>,
> +			clocks = <&gcc GCC_BIMC_GPU_CLK>,
> +				 <&gcc GCC_OXILI_AON_CLK>,
> +				 <&gcc GCC_OXILI_GFX3D_CLK>,
>  				 <&gcc GCC_OXILI_AHB_CLK>,
>  				 <&gcc GCC_BIMC_GFX_CLK>,
> -				 <&gcc GCC_BIMC_GPU_CLK>,
> -				 <&gcc GCC_OXILI_TIMER_CLK>,
> -				 <&gcc GCC_OXILI_AON_CLK>;
> -			clock-names = "core",
> +				 <&gcc GCC_OXILI_TIMER_CLK>;
> +			clock-names = "alt_mem_iface",
> +				      "alwayson",
> +				      "core",
>  				      "iface",
>  				      "mem_iface",
> -				      "alt_mem_iface",
> -				      "rbbmtimer",
> -				      "alwayson";
> +				      "rbbmtimer";
>  			power-domains = <&gcc OXILI_GX_GDSC>;
>  
>  			iommus = <&gpu_iommu 0>;
> 
> -- 
> 2.49.0
> 

-- 
With best wishes
Dmitry

Re: [PATCH 2/3] arm64: dts: qcom: msm8953: sort adreno clocks

[barnabas.czeman]

On 2025-04-21 10:16, Dmitry Baryshkov wrote:
> On Mon, Apr 21, 2025 at 05:09:22AM +0200, Barnabás Czémán wrote:
>> Sort adreno clocks in alphabetical order.
> 
> Why? The order of the clocks here matches the order in which they 
> should
> be brought up.
Simple misunderstanding from previous attempts of documenting the 
alwayson clock.
By the way i have find out a508/a509/a512 clock bring up order is 
different from downstream.
Upstream: iface, rbmmtimer, mem, mem_iface, rbcpr, core
Downstream: core, iface, rbmmtimer, mem, alt_mem_iface, rbcpr
https://git.codelinaro.org/clo/la/kernel/msm-4.4/-/blob/LA.UM.7.2.c27-07400-sdm660.0/arch/arm/boot/dts/qcom/sdm630-gpu.dtsi#L85
https://git.codelinaro.org/clo/la/kernel/msm-4.4/-/blob/LA.UM.7.2.c27-07400-sdm660.0/arch/arm/boot/dts/qcom/sdm660-gpu.dtsi#L87
Should I fix it?
> 
>> 
>> Signed-off-by: Barnabás Czémán <barnabas.czeman@mainlining.org>
>> ---
>>  arch/arm64/boot/dts/qcom/msm8953.dtsi | 16 ++++++++--------
>>  1 file changed, 8 insertions(+), 8 deletions(-)
>> 
>> diff --git a/arch/arm64/boot/dts/qcom/msm8953.dtsi 
>> b/arch/arm64/boot/dts/qcom/msm8953.dtsi
>> index 
>> 4793a60fa946195d3220b6c44dec170d443f56db..8a7e80c959fad09f950fe202eba76d3aae01d1ea 
>> 100644
>> --- a/arch/arm64/boot/dts/qcom/msm8953.dtsi
>> +++ b/arch/arm64/boot/dts/qcom/msm8953.dtsi
>> @@ -1052,18 +1052,18 @@ gpu: gpu@1c00000 {
>>  			reg-names = "kgsl_3d0_reg_memory";
>>  			interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
>> 
>> -			clocks = <&gcc GCC_OXILI_GFX3D_CLK>,
>> +			clocks = <&gcc GCC_BIMC_GPU_CLK>,
>> +				 <&gcc GCC_OXILI_AON_CLK>,
>> +				 <&gcc GCC_OXILI_GFX3D_CLK>,
>>  				 <&gcc GCC_OXILI_AHB_CLK>,
>>  				 <&gcc GCC_BIMC_GFX_CLK>,
>> -				 <&gcc GCC_BIMC_GPU_CLK>,
>> -				 <&gcc GCC_OXILI_TIMER_CLK>,
>> -				 <&gcc GCC_OXILI_AON_CLK>;
>> -			clock-names = "core",
>> +				 <&gcc GCC_OXILI_TIMER_CLK>;
>> +			clock-names = "alt_mem_iface",
>> +				      "alwayson",
>> +				      "core",
>>  				      "iface",
>>  				      "mem_iface",
>> -				      "alt_mem_iface",
>> -				      "rbbmtimer",
>> -				      "alwayson";
>> +				      "rbbmtimer";
>>  			power-domains = <&gcc OXILI_GX_GDSC>;
>> 
>>  			iommus = <&gpu_iommu 0>;
>> 
>> --
>> 2.49.0
>> 

Re: [PATCH 2/3] arm64: dts: qcom: msm8953: sort adreno clocks

[Dmitry Baryshkov]

On Mon, 21 Apr 2025 at 12:22, <barnabas.czeman@mainlining.org> wrote:
>
> On 2025-04-21 10:16, Dmitry Baryshkov wrote:
> > On Mon, Apr 21, 2025 at 05:09:22AM +0200, Barnabás Czémán wrote:
> >> Sort adreno clocks in alphabetical order.
> >
> > Why? The order of the clocks here matches the order in which they
> > should
> > be brought up.
> Simple misunderstanding from previous attempts of documenting the
> alwayson clock.
> By the way i have find out a508/a509/a512 clock bring up order is
> different from downstream.
> Upstream: iface, rbmmtimer, mem, mem_iface, rbcpr, core
> Downstream: core, iface, rbmmtimer, mem, alt_mem_iface, rbcpr
> https://git.codelinaro.org/clo/la/kernel/msm-4.4/-/blob/LA.UM.7.2.c27-07400-sdm660.0/arch/arm/boot/dts/qcom/sdm630-gpu.dtsi#L85
> https://git.codelinaro.org/clo/la/kernel/msm-4.4/-/blob/LA.UM.7.2.c27-07400-sdm660.0/arch/arm/boot/dts/qcom/sdm660-gpu.dtsi#L87
> Should I fix it?

Good question. I will check the msm-4.4 sources later.


-- 
With best wishes
Dmitry

[PATCH 3/3] arm64: dts: qcom: msm8976: sort adreno clocks

[Barnabás Czémán]

Sort adreno clocks in alphabetical order.

Signed-off-by: Barnabás Czémán <barnabas.czeman@mainlining.org>
---
 arch/arm64/boot/dts/qcom/msm8976.dtsi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/msm8976.dtsi b/arch/arm64/boot/dts/qcom/msm8976.dtsi
index e2ac2fd6882fcf47e846a92d45e0fcb9beba633a..86a9d24da0faab2dc7ecc53d60aa0c78703eef91 100644
--- a/arch/arm64/boot/dts/qcom/msm8976.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8976.dtsi
@@ -1129,18 +1129,18 @@ adreno_gpu: gpu@1c00000 {
 			interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
 			interrupt-names = "kgsl_3d0_irq";
 
-			clocks = <&gcc GCC_GFX3D_OXILI_CLK>,
+			clocks = <&gcc GCC_GFX3D_OXILI_AON_CLK>,
+				 <&gcc GCC_GFX3D_OXILI_CLK>,
 				 <&gcc GCC_GFX3D_OXILI_AHB_CLK>,
 				 <&gcc GCC_GFX3D_OXILI_GMEM_CLK>,
 				 <&gcc GCC_GFX3D_BIMC_CLK>,
-				 <&gcc GCC_GFX3D_OXILI_TIMER_CLK>,
-				 <&gcc GCC_GFX3D_OXILI_AON_CLK>;
-			clock-names = "core",
+				 <&gcc GCC_GFX3D_OXILI_TIMER_CLK>;
+			clock-names = "alwayson",
+				      "core",
 				      "iface",
 				      "mem",
 				      "mem_iface",
-				      "rbbmtimer",
-				      "alwayson";
+				      "rbbmtimer";
 
 			power-domains = <&gcc OXILI_GX_GDSC>;
 

-- 
2.49.0