From 18c5b67de5db54bcd5eae3ced92ccc2d13978634 Mon Sep 17 00:00:00 2001
From: Yuanfang Zhang <quic_yuanfang@quicinc.com>
Date: Thu, 16 May 2024 23:36:09 +0800
Subject: [PATCH] ARM: dts: msm: Use reserved memory instead of CMA

Use reserved memory instead of CMA for memdump node. The dump entries
are divided into two groups, one is static_dump, entries in this group
are enabled by default during startup. dynamic_dump is the other group,
entries in this group can be enabled/disabled after startup and disabled
on perf build.

Change-Id: I4f40cc29e2920cd0b2dd6b6b7285a770f1b39b3e
Signed-off-by: Yuanfang Zhang <quic_yuanfang@quicinc.com>
---
 qcom/sun-debug.dtsi | 544 +++++++++++++++++++++++---------------------
 1 file changed, 281 insertions(+), 263 deletions(-)

diff --git a/qcom/sun-debug.dtsi b/qcom/sun-debug.dtsi
index 822e5e5f..5d4d91d3 100644
--- a/qcom/sun-debug.dtsi
+++ b/qcom/sun-debug.dtsi
@@ -10,12 +10,9 @@
 	#size-cells = <2>;
 	ranges;
 
-	dump_mem: mem_dump_region {
-		compatible = "shared-dma-pool";
+	dump_mem: dump_mem_region {
 		alloc-ranges = <0x1 0x00000000 0xfffffffe 0xffffffff>;
-		reusable;
-		alignment = <0x0 0x400000>;
-		size = <0x0 0x5800000>;
+		size = <0x0 0x5a00000>;
 	};
 };
 
@@ -610,289 +607,310 @@
 		compatible = "qcom,mem-dump";
 		memory-region = <&dump_mem>;
 
-		c0_context {
-			qcom,dump-size = <0x800>;
-			qcom,dump-id = <0x0>;
+		static_dump {
+			qcom,static-mem-dump;
+
+			c0_context {
+				qcom,dump-size = <0x800>;
+				qcom,dump-id = <0x0>;
+			};
+
+			c100_context {
+				qcom,dump-size = <0x800>;
+				qcom,dump-id = <0x1>;
+			};
+
+			c200_context {
+				qcom,dump-size = <0x800>;
+				qcom,dump-id = <0x2>;
+			};
+
+			c300_context {
+				qcom,dump-size = <0x800>;
+				qcom,dump-id = <0x3>;
+			};
+
+			c400_context {
+				qcom,dump-size = <0x800>;
+				qcom,dump-id = <0x4>;
+			};
+
+			c500_context {
+				qcom,dump-size = <0x800>;
+				qcom,dump-id = <0x5>;
+			};
+
+			c600_context {
+				qcom,dump-size = <0x800>;
+				qcom,dump-id = <0x6>;
+			};
+
+			c700_context {
+				qcom,dump-size = <0x800>;
+				qcom,dump-id = <0x7>;
+			};
+
+			rpmh {
+				qcom,dump-size = <0x400000>;
+				qcom,dump-id = <0xec>;
+			};
+
+			rpm_sw {
+				qcom,dump-size = <0x28000>;
+				qcom,dump-id = <0xea>;
+			};
+
+			pmic {
+				qcom,dump-size = <0x200000>;
+				qcom,dump-id = <0xe4>;
+			};
+
+			fcm {
+				qcom,dump-size = <0x8400>;
+				qcom,dump-id = <0xee>;
+			};
+
+			misc_data {
+				qcom,dump-size = <0x1000>;
+				qcom,dump-id = <0xe8>;
+			};
+
+			etf_swao {
+				qcom,dump-size = <0x10000>;
+				qcom,dump-id = <0xf1>;
+			};
+
+			etr_reg {
+				qcom,dump-size = <0x1000>;
+				qcom,dump-id = <0x100>;
+			};
+
+			etfswao_reg {
+				qcom,dump-size = <0x1000>;
+				qcom,dump-id = <0x102>;
+			};
+
+			etr1_reg {
+				qcom,dump-size = <0x1000>;
+				qcom,dump-id = <0x105>;
+			};
+
+			etf_slpi {
+				qcom,dump-size = <0x4000>;
+				qcom,dump-id = <0xf3>;
+			};
+
+			etfslpi_reg {
+				qcom,dump-size = <0x1000>;
+				qcom,dump-id = <0x103>;
+			};
+
+			etf_lpass {
+				qcom,dump-size = <0x4000>;
+				qcom,dump-id = <0xf4>;
+			};
+
+			etflpass_reg {
+				qcom,dump-size = <0x1000>;
+				qcom,dump-id = <0x104>;
+			};
+
+			osm_reg {
+				qcom,dump-size = <0x400>;
+				qcom,dump-id = <0x163>;
+			};
+
+			pcu_reg {
+				qcom,dump-size = <0x400>;
+				qcom,dump-id = <0x164>;
+			};
+
+			fsm_data {
+				qcom,dump-size = <0x400>;
+				qcom,dump-id = <0x165>;
+			};
+
+			scandump_smmu {
+				qcom,dump-size = <0x40000>;
+				qcom,dump-id = <0x220>;
+			};
+
+			scandump_gpu {
+				qcom,dump-size = <0x300000>;
+				qcom,dump-id = <0x221>;
+			};
+
+			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>;
+			};
+
+			cpuss_reg {
+				qcom,dump-size = <0xa00000>;
+				qcom,dump-id = <0xef>;
+			};
 		};
 
