Skip to contentSkip to conversation

arm64: dts: qcom: sc7180: Add A618 gpu dt blob

PATCH In review Sharat Masetty 3 participants 8 messages May 1, 2020 – May 21, 2020

Subsystems (6)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 arm64: dts: qcom: sc7180: Add A618 gpu dt blob

This patch adds the required dt nodes and properties to enabled A618 GPU.

---
* Remove GCC_DDRSS_GPU_AXI_CLK clock reference from gpu smmu node.

 arch/arm64/boot/dts/qcom/sc7180.dtsi | 102 +++++++++++++++++++++++++++++++++++
 1 file changed, 102 insertions(+)
arch/arm64/boot/dts/qcom/sc7180.dtsi +102 -0
index 4216b57..de9a054 100644
@@ -1373,6 +1373,108 @@
 			};
 		};
 
+		gpu: gpu@5000000 {
+			compatible = "qcom,adreno-618.0", "qcom,adreno";
+			#stream-id-cells = <16>;
+			reg = <0 0x05000000 0 0x40000>, <0 0x0509e000 0 0x1000>,
+				<0 0x05061000 0 0x800>;
+			reg-names = "kgsl_3d0_reg_memory", "cx_mem", "cx_dbgc";
+			interrupts = <GIC_SPI 300 IRQ_TYPE_LEVEL_HIGH>;
+			iommus = <&adreno_smmu 0>;
+			operating-points-v2 = <&gpu_opp_table>;
+			qcom,gmu = <&gmu>;
+
+			gpu_opp_table: opp-table {
+				compatible = "operating-points-v2";
+
+				opp-800000000 {
+					opp-hz = /bits/ 64 <800000000>;
+					opp-level = <RPMH_REGULATOR_LEVEL_TURBO>;
+				};
+
+				opp-650000000 {
+					opp-hz = /bits/ 64 <650000000>;
+					opp-level = <RPMH_REGULATOR_LEVEL_NOM_L1>;
+				};
+
+				opp-565000000 {
+					opp-hz = /bits/ 64 <565000000>;
+					opp-level = <RPMH_REGULATOR_LEVEL_NOM>;
+				};
+
+				opp-430000000 {
+					opp-hz = /bits/ 64 <430000000>;
+					opp-level = <RPMH_REGULATOR_LEVEL_SVS_L1>;
+				};
+
+				opp-355000000 {
+					opp-hz = /bits/ 64 <355000000>;
+					opp-level = <RPMH_REGULATOR_LEVEL_SVS>;
+				};
+
+				opp-267000000 {
+					opp-hz = /bits/ 64 <267000000>;
+					opp-level = <RPMH_REGULATOR_LEVEL_LOW_SVS>;
+				};
+
+				opp-180000000 {
+					opp-hz = /bits/ 64 <180000000>;
+					opp-level = <RPMH_REGULATOR_LEVEL_MIN_SVS>;
+				};
+			};
+		};
+
+		adreno_smmu: iommu@5040000 {
+			compatible = "qcom,sc7180-smmu-v2", "qcom,smmu-v2";
+			reg = <0 0x05040000 0 0x10000>;
+			#iommu-cells = <1>;
+			#global-interrupts = <2>;
+			interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_HIGH>,
+					<GIC_SPI 231 IRQ_TYPE_LEVEL_HIGH>,
+					<GIC_SPI 364 IRQ_TYPE_EDGE_RISING>,
+					<GIC_SPI 365 IRQ_TYPE_EDGE_RISING>,
+					<GIC_SPI 366 IRQ_TYPE_EDGE_RISING>,
+					<GIC_SPI 367 IRQ_TYPE_EDGE_RISING>,
+					<GIC_SPI 368 IRQ_TYPE_EDGE_RISING>,
+					<GIC_SPI 369 IRQ_TYPE_EDGE_RISING>,
+					<GIC_SPI 370 IRQ_TYPE_EDGE_RISING>,
+					<GIC_SPI 371 IRQ_TYPE_EDGE_RISING>;
+
+			clocks = <&gcc GCC_GPU_MEMNOC_GFX_CLK>,
+				<&gcc GCC_GPU_CFG_AHB_CLK>;
+			clock-names = "bus", "iface";
+
+			power-domains = <&gpucc CX_GDSC>;
+		};
+
+		gmu: gmu@506a000 {
+			compatible="qcom,adreno-gmu-618.0", "qcom,adreno-gmu";
+			reg = <0 0x0506a000 0 0x31000>, <0 0x0b290000 0 0x10000>,
+				<0 0x0b490000 0 0x10000>;
+			reg-names = "gmu", "gmu_pdc", "gmu_pdc_seq";
+			interrupts = <GIC_SPI 304 IRQ_TYPE_LEVEL_HIGH>,
+				   <GIC_SPI 305 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-names = "hfi", "gmu";
+			clocks = <&gpucc GPU_CC_CX_GMU_CLK>,
+			       <&gpucc GPU_CC_CXO_CLK>,
+			       <&gcc GCC_DDRSS_GPU_AXI_CLK>,
+			       <&gcc GCC_GPU_MEMNOC_GFX_CLK>;
+			clock-names = "gmu", "cxo", "axi", "memnoc";
+			power-domains = <&gpucc CX_GDSC>, <&gpucc GX_GDSC>;
+			power-domain-names = "cx", "gx";
+			iommus = <&adreno_smmu 5>;
+			operating-points-v2 = <&gmu_opp_table>;
+
+			gmu_opp_table: opp-table {
+				compatible = "operating-points-v2";
+
+				opp-200000000 {
+					opp-hz = /bits/ 64 <200000000>;
+					opp-level = <RPMH_REGULATOR_LEVEL_MIN_SVS>;
+				};
+			};
+		};
+
 		gpucc: clock-controller@5090000 {
 			compatible = "qcom,sc7180-gpucc";
 			reg = <0 0x05090000 0 0x9000>;

--
1.9.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#1 lore raw

PATCH 2/2 dt-bindings: arm-smmu: Add sc7180 compatible string

This patch simply adds a new compatible string for SC7180 platform.

---
 Documentation/devicetree/bindings/iommu/arm,smmu.yaml | 1 +
 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/iommu/arm,smmu.yaml +1 -0
index 6515dbe..986098b 100644
@@ -28,6 +28,7 @@ properties:
           - enum:
               - qcom,msm8996-smmu-v2
               - qcom,msm8998-smmu-v2
+              - qcom,sc7180-smmu-v2
               - qcom,sdm845-smmu-v2
           - const: qcom,smmu-v2
 
Signature · 5 lines
1.9.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] dt-bindings: arm-smmu: Add sc7180 compatible string

