| Message ID | 20230625202547.174647-18-dmitry.baryshkov@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | ARM: qcom: apq8064: support CPU frequency scaling | expand |
On 26.06.2023 21:49, Dmitry Baryshkov wrote: > On 26/06/2023 19:40, Konrad Dybcio wrote: >> On 25.06.2023 22:25, Dmitry Baryshkov wrote: >>> Declare CPU frequency-scaling properties. Each CPU has its own clock, >>> how >> however? > > yes > >> >>> all CPUs have the same OPP table. Voltage scaling is not (yet) >>> enabled with this patch. It will be enabled later. >> Risky business. > > But it works :D On your machine ;) [...] >>> + kraitcc: clock-controller { >>> + compatible = "qcom,krait-cc-v1"; >> Are we sure we don't wanna rework this compatible? Check the comment in >> drivers/clk/qcom/krait-cc.c : krait_add_sec_mux() > > I remember that comment. I'd rather not introduce another compat string for such old hw. Would there be any direct benefits? > I'd say that the one we have here never made much sense.. Perhaps (since nobody used it for 10 years) it would make sense to remodel it.. Konrad >> >> >>> + clocks = <&gcc PLL9>, /* hfpll0 */ >>> + <&gcc PLL10>, /* hfpll1 */ >>> + <&gcc PLL16>, /* hfpll2 */ >>> + <&gcc PLL17>, /* hfpll3 */ >>> + <&gcc PLL12>, /* hfpll_l2 */ >>> + <&acc0>, >>> + <&acc1>, >>> + <&acc2>, >>> + <&acc3>, >>> + <&l2cc>; >>> + clock-names = "hfpll0", >>> + "hfpll1", >>> + "hfpll2", >>> + "hfpll3", >>> + "hfpll_l2", >>> + "acpu0_aux", >>> + "acpu1_aux", >>> + "acpu2_aux", >>> + "acpu3_aux", >>> + "acpu_l2_aux"; >>> + #clock-cells = <1>; >>> + #interconnect-cells = <1>; >>> + }; >>> + >>> sfpb_mutex: hwmutex { >>> compatible = "qcom,sfpb-mutex"; >>> syscon = <&sfpb_wrapper_mutex 0x604 0x4>; >>> @@ -933,6 +1100,9 @@ qfprom: qfprom@700000 { >>> #address-cells = <1>; >>> #size-cells = <1>; >>> ranges; >>> + speedbin_efuse: speedbin@c0 { >>> + reg = <0x0c0 0x4>; >>> + }; >> Newline between properties and subnodes & between individual subnodes, >> please > > ack. > >> >> Konrad >>> tsens_calib: calib@404 { >>> reg = <0x404 0x10>; >>> }; >
On Tue, 27 Jun 2023 at 15:13, Konrad Dybcio <konrad.dybcio@linaro.org> wrote: > > On 26.06.2023 21:49, Dmitry Baryshkov wrote: > > On 26/06/2023 19:40, Konrad Dybcio wrote: > >> On 25.06.2023 22:25, Dmitry Baryshkov wrote: > >>> Declare CPU frequency-scaling properties. Each CPU has its own clock, > >>> how > >> however? > > > > yes > > > >> > >>> all CPUs have the same OPP table. Voltage scaling is not (yet) > >>> enabled with this patch. It will be enabled later. > >> Risky business. > > > > But it works :D > On your machine ;) On two nexus-7 and one ifc6410. > > [...] > > >>> + kraitcc: clock-controller { > >>> + compatible = "qcom,krait-cc-v1"; > >> Are we sure we don't wanna rework this compatible? Check the comment in > >> drivers/clk/qcom/krait-cc.c : krait_add_sec_mux() > > > > I remember that comment. I'd rather not introduce another compat string for such old hw. Would there be any direct benefits? > > > I'd say that the one we have here never made much sense.. Perhaps (since > nobody used it for 10 years) it would make sense to remodel it.. Well we have the bindings for this driver. And also it was used by the OpenWRT people, IIRC. Thus I don't feel comfortable with throwing out old compat strings. > > Konrad > >> > >> > >>> + clocks = <&gcc PLL9>, /* hfpll0 */ > >>> + <&gcc PLL10>, /* hfpll1 */ > >>> + <&gcc PLL16>, /* hfpll2 */ > >>> + <&gcc PLL17>, /* hfpll3 */ > >>> + <&gcc PLL12>, /* hfpll_l2 */ > >>> + <&acc0>, > >>> + <&acc1>, > >>> + <&acc2>, > >>> + <&acc3>, > >>> + <&l2cc>; > >>> + clock-names = "hfpll0", > >>> + "hfpll1", > >>> + "hfpll2", > >>> + "hfpll3", > >>> + "hfpll_l2", > >>> + "acpu0_aux", > >>> + "acpu1_aux", > >>> + "acpu2_aux", > >>> + "acpu3_aux", > >>> + "acpu_l2_aux"; > >>> + #clock-cells = <1>; > >>> + #interconnect-cells = <1>; > >>> + }; > >>> + > >>> sfpb_mutex: hwmutex { > >>> compatible = "qcom,sfpb-mutex"; > >>> syscon = <&sfpb_wrapper_mutex 0x604 0x4>; > >>> @@ -933,6 +1100,9 @@ qfprom: qfprom@700000 { > >>> #address-cells = <1>; > >>> #size-cells = <1>; > >>> ranges; > >>> + speedbin_efuse: speedbin@c0 { > >>> + reg = <0x0c0 0x4>; > >>> + }; > >> Newline between properties and subnodes & between individual subnodes, > >> please > > > > ack. > > > >> > >> Konrad > >>> tsens_calib: calib@404 { > >>> reg = <0x404 0x10>; > >>> }; > >
On 27.06.2023 16:11, Dmitry Baryshkov wrote: > On Tue, 27 Jun 2023 at 15:13, Konrad Dybcio <konrad.dybcio@linaro.org> wrote: >> >> On 26.06.2023 21:49, Dmitry Baryshkov wrote: >>> On 26/06/2023 19:40, Konrad Dybcio wrote: >>>> On 25.06.2023 22:25, Dmitry Baryshkov wrote: >>>>> Declare CPU frequency-scaling properties. Each CPU has its own clock, >>>>> how >>>> however? >>> >>> yes >>> >>>> >>>>> all CPUs have the same OPP table. Voltage scaling is not (yet) >>>>> enabled with this patch. It will be enabled later. >>>> Risky business. >>> >>> But it works :D >> On your machine ;) > > On two nexus-7 and one ifc6410. > >> >> [...] >> >>>>> + kraitcc: clock-controller { >>>>> + compatible = "qcom,krait-cc-v1"; >>>> Are we sure we don't wanna rework this compatible? Check the comment in >>>> drivers/clk/qcom/krait-cc.c : krait_add_sec_mux() >>> >>> I remember that comment. I'd rather not introduce another compat string for such old hw. Would there be any direct benefits? >>> >> I'd say that the one we have here never made much sense.. Perhaps (since >> nobody used it for 10 years) it would make sense to remodel it.. > > Well we have the bindings for this driver. And also it was used by the > OpenWRT people, IIRC. > Thus I don't feel comfortable with throwing out old compat strings. Oh, OK Konrad > >> >> Konrad >>>> >>>> >>>>> + clocks = <&gcc PLL9>, /* hfpll0 */ >>>>> + <&gcc PLL10>, /* hfpll1 */ >>>>> + <&gcc PLL16>, /* hfpll2 */ >>>>> + <&gcc PLL17>, /* hfpll3 */ >>>>> + <&gcc PLL12>, /* hfpll_l2 */ >>>>> + <&acc0>, >>>>> + <&acc1>, >>>>> + <&acc2>, >>>>> + <&acc3>, >>>>> + <&l2cc>; >>>>> + clock-names = "hfpll0", >>>>> + "hfpll1", >>>>> + "hfpll2", >>>>> + "hfpll3", >>>>> + "hfpll_l2", >>>>> + "acpu0_aux", >>>>> + "acpu1_aux", >>>>> + "acpu2_aux", >>>>> + "acpu3_aux", >>>>> + "acpu_l2_aux"; >>>>> + #clock-cells = <1>; >>>>> + #interconnect-cells = <1>; >>>>> + }; >>>>> + >>>>> sfpb_mutex: hwmutex { >>>>> compatible = "qcom,sfpb-mutex"; >>>>> syscon = <&sfpb_wrapper_mutex 0x604 0x4>; >>>>> @@ -933,6 +1100,9 @@ qfprom: qfprom@700000 { >>>>> #address-cells = <1>; >>>>> #size-cells = <1>; >>>>> ranges; >>>>> + speedbin_efuse: speedbin@c0 { >>>>> + reg = <0x0c0 0x4>; >>>>> + }; >>>> Newline between properties and subnodes & between individual subnodes, >>>> please >>> >>> ack. >>> >>>> >>>> Konrad >>>>> tsens_calib: calib@404 { >>>>> reg = <0x404 0x10>; >>>>> }; >>> > > >
diff --git a/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi index ac07170c702f..e4d2fd48d843 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-apq8064.dtsi @@ -2,11 +2,13 @@ /dts-v1/; #include <dt-bindings/clock/qcom,gcc-msm8960.h> +#include <dt-bindings/clock/qcom,krait-cc.h> #include <dt-bindings/clock/qcom,lcc-msm8960.h> #include <dt-bindings/reset/qcom,gcc-msm8960.h> #include <dt-bindings/clock/qcom,mmcc-msm8960.h> #include <dt-bindings/clock/qcom,rpmcc.h> #include <dt-bindings/soc/qcom,gsbi.h> +#include <dt-bindings/soc/qcom,krait-l2-cache.h> #include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/arm-gic.h> / { @@ -45,6 +47,12 @@ CPU0: cpu@0 { qcom,acc = <&acc0>; qcom,saw = <&saw0>; cpu-idle-states = <&CPU_SPC>; + clocks = <&kraitcc KRAIT_CPU_0>; + clock-names = "cpu"; + clock-latency = <100000>; + interconnects = <&L2 MASTER_KRAIT_L2 &L2 SLAVE_KRAIT_L2>; + operating-points-v2 = <&cpu_opp_table>; + #cooling-cells = <2>; }; CPU1: cpu@1 { @@ -56,6 +64,12 @@ CPU1: cpu@1 { qcom,acc = <&acc1>; qcom,saw = <&saw1>; cpu-idle-states = <&CPU_SPC>; + clocks = <&kraitcc KRAIT_CPU_1>; + clock-names = "cpu"; + clock-latency = <100000>; + interconnects = <&L2 MASTER_KRAIT_L2 &L2 SLAVE_KRAIT_L2>; + operating-points-v2 = <&cpu_opp_table>; + #cooling-cells = <2>; }; CPU2: cpu@2 { @@ -67,6 +81,12 @@ CPU2: cpu@2 { qcom,acc = <&acc2>; qcom,saw = <&saw2>; cpu-idle-states = <&CPU_SPC>; + clocks = <&kraitcc KRAIT_CPU_2>; + clock-names = "cpu"; + clock-latency = <100000>; + interconnects = <&L2 MASTER_KRAIT_L2 &L2 SLAVE_KRAIT_L2>; + operating-points-v2 = <&cpu_opp_table>; + #cooling-cells = <2>; }; CPU3: cpu@3 { @@ -78,6 +98,12 @@ CPU3: cpu@3 { qcom,acc = <&acc3>; qcom,saw = <&saw3>; cpu-idle-states = <&CPU_SPC>; + clocks = <&kraitcc KRAIT_CPU_3>; + clock-names = "cpu"; + clock-latency = <100000>; + interconnects = <&L2 MASTER_KRAIT_L2 &L2 SLAVE_KRAIT_L2>; + operating-points-v2 = <&cpu_opp_table>; + #cooling-cells = <2>; }; L2: l2-cache { @@ -196,6 +222,121 @@ CPU_SPC: spc { }; }; + cpu_opp_table: opp-table-cpu { + compatible = "operating-points-v2-krait-cpu"; + nvmem-cells = <&speedbin_efuse>; + + /* + * Voltage thresholds are <target min max> + */ + opp-384000000 { + opp-hz = /bits/ 64 <384000000>; + opp-peak-kBps = <384000>; + opp-supported-hw = <0x4007>; + /* + * higher latency as it requires switching between + * clock sources + */ + clock-latency-ns = <244144>; + }; + + opp-486000000 { + opp-hz = /bits/ 64 <486000000>; + opp-peak-kBps = <648000>; + opp-supported-hw = <0x4007>; + }; + + opp-594000000 { + opp-hz = /bits/ 64 <594000000>; + opp-peak-kBps = <648000>; + opp-supported-hw = <0x4007>; + }; + + opp-702000000 { + opp-hz = /bits/ 64 <702000000>; + opp-peak-kBps = <648000>; + opp-supported-hw = <0x4007>; + }; + + opp-810000000 { + opp-hz = /bits/ 64 <810000000>; + opp-peak-kBps = <648000>; + opp-supported-hw = <0x4007>; + }; + + opp-918000000 { + opp-hz = /bits/ 64 <918000000>; + opp-peak-kBps = <648000>; + opp-supported-hw = <0x4007>; + }; + + opp-1026000000 { + opp-hz = /bits/ 64 <1026000000>; + opp-peak-kBps = <648000>; + opp-supported-hw = <0x4007>; + }; + + opp-1134000000 { + opp-hz = /bits/ 64 <1134000000>; + opp-peak-kBps = <1134000>; + opp-supported-hw = <0x4007>; + }; + + opp-1242000000 { + opp-hz = /bits/ 64 <1242000000>; + opp-peak-kBps = <1134000>; + opp-supported-hw = <0x4007>; + }; + + opp-1350000000 { + opp-hz = /bits/ 64 <1350000000>; + opp-peak-kBps = <1134000>; + opp-supported-hw = <0x4007>; + }; + + opp-1458000000 { + opp-hz = /bits/ 64 <1458000000>; + opp-peak-kBps = <1134000>; + opp-supported-hw = <0x4007>; + }; + + opp-1512000000 { + opp-hz = /bits/ 64 <1512000000>; + opp-peak-kBps = <1134000>; + opp-supported-hw = <0x4001>; + }; + + opp-1566000000 { + opp-hz = /bits/ 64 <1566000000>; + opp-peak-kBps = <1134000>; + opp-supported-hw = <0x06>; + }; + + opp-1674000000 { + opp-hz = /bits/ 64 <1674000000>; + opp-peak-kBps = <1134000>; + opp-supported-hw = <0x06>; + }; + + opp-1728000000 { + opp-hz = /bits/ 64 <1728000000>; + opp-peak-kBps = <1134000>; + opp-supported-hw = <0x02>; + }; + + opp-1782000000 { + opp-hz = /bits/ 64 <1782000000>; + opp-peak-kBps = <1134000>; + opp-supported-hw = <0x04>; + }; + + opp-1890000000 { + opp-hz = /bits/ 64 <1890000000>; + opp-peak-kBps = <1134000>; + opp-supported-hw = <0x04>; + }; + }; + memory@0 { device_type = "memory"; reg = <0x0 0x0>; @@ -312,6 +453,32 @@ sleep_clk: sleep_clk { }; }; + kraitcc: clock-controller { + compatible = "qcom,krait-cc-v1"; + clocks = <&gcc PLL9>, /* hfpll0 */ + <&gcc PLL10>, /* hfpll1 */ + <&gcc PLL16>, /* hfpll2 */ + <&gcc PLL17>, /* hfpll3 */ + <&gcc PLL12>, /* hfpll_l2 */ + <&acc0>, + <&acc1>, + <&acc2>, + <&acc3>, + <&l2cc>; + clock-names = "hfpll0", + "hfpll1", + "hfpll2", + "hfpll3", + "hfpll_l2", + "acpu0_aux", + "acpu1_aux", + "acpu2_aux", + "acpu3_aux", + "acpu_l2_aux"; + #clock-cells = <1>; + #interconnect-cells = <1>; + }; + sfpb_mutex: hwmutex { compatible = "qcom,sfpb-mutex"; syscon = <&sfpb_wrapper_mutex 0x604 0x4>; @@ -933,6 +1100,9 @@ qfprom: qfprom@700000 { #address-cells = <1>; #size-cells = <1>; ranges; + speedbin_efuse: speedbin@c0 { + reg = <0x0c0 0x4>; + }; tsens_calib: calib@404 { reg = <0x404 0x10>; };
Declare CPU frequency-scaling properties. Each CPU has its own clock, how all CPUs have the same OPP table. Voltage scaling is not (yet) enabled with this patch. It will be enabled later. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- arch/arm/boot/dts/qcom/qcom-apq8064.dtsi | 170 +++++++++++++++++++++++ 1 file changed, 170 insertions(+)