From 5deaa1508989c7b6ffc3b649bdd818028490fd7d Mon Sep 17 00:00:00 2001 From: Yuanfang Zhang Date: Wed, 6 Mar 2024 15:21:16 +0800 Subject: [PATCH] ARM: dts: msm: move cpu related dump entry to dynamic mem dump Move cpu related dump entries to dynamic mem dump, the reserved memory of these entries can be reclaimed if this dump entry is not enabled. Change-Id: I222b7e00e3d074b58c0fb6ba42f16fe2f33d842e Signed-off-by: Yuanfang Zhang --- qcom/sun-debug.dtsi | 340 ++++++++++++++++++++++++-------------------- 1 file changed, 184 insertions(+), 156 deletions(-) diff --git a/qcom/sun-debug.dtsi b/qcom/sun-debug.dtsi index 822e5e5f..0eb5d714 100644 --- a/qcom/sun-debug.dtsi +++ b/qcom/sun-debug.dtsi @@ -15,7 +15,12 @@ alloc-ranges = <0x1 0x00000000 0xfffffffe 0xffffffff>; reusable; alignment = <0x0 0x400000>; - size = <0x0 0x5800000>; + size = <0x0 0xc00000>; + }; + + dynamic_dump_mem: dynamic_dump_mem_region { + alloc-ranges = <0x1 0x00000000 0xfffffffe 0xffffffff>; + size = <0x0 0x4de0000>; }; }; @@ -650,161 +655,6 @@ qcom,dump-id = <0x7>; }; - cpuss_cpu0 { - qcom,dump-size = <0x40000>; - qcom,dump-id = <0x280>; - }; - - cpuss_cpu1 { - qcom,dump-size = <0x40000>; - qcom,dump-id = <0x281>; - }; - - cpuss_cpu2 { - qcom,dump-size = <0x40000>; - qcom,dump-id = <0x282>; - }; - - cpuss_cpu3 { - qcom,dump-size = <0x40000>; - qcom,dump-id = <0x283>; - }; - - cpuss_cpu4 { - qcom,dump-size = <0x40000>; - qcom,dump-id = <0x284>; - }; - - cpuss_cpu5 { - qcom,dump-size = <0x40000>; - qcom,dump-id = <0x285>; - }; - - cpuss_cpu6 { - qcom,dump-size = <0x40000>; - qcom,dump-id = <0x286>; - }; - - cpuss_cpu7 { - qcom,dump-size = <0x40000>; - qcom,dump-id = <0x287>; - }; - - cpuss_cluster0 { - qcom,dump-size = <0x40000>; - qcom,dump-id = <0x270>; - }; - - cpuss_cluster1 { - qcom,dump-size = <0x40000>; - qcom,dump-id = <0x271>; - }; - - cpucp { - qcom,dump-size = <0x80000>; - qcom,dump-id = <0xf5>; - }; - - scandump_apps { - qcom,dump-size = <0x380000>; - qcom,dump-id = <0x130>; - }; - - cache_cpu0 { - qcom,dump-size = <0x2aa000>; - qcom,dump-id = <0x230>; - }; - - cache_cpu1 { - qcom,dump-size = <0x2aa000>; - qcom,dump-id = <0x231>; - }; - - cache_cpu2 { - qcom,dump-size = <0x2aa000>; - qcom,dump-id = <0x232>; - }; - - cache_cpu3 { - qcom,dump-size = <0x2aa000>; - qcom,dump-id = <0x233>; - }; - - cache_cpu4 { - qcom,dump-size = <0x2aa000>; - qcom,dump-id = <0x234>; - }; - - cache_cpu5 { - qcom,dump-size = <0x2aa000>; - qcom,dump-id = <0x235>; - }; - - cache_cpu6 { - qcom,dump-size = <0x2aa000>; - qcom,dump-id = <0x236>; - }; - - cache_cpu7 { - qcom,dump-size = <0x2aa000>; - qcom,dump-id = <0x237>; - }; - - cpuss_reg { - qcom,dump-size = <0xa00000>; - qcom,dump-id = <0xef>; - }; - - spr_cpu0 { - qcom,dump-size = <0x2000>; - qcom,dump-id = <0x1f0>; - }; - - spr_cpu1 { - qcom,dump-size = <0x2000>; - qcom,dump-id = <0x1f1>; - }; - - spr_cpu2 { - qcom,dump-size = <0x2000>; - qcom,dump-id = <0x1f2>; - }; - - spr_cpu3 { - qcom,dump-size = <0x2000>; - qcom,dump-id = <0x1f3>; - }; - - spr_cpu4 { - qcom,dump-size = <0x2000>; - qcom,dump-id = <0x1f4>; - }; - - spr_cpu5 { - qcom,dump-size = <0x2000>; - qcom,dump-id = <0x1f5>; - }; - - spr_cpu6 { - qcom,dump-size = <0x2000>; - qcom,dump-id = <0x1f6>; - }; - - spr_cpu7 { - qcom,dump-size = <0x2000>; - qcom,dump-id = <0x1f7>; - }; - - cl_cache0 { - qcom,dump-size = <0x1400000>; - qcom,dump-id = <0x240>; - }; - - cl_cache1 { - qcom,dump-size = <0x1400000>; - qcom,dump-id = <0x241>; - }; - rpmh { qcom,dump-size = <0x400000>; qcom,dump-id = <0xec>; @@ -895,4 +745,182 @@ qcom,dump-id = <0x221>; }; }; + + dynamic_mem_dump { + compatible = "qcom,mem-dump"; + qcom,dynamic-mem-dump; + memory-region = <&dynamic_dump_mem>; + + cpuss_cpu { + cpuss_cpu0 { + qcom,dump-size = <0x40000>; + qcom,dump-id = <0x280>; + }; + + cpuss_cpu1 { + qcom,dump-size = <0x40000>; + qcom,dump-id = <0x281>; + }; + + cpuss_cpu2 { + qcom,dump-size = <0x40000>; + qcom,dump-id = <0x282>; + }; + + cpuss_cpu3 { + qcom,dump-size = <0x40000>; + qcom,dump-id = <0x283>; + }; + + cpuss_cpu4 { + qcom,dump-size = <0x40000>; + qcom,dump-id = <0x284>; + }; + + cpuss_cpu5 { + qcom,dump-size = <0x40000>; + qcom,dump-id = <0x285>; + }; + + cpuss_cpu6 { + qcom,dump-size = <0x40000>; + qcom,dump-id = <0x286>; + }; + + cpuss_cpu7 { + qcom,dump-size = <0x40000>; + qcom,dump-id = <0x287>; + }; + }; + + cpuss_cluster { + cpuss_cluster0 { + qcom,dump-size = <0x40000>; + qcom,dump-id = <0x270>; + }; + + cpuss_cluster1 { + qcom,dump-size = <0x40000>; + qcom,dump-id = <0x271>; + }; + }; + + cpucp { + cpucp { + qcom,dump-size = <0x80000>; + qcom,dump-id = <0xf5>; + }; + }; + + apps_scandump { + scandump_apps { + qcom,dump-size = <0x380000>; + qcom,dump-id = <0x130>; + }; + }; + + cpu_cache { + cache_cpu0 { + qcom,dump-size = <0x2aa000>; + qcom,dump-id = <0x230>; + }; + + cache_cpu1 { + qcom,dump-size = <0x2aa000>; + qcom,dump-id = <0x231>; + }; + + cache_cpu2 { + qcom,dump-size = <0x2aa000>; + qcom,dump-id = <0x232>; + }; + + cache_cpu3 { + qcom,dump-size = <0x2aa000>; + qcom,dump-id = <0x233>; + }; + + cache_cpu4 { + qcom,dump-size = <0x2aa000>; + qcom,dump-id = <0x234>; + }; + + cache_cpu5 { + qcom,dump-size = <0x2aa000>; + qcom,dump-id = <0x235>; + }; + + cache_cpu6 { + qcom,dump-size = <0x2aa000>; + qcom,dump-id = <0x236>; + }; + + cache_cpu7 { + qcom,dump-size = <0x2aa000>; + qcom,dump-id = <0x237>; + }; + }; + + spr { + spr_cpu0 { + qcom,dump-size = <0x2000>; + qcom,dump-id = <0x1f0>; + }; + + spr_cpu1 { + qcom,dump-size = <0x2000>; + qcom,dump-id = <0x1f1>; + }; + + spr_cpu2 { + qcom,dump-size = <0x2000>; + qcom,dump-id = <0x1f2>; + }; + + spr_cpu3 { + qcom,dump-size = <0x2000>; + qcom,dump-id = <0x1f3>; + }; + + spr_cpu4 { + qcom,dump-size = <0x2000>; + qcom,dump-id = <0x1f4>; + }; + + spr_cpu5 { + qcom,dump-size = <0x2000>; + qcom,dump-id = <0x1f5>; + }; + + spr_cpu6 { + qcom,dump-size = <0x2000>; + qcom,dump-id = <0x1f6>; + }; + + spr_cpu7 { + qcom,dump-size = <0x2000>; + qcom,dump-id = <0x1f7>; + }; + }; + + cluster_cache { + cl_cache0 { + qcom,dump-size = <0x1400000>; + qcom,dump-id = <0x240>; + }; + + cl_cache1 { + qcom,dump-size = <0x1400000>; + qcom,dump-id = <0x241>; + }; + + }; + + cpuss_reg { + cpuss_reg { + qcom,dump-size = <0xa00000>; + qcom,dump-id = <0xef>; + }; + }; + }; };