Hi,

Quoted 7 lines · Sharat Masetty

This patch simply adds a new compatible string for SC7180 platform.

---
 Documentation/devicetree/bindings/iommu/arm,smmu.yaml | 1 +
 1 file changed, 1 insertion(+)

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#3 lore raw

Re: [PATCH 2/2] dt-bindings: arm-smmu: Add sc7180 compatible string

In reply to Sharat Masetty

Hi,

Quoted 13 lines · Sharat Masetty

This patch simply adds a new compatible string for SC7180 platform.

---
 Documentation/devicetree/bindings/iommu/arm,smmu.yaml | 1 +
 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/iommu/arm,smmu.yaml +0 -0
index 6515dbe..986098b 100644

Documentation/devicetree/bindings/iommu/arm,smmu.yaml properties: · line 33

Quoted 6 lines
Documentation/devicetree/bindings/iommu/arm,smmu.yaml +1 -0
@@ -28,6 +28,7 @@ properties:
           - enum:
               - qcom,msm8996-smmu-v2
               - qcom,msm8998-smmu-v2
+              - qcom,sc7180-smmu-v2
               - qcom,sdm845-smmu-v2
           - const: qcom,smmu-v2

Is anything blocking this patch from landing now?

-Doug

maintainer
#4 lore raw

Re: [PATCH 2/2] dt-bindings: arm-smmu: Add sc7180 compatible string

Quoted 9 lines · Doug Anderson
Quoted 8 lines · Sharat Masetty

This patch simply adds a new compatible string for SC7180 platform.

---
 Documentation/devicetree/bindings/iommu/arm,smmu.yaml | 1 +
 1 file changed, 1 insertion(+)
Quoted 13 lines

Documentation/devicetree/bindings/iommu/arm,smmu.yaml properties: · line 33

Quoted 11 lines
Documentation/devicetree/bindings/iommu/arm,smmu.yaml +1 -0
index 6515dbe..986098b 100644
@@ -28,6 +28,7 @@ properties:
           - enum:
               - qcom,msm8996-smmu-v2
               - qcom,msm8998-smmu-v2
+              - qcom,sc7180-smmu-v2
               - qcom,sdm845-smmu-v2
           - const: qcom,smmu-v2

Is anything blocking this patch from landing now?

