arm64: dts: qcom: sc7180: Hook up BWMONs

Hook up 2 out of 4 (the rest are for NPU) BWMONs exposed on the SC7180.
This allows for scaling DDR and LLCC independently from cpufreq.

Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Tested-by: Nikita Travkin <nikita@trvn.ru> # Aspire 1
Link: https://lore.kernel.org/r/20230616-topic-sc7180_bwmons-v1-2-4ddb96f9a6cd@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/sc7180-lite.dtsi b/arch/arm64/boot/dts/qcom/sc7180-lite.dtsi
index 4b306a5..975d442 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-lite.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-lite.dtsi
@@ -6,21 +6,21 @@
  */
 
 &cpu6_opp10 {
-       opp-peak-kBps = <7216000 22425600>;
+       opp-peak-kBps = <22425600>;
 };
 
 &cpu6_opp11 {
-       opp-peak-kBps = <7216000 22425600>;
+       opp-peak-kBps = <22425600>;
 };
 
 &cpu6_opp12 {
-       opp-peak-kBps = <8532000 23347200>;
+       opp-peak-kBps = <23347200>;
 };
 
 &cpu6_opp13 {
-       opp-peak-kBps = <8532000 23347200>;
+       opp-peak-kBps = <23347200>;
 };
 
 &cpu6_opp14 {
-       opp-peak-kBps = <8532000 23347200>;
+       opp-peak-kBps = <23347200>;
 };

diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
index e25dc2b..31381e7 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
@@ -11,6 +11,7 @@
 #include <dt-bindings/clock/qcom,lpasscorecc-sc7180.h>
 #include <dt-bindings/clock/qcom,rpmh.h>
 #include <dt-bindings/clock/qcom,videocc-sc7180.h>
+#include <dt-bindings/interconnect/qcom,icc.h>
 #include <dt-bindings/interconnect/qcom,osm-l3.h>
 #include <dt-bindings/interconnect/qcom,sc7180.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
@@ -84,8 +85,7 @@
                        capacity-dmips-mhz = <415>;
                        dynamic-power-coefficient = <137>;
                        operating-points-v2 = <&cpu0_opp_table>;
-                       interconnects = <&gem_noc MASTER_APPSS_PROC 3 &mc_virt SLAVE_EBI1 3>,
-                                       <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
+                       interconnects = <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
                        next-level-cache = <&L2_0>;
                        #cooling-cells = <2>;
                        qcom,freq-domain = <&cpufreq_hw 0>;
@@ -115,8 +115,7 @@
                        dynamic-power-coefficient = <137>;
                        next-level-cache = <&L2_100>;
                        operating-points-v2 = <&cpu0_opp_table>;
