From 857c487ffa8a402f6810f8a04e3bad4a258143a0 Mon Sep 17 00:00:00 2001
From: Xiaoqi Zhuang <quic_xiaozhua@quicinc.com>
Date: Tue, 16 Jul 2024 10:35:01 +0800
Subject: [PATCH 1/2] ARM: dts: msm: Modify dump_mem dts node property to adapt
 kernel-6.6 on monaco

For static-mem-dump, it's required to include in a child node.

Change-Id: Ic625878142c4a0c17bc6d2084d794f8d593b6fa8
Signed-off-by: Xiaoqi Zhuang <quic_xiaozhua@quicinc.com>
---
 qcom/monaco.dtsi | 163 ++++++++++++++++++++++++-----------------------
 1 file changed, 84 insertions(+), 79 deletions(-)

diff --git a/qcom/monaco.dtsi b/qcom/monaco.dtsi
index 63f5bec8..fc676346 100644
--- a/qcom/monaco.dtsi
+++ b/qcom/monaco.dtsi
@@ -719,105 +719,110 @@
 
 	mem_dump {
 		compatible = "qcom,mem-dump";
+		memory-region = <&dump_mem>;
 
-		c0_context {
-			qcom,dump-size = <0x800>;
-			qcom,dump-id = <0x0>;
-		};
+		static_dump {
+			qcom,static-mem-dump;
 
-		c1_context {
-			qcom,dump-size = <0x800>;
-			qcom,dump-id = <0x1>;
-		};
+			c0_context {
+				qcom,dump-size = <0x800>;
+				qcom,dump-id = <0x0>;
+			};
 
-		c2_context {
-			qcom,dump-size = <0x800>;
-			qcom,dump-id = <0x2>;
-		};
+			c1_context {
+				qcom,dump-size = <0x800>;
+				qcom,dump-id = <0x1>;
+			};
 
-		c3_context {
-			qcom,dump-size = <0x800>;
-			qcom,dump-id = <0x3>;
-		};
+			c2_context {
+				qcom,dump-size = <0x800>;
+				qcom,dump-id = <0x2>;
+			};
 
-		l1_icache0 {
-			qcom,dump-size = <0x9040>;
-			qcom,dump-id = <0x60>;
-		};
+			c3_context {
+				qcom,dump-size = <0x800>;
+				qcom,dump-id = <0x3>;
+			};
 
-		l1_icache1 {
-			qcom,dump-size = <0x9040>;
-			qcom,dump-id = <0x61>;
-		};
+			l1_icache0 {
+				qcom,dump-size = <0x9040>;
+				qcom,dump-id = <0x60>;
+			};
 
-		l1_icache2 {
-			qcom,dump-size = <0x9040>;
-			qcom,dump-id = <0x62>;
-		};
+			l1_icache1 {
+				qcom,dump-size = <0x9040>;
+				qcom,dump-id = <0x61>;
+			};
 
-		l1_icache3 {
-			qcom,dump-size = <0x9040>;
-			qcom,dump-id = <0x63>;
-		};
+			l1_icache2 {
+				qcom,dump-size = <0x9040>;
+				qcom,dump-id = <0x62>;
+			};
 
-		l1_dcache0 {
-			qcom,dump-size = <0x9040>;
-			qcom,dump-id = <0x80>;
-		};
+			l1_icache3 {
+				qcom,dump-size = <0x9040>;
+				qcom,dump-id = <0x63>;
+			};
 
-		l1_dcache1 {
-			qcom,dump-size = <0x9040>;
-			qcom,dump-id = <0x81>;
-		};
+			l1_dcache0 {
+				qcom,dump-size = <0x9040>;
+				qcom,dump-id = <0x80>;
+			};
 
-		l1_dcache2 {
-			qcom,dump-size = <0x9040>;
-			qcom,dump-id = <0x82>;
-		};
+			l1_dcache1 {
+				qcom,dump-size = <0x9040>;
+				qcom,dump-id = <0x81>;
+			};
 
-		l1_dcache3 {
-			qcom,dump-size = <0x9040>;
-			qcom,dump-id = <0x83>;
-		};
+			l1_dcache2 {
+				qcom,dump-size = <0x9040>;
+				qcom,dump-id = <0x82>;
+			};
 
-		l2_tlb0 {
-			qcom,dump-size = <0x2000>;
-			qcom,dump-id = <0x120>;
-		};
+			l1_dcache3 {
+				qcom,dump-size = <0x9040>;
+				qcom,dump-id = <0x83>;
+			};
 
-		l2_tlb1 {
-			qcom,dump-size = <0x2000>;
-			qcom,dump-id = <0x121>;
-		};
+			l2_tlb0 {
+				qcom,dump-size = <0x2000>;
+				qcom,dump-id = <0x120>;
+			};
 
-		l2_tlb2 {
-			qcom,dump-size = <0x2000>;
-			qcom,dump-id = <0x122>;
-		};
+			l2_tlb1 {
+				qcom,dump-size = <0x2000>;
+				qcom,dump-id = <0x121>;
+			};
 
-		l2_tlb3 {
-			qcom,dump-size = <0x2000>;
-			qcom,dump-id = <0x123>;
-		};
+			l2_tlb2 {
+				qcom,dump-size = <0x2000>;
+				qcom,dump-id = <0x122>;
+			};
 
-		pmic {
-			qcom,dump-size = <0x200000>;
-			qcom,dump-id = <0xe4>;
-		};
+			l2_tlb3 {
+				qcom,dump-size = <0x2000>;
+				qcom,dump-id = <0x123>;
+			};
 
-		tmc_etf {
-			qcom,dump-size = <0x8000>;
-			qcom,dump-id = <0xf0>;
-		};
+			pmic {
+				qcom,dump-size = <0x200000>;
+				qcom,dump-id = <0xe4>;
+			};
 
-		etr_reg {
-			qcom,dump-size = <0x1000>;
-			qcom,dump-id = <0x100>;
-		};
+			tmc_etf {
+				qcom,dump-size = <0x8000>;
+				qcom,dump-id = <0xf0>;
+			};
 
-		etf_reg {
-			qcom,dump-size = <0x1000>;
-			qcom,dump-id = <0x101>;
+			etr_reg {
+				qcom,dump-size = <0x1000>;
+				qcom,dump-id = <0x100>;
+			};
+
+			etf_reg {
+				qcom,dump-size = <0x1000>;
+				qcom,dump-id = <0x101>;
+			};
 		};
 	};
 

From b4682c47fb28821a6e8c945f13670aa5b85d33a2 Mon Sep 17 00:00:00 2001
From: Xiaoqi Zhuang <quic_xiaozhua@quicinc.com>
Date: Wed, 17 Jul 2024 10:21:52 +0800
Subject: [PATCH 2/2] ARM: dts: msm: Modify dump_mem dts node property to adapt
 kernel-6.6 on monaco

Remove DMA property for Reserved memory via memremap instead of DMA API.

Change-Id: I2c717dc3766df7df22f6750941da0e0d03824920
Signed-off-by: Xiaoqi Zhuang <quic_xiaozhua@quicinc.com>
---
 qcom/monaco.dtsi | 2 --
 1 file changed, 2 deletions(-)

diff --git a/qcom/monaco.dtsi b/qcom/monaco.dtsi
index fc676346..c1795622 100644
--- a/qcom/monaco.dtsi
+++ b/qcom/monaco.dtsi
@@ -274,9 +274,7 @@
 		};
 
 		dump_mem: mem_dump_region {
-			compatible = "shared-dma-pool";
 			alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
-			reusable;
 			size = <0 0x800000>;
 		};