From 623dd7ec576983e97c11c2d10a9a4f33cd1f60bc Mon Sep 17 00:00:00 2001 From: Finley Xiao Date: Mon, 27 Dec 2021 17:53:44 +0800 Subject: [PATCH] arm64: dts: rockchip: rk3588s: Use scmi clk for cpul Fix crash when cpufreq init. [ 3.454705][ T1] cpu cpu0: Failed to get cpu_leakage [ 3.455665][ T1] cpu cpu4: Failed to get cpu_leakage [ 3.456765][ T1] cpu cpu6: Failed to get cpu_leakage [ 3.459264][ T1] cpu cpu0: avs=0 [ 3.461442][ T1] cpu cpu4: avs=0 [ 3.463602][ T1] cpu cpu6: avs=0 [ 3.464385][ T1] cpu cpu0: l=-2147483648 h=2147483647 hyst=0 l_limit=0 h_limit=0 h_table=0 [ 3.465797][ T1] cpu cpu4: l=-2147483648 h=2147483647 hyst=0 l_limit=0 h_limit=0 h_table=0 [ 3.466850][ T1] Unable to handle kernel paging request at virtual address ffffff851e69c828 [ 3.467607][ T1] Mem abort info: [ 3.467915][ T1] ESR = 0x96000005 [ 3.468248][ T1] EC = 0x25: DABT (current EL), IL = 32 bits [ 3.468774][ T1] SET = 0, FnV = 0 [ 3.469104][ T1] EA = 0, S1PTW = 0 [ 3.469444][ T1] Data abort info: [ 3.469763][ T1] ISV = 0, ISS = 0x00000005 [ 3.470159][ T1] CM = 0, WnR = 0 [ 3.470481][ T1] swapper pgtable: 4k pages, 39-bit VAs, pgdp=000000000214e000 [ 3.471127][ T1] [ffffff851e69c828] pgd=0000000000000000, p4d=0000000000000000, pud=0000000000000000 [ 3.471956][ T1] Internal error: Oops: 96000005 [#1] PREEMPT SMP [ 3.472504][ T1] Modules linked in: [ 3.472838][ T1] CPU: 2 PID: 1 Comm: swapper/0 Not tainted 5.10.66 #606 [ 3.473440][ T1] Hardware name: Rockchip RK3588 EVB2 LP4 V10 Board (DT) [ 3.474044][ T1] pstate: 60800089 (nZCv daIf -PAN +UAO -TCO BTYPE=--) [ 3.474642][ T1] pc : cpudl_find+0x228/0x244 [ 3.475038][ T1] lr : cpudl_find+0x1f8/0x244 [ 3.475435][ T1] sp : ffffffc0123ab530 [ 3.475787][ T1] x29: ffffffc0123ab530 x28: ffffff8402f09230 [ 3.476316][ T1] x27: ffffffc011e9a580 x26: ffffffc01233a000 [ 3.476843][ T1] x25: ffffff8400328018 x24: ffffffc011e80b00 [ 3.477372][ T1] x23: ffffffc011e9a580 x22: 00000000ffffffff [ 3.477902][ T1] x21: ffffff8400f45c80 x20: 0000000000000000 [ 3.478431][ T1] x19: ffffff84fe69c830 x18: ffffffc0123a50f8 [ 3.478960][ T1] x17: 0000000000000056 x16: 0000000000000000 [ 3.479489][ T1] x15: 000000000000001d x14: 0000000000000000 [ 3.480017][ T1] x13: 0000000000000000 x12: 0000000000000378 [ 3.480545][ T1] x11: 0000000000000007 x10: 00000000ffffffff [ 3.481073][ T1] x9 : 8000000000000000 x8 : ffffff851e69c828 [ 3.481601][ T1] x7 : fefefefefefefefe x6 : ffffff8400f463ff [ 3.482131][ T1] x5 : 0000000000000000 x4 : ffffff84fe6b3220 [ 3.482659][ T1] x3 : 0000000000000000 x2 : 0000000000000006 [ 3.483187][ T1] x1 : 0000000000000008 x0 : 0000000000000008 Signed-off-by: Finley Xiao Change-Id: Ie7477c31c9d3ef4fd08235113f9571a86ca62228 --- arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi index 23e0f7265377..9aed32a6bbd6 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi @@ -315,7 +315,7 @@ reg = <0x0>; enable-method = "psci"; capacity-dmips-mhz = <530>; - clocks = <&cru ARMCLK_L>; + clocks = <&scmi_clk SCMI_CLK_CPUL>; operating-points-v2 = <&cluster0_opp_table>; cpu-idle-states = <&CPU_SLEEP>; }; @@ -326,7 +326,7 @@ reg = <0x100>; enable-method = "psci"; capacity-dmips-mhz = <530>; - clocks = <&cru ARMCLK_L>; + clocks = <&scmi_clk SCMI_CLK_CPUL>; operating-points-v2 = <&cluster0_opp_table>; cpu-idle-states = <&CPU_SLEEP>; }; @@ -337,7 +337,7 @@ reg = <0x200>; enable-method = "psci"; capacity-dmips-mhz = <530>; - clocks = <&cru ARMCLK_L>; + clocks = <&scmi_clk SCMI_CLK_CPUL>; operating-points-v2 = <&cluster0_opp_table>; cpu-idle-states = <&CPU_SLEEP>; }; @@ -348,7 +348,7 @@ reg = <0x300>; enable-method = "psci"; capacity-dmips-mhz = <530>; - clocks = <&cru ARMCLK_L>; + clocks = <&scmi_clk SCMI_CLK_CPUL>; operating-points-v2 = <&cluster0_opp_table>; cpu-idle-states = <&CPU_SLEEP>; };