-                       interconnects = <&gem_noc MASTER_APPSS_PROC 3 &mc_virt SLAVE_EBI1 3>,
-                                       <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
+                       interconnects = <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
                        #cooling-cells = <2>;
                        qcom,freq-domain = <&cpufreq_hw 0>;
                        L2_100: l2-cache {
@@ -140,8 +139,7 @@
                        dynamic-power-coefficient = <137>;
                        next-level-cache = <&L2_200>;
                        operating-points-v2 = <&cpu0_opp_table>;
-                       interconnects = <&gem_noc MASTER_APPSS_PROC 3 &mc_virt SLAVE_EBI1 3>,
-                                       <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
+                       interconnects = <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
                        #cooling-cells = <2>;
                        qcom,freq-domain = <&cpufreq_hw 0>;
                        L2_200: l2-cache {
@@ -165,8 +163,7 @@
                        dynamic-power-coefficient = <137>;
                        next-level-cache = <&L2_300>;
                        operating-points-v2 = <&cpu0_opp_table>;
-                       interconnects = <&gem_noc MASTER_APPSS_PROC 3 &mc_virt SLAVE_EBI1 3>,
-                                       <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
+                       interconnects = <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
                        #cooling-cells = <2>;
                        qcom,freq-domain = <&cpufreq_hw 0>;
                        L2_300: l2-cache {
@@ -190,8 +187,7 @@
                        dynamic-power-coefficient = <137>;
                        next-level-cache = <&L2_400>;
                        operating-points-v2 = <&cpu0_opp_table>;
-                       interconnects = <&gem_noc MASTER_APPSS_PROC 3 &mc_virt SLAVE_EBI1 3>,
-                                       <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
+                       interconnects = <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
                        #cooling-cells = <2>;
                        qcom,freq-domain = <&cpufreq_hw 0>;
                        L2_400: l2-cache {
@@ -215,8 +211,7 @@
                        dynamic-power-coefficient = <137>;
                        next-level-cache = <&L2_500>;
                        operating-points-v2 = <&cpu0_opp_table>;
-                       interconnects = <&gem_noc MASTER_APPSS_PROC 3 &mc_virt SLAVE_EBI1 3>,
-                                       <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
+                       interconnects = <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
                        #cooling-cells = <2>;
                        qcom,freq-domain = <&cpufreq_hw 0>;
                        L2_500: l2-cache {
@@ -240,8 +235,7 @@
                        dynamic-power-coefficient = <480>;
                        next-level-cache = <&L2_600>;
                        operating-points-v2 = <&cpu6_opp_table>;
-                       interconnects = <&gem_noc MASTER_APPSS_PROC 3 &mc_virt SLAVE_EBI1 3>,
-                                       <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
+                       interconnects = <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
                        #cooling-cells = <2>;
                        qcom,freq-domain = <&cpufreq_hw 1>;
                        L2_600: l2-cache {
@@ -265,8 +259,7 @@
                        dynamic-power-coefficient = <480>;
                        next-level-cache = <&L2_700>;
                        operating-points-v2 = <&cpu6_opp_table>;
-                       interconnects = <&gem_noc MASTER_APPSS_PROC 3 &mc_virt SLAVE_EBI1 3>,
-                                       <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
+                       interconnects = <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
                        #cooling-cells = <2>;
                        qcom,freq-domain = <&cpufreq_hw 1>;
                        L2_700: l2-cache {
@@ -386,52 +379,52 @@
 
                cpu0_opp1: opp-300000000 {
                        opp-hz = /bits/ 64 <300000000>;
-                       opp-peak-kBps = <1200000 4800000>;
+                       opp-peak-kBps = <4800000>;
                };
 
                cpu0_opp2: opp-576000000 {
                        opp-hz = /bits/ 64 <576000000>;
-                       opp-peak-kBps = <1200000 4800000>;
+                       opp-peak-kBps = <4800000>;
                };
 
                cpu0_opp3: opp-768000000 {
                        opp-hz = /bits/ 64 <768000000>;
-                       opp-peak-kBps = <1200000 4800000>;
+                       opp-peak-kBps = <4800000>;
                };
 
                cpu0_opp4: opp-1017600000 {
                        opp-hz = /bits/ 64 <1017600000>;
-                       opp-peak-kBps = <1804000 8908800>;
+                       opp-peak-kBps = <8908800>;
                };
 
                cpu0_opp5: opp-1248000000 {
                        opp-hz = /bits/ 64 <1248000000>;
-                       opp-peak-kBps = <2188000 12902400>;
+                       opp-peak-kBps = <12902400>;
                };
 
                cpu0_opp6: opp-1324800000 {
                        opp-hz = /bits/ 64 <1324800000>;
-                       opp-peak-kBps = <2188000 12902400>;
+                       opp-peak-kBps = <12902400>;
                };
 
                cpu0_opp7: opp-1516800000 {
                        opp-hz = /bits/ 64 <1516800000>;
-                       opp-peak-kBps = <3072000 15052800>;
+                       opp-peak-kBps = <15052800>;
                };
 
                cpu0_opp8: opp-1612800000 {
                        opp-hz = /bits/ 64 <1612800000>;
-                       opp-peak-kBps = <3072000 15052800>;
+                       opp-peak-kBps = <15052800>;
                };
 
                cpu0_opp9: opp-1708800000 {
                        opp-hz = /bits/ 64 <1708800000>;
-                       opp-peak-kBps = <3072000 15052800>;
+                       opp-peak-kBps = <15052800>;
                };
 
                cpu0_opp10: opp-1804800000 {
                        opp-hz = /bits/ 64 <1804800000>;
-                       opp-peak-kBps = <4068000 22425600>;
+                       opp-peak-kBps = <22425600>;
                };
        };
 
@@ -441,82 +434,82 @@
 
                cpu6_opp1: opp-300000000 {
                        opp-hz = /bits/ 64 <300000000>;
-                       opp-peak-kBps = <2188000 8908800>;
+                       opp-peak-kBps = <8908800>;
                };
 
                cpu6_opp2: opp-652800000 {
                        opp-hz = /bits/ 64 <652800000>;
-                       opp-peak-kBps = <2188000 8908800>;
+                       opp-peak-kBps = <8908800>;
                };
 
                cpu6_opp3: opp-825600000 {
                        opp-hz = /bits/ 64 <825600000>;
-                       opp-peak-kBps = <2188000 8908800>;
+                       opp-peak-kBps = <8908800>;
                };
 
                cpu6_opp4: opp-979200000 {
                        opp-hz = /bits/ 64 <979200000>;
-                       opp-peak-kBps = <2188000 8908800>;
+                       opp-peak-kBps = <8908800>;
                };
 
                cpu6_opp5: opp-1113600000 {
                        opp-hz = /bits/ 64 <1113600000>;
-                       opp-peak-kBps = <2188000 8908800>;
+                       opp-peak-kBps = <8908800>;
                };
 
                cpu6_opp6: opp-1267200000 {
                        opp-hz = /bits/ 64 <1267200000>;
-                       opp-peak-kBps = <4068000 12902400>;
+                       opp-peak-kBps = <12902400>;
                };
 
                cpu6_opp7: opp-1555200000 {
                        opp-hz = /bits/ 64 <1555200000>;
-                       opp-peak-kBps = <4068000 15052800>;
+                       opp-peak-kBps = <15052800>;
                };
 
                cpu6_opp8: opp-1708800000 {
                        opp-hz = /bits/ 64 <1708800000>;
-                       opp-peak-kBps = <6220000 19353600>;
+                       opp-peak-kBps = <19353600>;
                };
 
                cpu6_opp9: opp-1843200000 {
                        opp-hz = /bits/ 64 <1843200000>;
-                       opp-peak-kBps = <6220000 19353600>;
+                       opp-peak-kBps = <19353600>;
                };
 
                cpu6_opp10: opp-1900800000 {
                        opp-hz = /bits/ 64 <1900800000>;
-                       opp-peak-kBps = <6220000 22425600>;
+                       opp-peak-kBps = <22425600>;
                };
 
                cpu6_opp11: opp-1996800000 {
                        opp-hz = /bits/ 64 <1996800000>;
-                       opp-peak-kBps = <6220000 22425600>;
+                       opp-peak-kBps = <22425600>;
                };
 
                cpu6_opp12: opp-2112000000 {
                        opp-hz = /bits/ 64 <2112000000>;
-                       opp-peak-kBps = <6220000 22425600>;
+                       opp-peak-kBps = <22425600>;
                };
 
                cpu6_opp13: opp-2208000000 {
                        opp-hz = /bits/ 64 <2208000000>;
-                       opp-peak-kBps = <7216000 22425600>;
+                       opp-peak-kBps = <22425600>;
                };
 
                cpu6_opp14: opp-2323200000 {
                        opp-hz = /bits/ 64 <2323200000>;
-                       opp-peak-kBps = <7216000 22425600>;
+                       opp-peak-kBps = <22425600>;
                };
 
                cpu6_opp15: opp-2400000000 {
                        opp-hz = /bits/ 64 <2400000000>;
-                       opp-peak-kBps = <8532000 23347200>;
+                       opp-peak-kBps = <23347200>;
                };
 
                cpu6_opp16: opp-2553600000 {
                        opp-hz = /bits/ 64 <2553600000>;
-                       opp-peak-kBps = <8532000 23347200>;
+                       opp-peak-kBps = <23347200>;
                };
        };
 
@@ -2773,6 +2766,90 @@
                        };
                };
 
+               pmu@90b6300 {
+                       compatible = "qcom,sc7180-cpu-bwmon", "qcom,sdm845-bwmon";
+                       reg = <0 0x090b6300 0 0x600>;
+                       interrupts = <GIC_SPI 581 IRQ_TYPE_LEVEL_HIGH>;
+
+                       interconnects = <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY
+                                        &gem_noc SLAVE_LLCC QCOM_ICC_TAG_ACTIVE_ONLY>;
+                       operating-points-v2 = <&cpu_bwmon_opp_table>;
+
+                       cpu_bwmon_opp_table: opp-table {
+                               compatible = "operating-points-v2";
+
+                               opp-0 {
+                                       opp-peak-kBps = <2288000>;
+                               };
+
+                               opp-1 {
+                                       opp-peak-kBps = <4577000>;
+                               };
+
+                               opp-2 {
+                                       opp-peak-kBps = <7110000>;
+                               };
+
+                               opp-3 {
+                                       opp-peak-kBps = <9155000>;
+                               };
+
+                               opp-4 {
+                                       opp-peak-kBps = <12298000>;
+                               };
+
+                               opp-5 {
+                                       opp-peak-kBps = <14236000>;
+                               };
+                       };
+               };
+
+               pmu@90cd000 {
+                       compatible = "qcom,sc7180-llcc-bwmon", "qcom,sc7280-llcc-bwmon";
+                       reg = <0 0x090cd000 0 0x1000>;
+                       interrupts = <GIC_SPI 241 IRQ_TYPE_LEVEL_HIGH>;
+
+                       interconnects = <&mc_virt MASTER_LLCC QCOM_ICC_TAG_ACTIVE_ONLY
+                                        &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ACTIVE_ONLY>;
+                       operating-points-v2 = <&llcc_bwmon_opp_table>;
+
+                       llcc_bwmon_opp_table: opp-table {
+                               compatible = "operating-points-v2";
+
+                               opp-0 {
+                                       opp-peak-kBps = <1144000>;
+                               };
+
+                               opp-1 {
+                                       opp-peak-kBps = <1720000>;
+                               };
+
+                               opp-2 {
+                                       opp-peak-kBps = <2086000>;
+                               };
+
+                               opp-3 {
+                                       opp-peak-kBps = <2929000>;
+                               };
+
+                               opp-4 {
+                                       opp-peak-kBps = <3879000>;
+                               };
+
+                               opp-5 {
+                                       opp-peak-kBps = <5931000>;
+                               };
+
+                               opp-6 {
+                                       opp-peak-kBps = <6881000>;
+                               };
+
+                               opp-7 {
+                                       opp-peak-kBps = <8137000>;
+                               };
+                       };
+               };
+
                dc_noc: interconnect@9160000 {
                        compatible = "qcom,sc7180-dc-noc";
                        reg = <0 0x09160000 0 0x03200>;