-		c100_context {
-			qcom,dump-size = <0x800>;
-			qcom,dump-id = <0x1>;
-		};
+		dynamic_mem_dump {
+			qcom,dynamic-mem-dump;
 
-		c200_context {
-			qcom,dump-size = <0x800>;
-			qcom,dump-id = <0x2>;
-		};
+			cpuss_cpu {
+				cpuss_cpu0 {
+					qcom,dump-size = <0x40000>;
+					qcom,dump-id = <0x280>;
+				};
 
-		c300_context {
-			qcom,dump-size = <0x800>;
-			qcom,dump-id = <0x3>;
-		};
+				cpuss_cpu1 {
+					qcom,dump-size = <0x40000>;
+					qcom,dump-id = <0x281>;
+				};
 
-		c400_context {
-			qcom,dump-size = <0x800>;
-			qcom,dump-id = <0x4>;
-		};
+				cpuss_cpu2 {
+					qcom,dump-size = <0x40000>;
+					qcom,dump-id = <0x282>;
+				};
 
-		c500_context {
-			qcom,dump-size = <0x800>;
-			qcom,dump-id = <0x5>;
-		};
+				cpuss_cpu3 {
+					qcom,dump-size = <0x40000>;
+					qcom,dump-id = <0x283>;
+				};
 
-		c600_context {
-			qcom,dump-size = <0x800>;
-			qcom,dump-id = <0x6>;
-		};
+				cpuss_cpu4 {
+					qcom,dump-size = <0x40000>;
+					qcom,dump-id = <0x284>;
+				};
 
-		c700_context {
-			qcom,dump-size = <0x800>;
-			qcom,dump-id = <0x7>;
-		};
+				cpuss_cpu5 {
+					qcom,dump-size = <0x40000>;
+					qcom,dump-id = <0x285>;
+				};
 
-		cpuss_cpu0 {
-			qcom,dump-size = <0x40000>;
-			qcom,dump-id = <0x280>;
-		};
+				cpuss_cpu6 {
+					qcom,dump-size = <0x40000>;
+					qcom,dump-id = <0x286>;
+				};
 
-		cpuss_cpu1 {
-			qcom,dump-size = <0x40000>;
-			qcom,dump-id = <0x281>;
-		};
+				cpuss_cpu7 {
+					qcom,dump-size = <0x40000>;
+					qcom,dump-id = <0x287>;
+				};
+			};
 
-		cpuss_cpu2 {
-			qcom,dump-size = <0x40000>;
-			qcom,dump-id = <0x282>;
-		};
+			cpuss_cluster {
+				cpuss_cluster0 {
+					qcom,dump-size = <0x40000>;
+					qcom,dump-id = <0x270>;
+				};
 
-		cpuss_cpu3 {
-			qcom,dump-size = <0x40000>;
-			qcom,dump-id = <0x283>;
-		};
+				cpuss_cluster1 {
+					qcom,dump-size = <0x40000>;
+					qcom,dump-id = <0x271>;
+				};
+			};
 
-		cpuss_cpu4 {
-			qcom,dump-size = <0x40000>;
-			qcom,dump-id = <0x284>;
-		};
+			cpucp {
+				cpucp {
+					qcom,dump-size = <0x80000>;
+					qcom,dump-id = <0xf5>;
+				};
+			};
 
-		cpuss_cpu5 {
-			qcom,dump-size = <0x40000>;
-			qcom,dump-id = <0x285>;
-		};
+			apps_scandump {
+				scandump_apps {
+					qcom,dump-size = <0x380000>;
+					qcom,dump-id = <0x130>;
+				};
+			};
 
-		cpuss_cpu6 {
-			qcom,dump-size = <0x40000>;
-			qcom,dump-id = <0x286>;
-		};
+			cpu_cache {
+				cache_cpu0 {
+					qcom,dump-size = <0x2aa000>;
+					qcom,dump-id = <0x230>;
+				};
 
-		cpuss_cpu7 {
-			qcom,dump-size = <0x40000>;
-			qcom,dump-id = <0x287>;
-		};
+				cache_cpu1 {
+					qcom,dump-size = <0x2aa000>;
+					qcom,dump-id = <0x231>;
+				};
 
-		cpuss_cluster0 {
-			qcom,dump-size = <0x40000>;
-			qcom,dump-id = <0x270>;
-		};
+				cache_cpu2 {
+					qcom,dump-size = <0x2aa000>;
+					qcom,dump-id = <0x232>;
+				};
 
-		cpuss_cluster1 {
-			qcom,dump-size = <0x40000>;
-			qcom,dump-id = <0x271>;
-		};
+				cache_cpu3 {
+					qcom,dump-size = <0x2aa000>;
+					qcom,dump-id = <0x233>;
+				};
 
-		cpucp {
-			qcom,dump-size = <0x80000>;
-			qcom,dump-id = <0xf5>;
-		};
+				cache_cpu4 {
+					qcom,dump-size = <0x2aa000>;
+					qcom,dump-id = <0x234>;
+				};
 
-		scandump_apps {
-			qcom,dump-size = <0x380000>;
-			qcom,dump-id = <0x130>;
-		};
+				cache_cpu5 {
+					qcom,dump-size = <0x2aa000>;
+					qcom,dump-id = <0x235>;
+				};
 
-		cache_cpu0 {
-			qcom,dump-size = <0x2aa000>;
-			qcom,dump-id = <0x230>;
-		};
+				cache_cpu6 {
+					qcom,dump-size = <0x2aa000>;
+					qcom,dump-id = <0x236>;
+				};
 
-		cache_cpu1 {
-			qcom,dump-size = <0x2aa000>;
-			qcom,dump-id = <0x231>;
-		};
+				cache_cpu7 {
+					qcom,dump-size = <0x2aa000>;
+					qcom,dump-id = <0x237>;
+				};
+			};
 
-		cache_cpu2 {
-			qcom,dump-size = <0x2aa000>;
-			qcom,dump-id = <0x232>;
-		};
+			cluster_cache {
+				cl_cache0 {
+					qcom,dump-size = <0x1400000>;
+					qcom,dump-id = <0x240>;
+				};
 
-		cache_cpu3 {
-			qcom,dump-size = <0x2aa000>;
-			qcom,dump-id = <0x233>;
-		};
+				cl_cache1 {
+					qcom,dump-size = <0x1400000>;
+					qcom,dump-id = <0x241>;
+				};
 
-		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>;
-		};
-
-		rpm_sw {
-			qcom,dump-size = <0x28000>;
-			qcom,dump-id = <0xea>;
-		};
-
-		pmic {
-			qcom,dump-size = <0x200000>;
-			qcom,dump-id = <0xe4>;
-		};
-
-		fcm {
-			qcom,dump-size = <0x8400>;
-			qcom,dump-id = <0xee>;
-		};
-
-		etf_swao {
-			qcom,dump-size = <0x10000>;
-			qcom,dump-id = <0xf1>;
-		};
-
-		etr_reg {
-			qcom,dump-size = <0x1000>;
-			qcom,dump-id = <0x100>;
-		};
-
-		etfswao_reg {
-			qcom,dump-size = <0x1000>;
-			qcom,dump-id = <0x102>;
-		};
-
-		etr1_reg {
-			qcom,dump-size = <0x1000>;
-			qcom,dump-id = <0x105>;
-		};
-
-		misc_data {
-			qcom,dump-size = <0x1000>;
-			qcom,dump-id = <0xe8>;
-		};
-
-		etf_slpi {
-			qcom,dump-size = <0x4000>;
-			qcom,dump-id = <0xf3>;
-		};
-
-		etfslpi_reg {
-			qcom,dump-size = <0x1000>;
-			qcom,dump-id = <0x103>;
-		};
-
-		etf_lpass {
-			qcom,dump-size = <0x4000>;
-			qcom,dump-id = <0xf4>;
-		};
-
-		etflpass_reg {
-			qcom,dump-size = <0x1000>;
-			qcom,dump-id = <0x104>;
-		};
-
-		osm_reg {
-			qcom,dump-size = <0x400>;
-			qcom,dump-id = <0x163>;
-		};
-
-		pcu_reg {
-			qcom,dump-size = <0x400>;
-			qcom,dump-id = <0x164>;
-		};
-
-		fsm_data {
-			qcom,dump-size = <0x400>;
-			qcom,dump-id = <0x165>;
-		};
-
-		scandump_smmu {
-			qcom,dump-size = <0x40000>;
-			qcom,dump-id = <0x220>;
-		};
-
-		scandump_gpu {
-			qcom,dump-size = <0x300000>;
-			qcom,dump-id = <0x221>;
+			};
 		};
 	};
 };