Merge "ARM: dts: msm: move spr/cpuss_reg to dynamic dump"

qcom/sun-debug.dtsi

@@ -10,12 +10,9 @@
 	#size-cells = <2>;
 	ranges;
 
-	dump_mem: mem_dump_region {
+	dump_mem: dump_mem_region {
-		compatible = "shared-dma-pool";
 		alloc-ranges = <0x1 0x00000000 0xfffffffe 0xffffffff>;
-		reusable;
+		size = <0x0 0x5a00000>;
-		alignment = <0x0 0x400000>;
-		size = <0x0 0x5800000>;
 	};
 };
 
@@ -610,6 +607,9 @@
 		compatible = "qcom,mem-dump";
 		memory-region = <&dump_mem>;
 
+		static_dump {
+			qcom,static-mem-dump;
+
 			c0_context {
 				qcom,dump-size = <0x800>;
 				qcom,dump-id = <0x0>;
@@ -650,161 +650,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>;
@@ -825,6 +670,11 @@
 				qcom,dump-id = <0xee>;
 			};
 
+			misc_data {
+				qcom,dump-size = <0x1000>;
+				qcom,dump-id = <0xe8>;
+			};
+
 			etf_swao {
 				qcom,dump-size = <0x10000>;
 				qcom,dump-id = <0xf1>;
@@ -845,11 +695,6 @@
 				qcom,dump-id = <0x105>;
 			};
 
-		misc_data {
-			qcom,dump-size = <0x1000>;
-			qcom,dump-id = <0xe8>;
-		};
-
 			etf_slpi {
 				qcom,dump-size = <0x4000>;
 				qcom,dump-id = <0xf3>;
@@ -895,4 +740,181 @@
 				qcom,dump-id = <0x221>;
 			};
 		};
+
+		dynamic_mem_dump {
+			qcom,dynamic-mem-dump;
+
+			cpuss_reg {
+				cpuss_reg {
+					qcom,dump-size = <0xa00000>;
+					qcom,dump-id = <0xef>;
+				};
+			};
+
+			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>;
+				};
+			};
+
+			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>;
+				};
+			};
+
+			cluster_cache {
+				cl_cache0 {
+					qcom,dump-size = <0x1400000>;
+					qcom,dump-id = <0x240>;
+				};
+
+				cl_cache1 {
+					qcom,dump-size = <0x1400000>;
+					qcom,dump-id = <0x241>;
+				};
+
+			};
+		};
+	};
 };