I thought updates to the bindings usually went via Rob and the device-tree tree, but neither of those are on cc.

Perhaps resend with that fixed?

Will

#5 lore raw

Re: [PATCH 2/2] dt-bindings: arm-smmu: Add sc7180 compatible string

Hi,

Quoted 25 lines · Will Deacon
Quoted 9 lines · Doug Anderson
Quoted 8 lines · Sharat Masetty

This patch simply adds a new compatible string for SC7180 platform.

---
 Documentation/devicetree/bindings/iommu/arm,smmu.yaml | 1 +
 1 file changed, 1 insertion(+)
Quoted 13 lines

Documentation/devicetree/bindings/iommu/arm,smmu.yaml properties: · line 33

Quoted 11 lines
Documentation/devicetree/bindings/iommu/arm,smmu.yaml +1 -0
index 6515dbe..986098b 100644
@@ -28,6 +28,7 @@ properties:
           - enum:
               - qcom,msm8996-smmu-v2
               - qcom,msm8998-smmu-v2
+              - qcom,sc7180-smmu-v2
               - qcom,sdm845-smmu-v2
           - const: qcom,smmu-v2

Is anything blocking this patch from landing now?

Quoted 4 lines

I thought updates to the bindings usually went via Rob and the device-tree tree, but neither of those are on cc.

Perhaps resend with that fixed?

Ah, I guess I wasn't familiar with how things worked for this file, or maybe things have changed recently? I'm used to most bindings going through the same tree as the drivers that use them. Usually if things are at all complicated maintainers wait for an Ack from Rob (so he should have been CCed for sure) and then land.

In this case it actually looks like Bjorn landed it in the Qualcomm and I just didn't realize it. That seems like it should be fine since it's in the middle of a clause that's all Qualcomm and the change shouldn't be controversial in any way. :-)

Thanks!

-Doug
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

maintainer
#6 lore raw

Re: [PATCH 2/2] dt-bindings: arm-smmu: Add sc7180 compatible string

Quoted 28 lines · Doug Anderson
Quoted 27 lines · Will Deacon
Quoted 9 lines · Doug Anderson
Quoted 8 lines · Sharat Masetty

This patch simply adds a new compatible string for SC7180 platform.

---
 Documentation/devicetree/bindings/iommu/arm,smmu.yaml | 1 +
 1 file changed, 1 insertion(+)
Quoted 13 lines

Documentation/devicetree/bindings/iommu/arm,smmu.yaml properties: · line 33

Quoted 11 lines
Documentation/devicetree/bindings/iommu/arm,smmu.yaml +1 -0
index 6515dbe..986098b 100644
@@ -28,6 +28,7 @@ properties:
           - enum:
               - qcom,msm8996-smmu-v2
               - qcom,msm8998-smmu-v2
+              - qcom,sc7180-smmu-v2
               - qcom,sdm845-smmu-v2
           - const: qcom,smmu-v2

Is anything blocking this patch from landing now?

I thought updates to the bindings usually went via Rob and the device-tree tree, but neither of those are on cc.

Quoted 7 lines
Quoted 1 line

Perhaps resend with that fixed?

Ah, I guess I wasn't familiar with how things worked for this file, or maybe things have changed recently? I'm used to most bindings going through the same tree as the drivers that use them. Usually if things are at all complicated maintainers wait for an Ack from Rob (so he should have been CCed for sure) and then land.

Just to clear this up: I'm happy to take DT stuff like this, but preferably with Rob's ack so that I know that (a) it's not a load of rubbish and (b) it probably won't conflict with his tree. So having the DT folks omitted from the CC list just rings alarm bells for me.

Quoted 4 lines

In this case it actually looks like Bjorn landed it in the Qualcomm and I just didn't realize it. That seems like it should be fine since it's in the middle of a clause that's all Qualcomm and the change shouldn't be controversial in any way. :-)

Ok!

Will
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reviewed-by Tested-by on v1 1/2
#7 lore raw
In reply to Sharat Masetty

Hi,

Quoted 10 lines · Sharat Masetty

This patch adds the required dt nodes and properties to enabled A618 GPU.

---
* Remove GCC_DDRSS_GPU_AXI_CLK clock reference from gpu smmu node.

 arch/arm64/boot/dts/qcom/sc7180.dtsi | 102 +++++++++++++++++++++++++++++++++++
 1 file changed, 102 insertions(+)

This is the newer version of the patch:

https://lore.kernel.org/r/[email protected]

The change to remove the extra IOMMU clock matches our discussions and there's no longer anything blocking this from landing.