From 42ef810658c6e6621451452bef3896dfe493a288 Mon Sep 17 00:00:00 2001 From: Yingchao Deng Date: Tue, 15 Oct 2024 14:30:18 +0800 Subject: [PATCH] ARM: dts: msm: Use reserved memory instead of CMA On qcom-6.6, the memory reserved for memory_dump_v2 should be configured as reserved memory instead of CMA. Change-Id: I181b9fc4431838879d3bb99ceafd4512bcf5914e Signed-off-by: Yingchao Deng --- qcom/pineapple-debug.dtsi | 827 +++++++++++++++++++------------------- 1 file changed, 414 insertions(+), 413 deletions(-) diff --git a/qcom/pineapple-debug.dtsi b/qcom/pineapple-debug.dtsi index 7b272c0d..144efbab 100644 --- a/qcom/pineapple-debug.dtsi +++ b/qcom/pineapple-debug.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved. */ #include @@ -10,11 +10,8 @@ #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 = <0 0x1800000>; }; }; @@ -4505,414 +4502,418 @@ compatible = "qcom,mem-dump"; memory-region = <&dump_mem>; - 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>; - }; - - l1_icache0 { - qcom,dump-size = <0x22100>; - qcom,dump-id = <0x60>; - }; - - l1_icache100 { - qcom,dump-size = <0x22100>; - qcom,dump-id = <0x61>; - }; - - l1_icache200 { - qcom,dump-size = <0x22100>; - qcom,dump-id = <0x62>; - }; - - l1_icache300 { - qcom,dump-size = <0x22100>; - qcom,dump-id = <0x63>; - }; - - l1_icache400 { - qcom,dump-size = <0x22100>; - qcom,dump-id = <0x64>; - }; - - l1_icache500 { - qcom,dump-size = <0x22100>; - qcom,dump-id = <0x65>; - }; - - l1_icache600 { - qcom,dump-size = <0x22100>; - qcom,dump-id = <0x66>; - }; - - l1_icache700 { - qcom,dump-size = <0x22100>; - qcom,dump-id = <0x67>; - }; - - l1_dcache0 { - qcom,dump-size = <0x12100>; - qcom,dump-id = <0x80>; - }; - - l1_dcache100 { - qcom,dump-size = <0x12100>; - qcom,dump-id = <0x81>; - }; - - l1_dcache200 { - qcom,dump-size = <0x1a100>; - qcom,dump-id = <0x82>; - }; - - l1_dcache300 { - qcom,dump-size = <0x1a100>; - qcom,dump-id = <0x83>; - }; - - l1_dcache400 { - qcom,dump-size = <0x1a100>; - qcom,dump-id = <0x84>; - }; - - l1_dcache500 { - qcom,dump-size = <0x1a100>; - qcom,dump-id = <0x85>; - }; - - l1_dcache600 { - qcom,dump-size = <0x1a100>; - qcom,dump-id = <0x86>; - }; - - l1_dcache700 { - qcom,dump-size = <0x1a100>; - qcom,dump-id = <0x87>; - }; - - l1_itlb700 { - qcom,dump-size = <0x600>; - qcom,dump-id = <0x27>; - }; - - l1_dtlb700 { - qcom,dump-size = <0xa00>; - qcom,dump-id = <0x47>; - }; - - l2_cache0 { - qcom,dump-size = <0x90100>; - qcom,dump-id = <0xc0>; - }; - - l2_cache100 { - qcom,dump-size = <0x90100>; - qcom,dump-id = <0xc1>; - }; - - l2_cache200 { - qcom,dump-size = <0xd0100>; - qcom,dump-id = <0xc2>; - }; - - l2_cache300 { - qcom,dump-size = <0xd0100>; - qcom,dump-id = <0xc3>; - }; - - l2_cache400 { - qcom,dump-size = <0xd0100>; - qcom,dump-id = <0xc4>; - }; - - l2_cache500 { - qcom,dump-size = <0xd0100>; - qcom,dump-id = <0xc5>; - }; - - l2_cache600 { - qcom,dump-size = <0xd0100>; - qcom,dump-id = <0xc6>; - }; - - l2_cache700 { - qcom,dump-size = <0x340100>; - qcom,dump-id = <0xc7>; - }; - - l2_tlb0 { - qcom,dump-size = <0xf700>; - qcom,dump-id = <0x120>; - }; - - l2_tlb100 { - qcom,dump-size = <0xf700>; - qcom,dump-id = <0x121>; - }; - - l2_tlb700 { - qcom,dump-size = <0xa900>; - qcom,dump-id = <0x127>; - }; - - l1dcdirty0 { - qcom,dump-size = <0x2100>; - qcom,dump-id = <0x170>; - }; - - l1dcdirty100 { - qcom,dump-size = <0x2100>; - qcom,dump-id = <0x171>; - }; - - l1dcmte0 { - qcom,dump-size = <0x2100>; - qcom,dump-id = <0x180>; - }; - - l1dcmte100 { - qcom,dump-size = <0x2100>; - qcom,dump-id = <0x181>; - }; - - l2dcmte0 { - qcom,dump-size = <0x10100>; - qcom,dump-id = <0x190>; - }; - - l2dcmte100 { - qcom,dump-size = <0x10100>; - qcom,dump-id = <0x191>; - }; - - l0mopca700 { - qcom,dump-size = <0x4100>; - qcom,dump-id = <0x1a7>; - }; - - l2victim700 { - qcom,dump-size = <0x2100>; - qcom,dump-id = <0x1e7>; - }; - - l2tldtcsp200 { - qcom,dump-size = <0x7900>; - qcom,dump-id = <0x202>; - }; - - l2tldtcsp300 { - qcom,dump-size = <0x7900>; - qcom,dump-id = <0x203>; - }; - - l2tldtcsp400 { - qcom,dump-size = <0x7900>; - qcom,dump-id = <0x204>; - }; - - l2tldtcsp500 { - qcom,dump-size = <0x7900>; - qcom,dump-id = <0x205>; - }; - - l2tldtcsp600 { - qcom,dump-size = <0x7900>; - qcom,dump-id = <0x206>; - }; - - l2tldtcmp200 { - qcom,dump-size = <0x1300>; - qcom,dump-id = <0x212>; - }; - - l2tldtcmp300 { - qcom,dump-size = <0x1300>; - qcom,dump-id = <0x213>; - }; - - l2tldtcmp400 { - qcom,dump-size = <0x1300>; - qcom,dump-id = <0x214>; - }; - - l2tldtcmp500 { - qcom,dump-size = <0x1300>; - qcom,dump-id = <0x215>; - }; - - l2tldtcmp600 { - qcom,dump-size = <0x1300>; - qcom,dump-id = <0x216>; - }; - - cpuss_reg { - qcom,dump-size = <0x36000>; - qcom,dump-id = <0xef>; - }; - - 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>; - }; - - 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>; - }; - - scandump_smmu { - qcom,dump-size = <0x40000>; - qcom,dump-id = <0x220>; - }; - - scandump_gpu { - qcom,dump-size = <0x300000>; - qcom,dump-id = <0x221>; + 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>; + }; + + l1_icache0 { + qcom,dump-size = <0x22100>; + qcom,dump-id = <0x60>; + }; + + l1_icache100 { + qcom,dump-size = <0x22100>; + qcom,dump-id = <0x61>; + }; + + l1_icache200 { + qcom,dump-size = <0x22100>; + qcom,dump-id = <0x62>; + }; + + l1_icache300 { + qcom,dump-size = <0x22100>; + qcom,dump-id = <0x63>; + }; + + l1_icache400 { + qcom,dump-size = <0x22100>; + qcom,dump-id = <0x64>; + }; + + l1_icache500 { + qcom,dump-size = <0x22100>; + qcom,dump-id = <0x65>; + }; + + l1_icache600 { + qcom,dump-size = <0x22100>; + qcom,dump-id = <0x66>; + }; + + l1_icache700 { + qcom,dump-size = <0x22100>; + qcom,dump-id = <0x67>; + }; + + l1_dcache0 { + qcom,dump-size = <0x12100>; + qcom,dump-id = <0x80>; + }; + + l1_dcache100 { + qcom,dump-size = <0x12100>; + qcom,dump-id = <0x81>; + }; + + l1_dcache200 { + qcom,dump-size = <0x1a100>; + qcom,dump-id = <0x82>; + }; + + l1_dcache300 { + qcom,dump-size = <0x1a100>; + qcom,dump-id = <0x83>; + }; + + l1_dcache400 { + qcom,dump-size = <0x1a100>; + qcom,dump-id = <0x84>; + }; + + l1_dcache500 { + qcom,dump-size = <0x1a100>; + qcom,dump-id = <0x85>; + }; + + l1_dcache600 { + qcom,dump-size = <0x1a100>; + qcom,dump-id = <0x86>; + }; + + l1_dcache700 { + qcom,dump-size = <0x1a100>; + qcom,dump-id = <0x87>; + }; + + l1_itlb700 { + qcom,dump-size = <0x600>; + qcom,dump-id = <0x27>; + }; + + l1_dtlb700 { + qcom,dump-size = <0xa00>; + qcom,dump-id = <0x47>; + }; + + l2_cache0 { + qcom,dump-size = <0x90100>; + qcom,dump-id = <0xc0>; + }; + + l2_cache100 { + qcom,dump-size = <0x90100>; + qcom,dump-id = <0xc1>; + }; + + l2_cache200 { + qcom,dump-size = <0xd0100>; + qcom,dump-id = <0xc2>; + }; + + l2_cache300 { + qcom,dump-size = <0xd0100>; + qcom,dump-id = <0xc3>; + }; + + l2_cache400 { + qcom,dump-size = <0xd0100>; + qcom,dump-id = <0xc4>; + }; + + l2_cache500 { + qcom,dump-size = <0xd0100>; + qcom,dump-id = <0xc5>; + }; + + l2_cache600 { + qcom,dump-size = <0xd0100>; + qcom,dump-id = <0xc6>; + }; + + l2_cache700 { + qcom,dump-size = <0x340100>; + qcom,dump-id = <0xc7>; + }; + + l2_tlb0 { + qcom,dump-size = <0xf700>; + qcom,dump-id = <0x120>; + }; + + l2_tlb100 { + qcom,dump-size = <0xf700>; + qcom,dump-id = <0x121>; + }; + + l2_tlb700 { + qcom,dump-size = <0xa900>; + qcom,dump-id = <0x127>; + }; + + l1dcdirty0 { + qcom,dump-size = <0x2100>; + qcom,dump-id = <0x170>; + }; + + l1dcdirty100 { + qcom,dump-size = <0x2100>; + qcom,dump-id = <0x171>; + }; + + l1dcmte0 { + qcom,dump-size = <0x2100>; + qcom,dump-id = <0x180>; + }; + + l1dcmte100 { + qcom,dump-size = <0x2100>; + qcom,dump-id = <0x181>; + }; + + l2dcmte0 { + qcom,dump-size = <0x10100>; + qcom,dump-id = <0x190>; + }; + + l2dcmte100 { + qcom,dump-size = <0x10100>; + qcom,dump-id = <0x191>; + }; + + l0mopca700 { + qcom,dump-size = <0x4100>; + qcom,dump-id = <0x1a7>; + }; + + l2victim700 { + qcom,dump-size = <0x2100>; + qcom,dump-id = <0x1e7>; + }; + + l2tldtcsp200 { + qcom,dump-size = <0x7900>; + qcom,dump-id = <0x202>; + }; + + l2tldtcsp300 { + qcom,dump-size = <0x7900>; + qcom,dump-id = <0x203>; + }; + + l2tldtcsp400 { + qcom,dump-size = <0x7900>; + qcom,dump-id = <0x204>; + }; + + l2tldtcsp500 { + qcom,dump-size = <0x7900>; + qcom,dump-id = <0x205>; + }; + + l2tldtcsp600 { + qcom,dump-size = <0x7900>; + qcom,dump-id = <0x206>; + }; + + l2tldtcmp200 { + qcom,dump-size = <0x1300>; + qcom,dump-id = <0x212>; + }; + + l2tldtcmp300 { + qcom,dump-size = <0x1300>; + qcom,dump-id = <0x213>; + }; + + l2tldtcmp400 { + qcom,dump-size = <0x1300>; + qcom,dump-id = <0x214>; + }; + + l2tldtcmp500 { + qcom,dump-size = <0x1300>; + qcom,dump-id = <0x215>; + }; + + l2tldtcmp600 { + qcom,dump-size = <0x1300>; + qcom,dump-id = <0x216>; + }; + + cpuss_reg { + qcom,dump-size = <0x36000>; + qcom,dump-id = <0xef>; + }; + + 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>; + }; + + 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>; + }; + + scandump_smmu { + qcom,dump-size = <0x40000>; + qcom,dump-id = <0x220>; + }; + + scandump_gpu { + qcom,dump-size = <0x300000>; + qcom,dump-id = <0x221>; + }; }; }; };