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 <quic_yingdeng@quicinc.com>
This commit is contained in:
Yingchao Deng
2024-10-15 14:30:18 +08:00
parent 3c86c8cc2a
commit 42ef810658

View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BSD-3-Clause // 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 <dt-bindings/soc/qcom,dcc_v2.h> #include <dt-bindings/soc/qcom,dcc_v2.h>
@@ -10,11 +10,8 @@
#size-cells = <2>; #size-cells = <2>;
ranges; ranges;
dump_mem: mem_dump_region { dump_mem: dump_mem_region {
compatible = "shared-dma-pool";
alloc-ranges = <0x1 0x00000000 0xfffffffe 0xffffffff>; alloc-ranges = <0x1 0x00000000 0xfffffffe 0xffffffff>;
reusable;
alignment = <0x0 0x400000>;
size = <0 0x1800000>; size = <0 0x1800000>;
}; };
}; };
@@ -4505,414 +4502,418 @@
compatible = "qcom,mem-dump"; compatible = "qcom,mem-dump";
memory-region = <&dump_mem>; memory-region = <&dump_mem>;
c0_context { static_dump {
qcom,dump-size = <0x800>; qcom,static-mem-dump;
qcom,dump-id = <0x0>;
}; c0_context {
qcom,dump-size = <0x800>;
c100_context { qcom,dump-id = <0x0>;
qcom,dump-size = <0x800>; };
qcom,dump-id = <0x1>;
}; c100_context {
qcom,dump-size = <0x800>;
c200_context { qcom,dump-id = <0x1>;
qcom,dump-size = <0x800>; };
qcom,dump-id = <0x2>;
}; c200_context {
qcom,dump-size = <0x800>;
c300_context { qcom,dump-id = <0x2>;
qcom,dump-size = <0x800>; };
qcom,dump-id = <0x3>;
}; c300_context {
qcom,dump-size = <0x800>;
c400_context { qcom,dump-id = <0x3>;
qcom,dump-size = <0x800>; };
qcom,dump-id = <0x4>;
}; c400_context {
qcom,dump-size = <0x800>;
c500_context { qcom,dump-id = <0x4>;
qcom,dump-size = <0x800>; };
qcom,dump-id = <0x5>;
}; c500_context {
qcom,dump-size = <0x800>;
c600_context { qcom,dump-id = <0x5>;
qcom,dump-size = <0x800>; };
qcom,dump-id = <0x6>;
}; c600_context {
qcom,dump-size = <0x800>;
c700_context { qcom,dump-id = <0x6>;
qcom,dump-size = <0x800>; };
qcom,dump-id = <0x7>;
}; c700_context {
qcom,dump-size = <0x800>;
l1_icache0 { qcom,dump-id = <0x7>;
qcom,dump-size = <0x22100>; };
qcom,dump-id = <0x60>;
}; l1_icache0 {
qcom,dump-size = <0x22100>;
l1_icache100 { qcom,dump-id = <0x60>;
qcom,dump-size = <0x22100>; };
qcom,dump-id = <0x61>;
}; l1_icache100 {
qcom,dump-size = <0x22100>;
l1_icache200 { qcom,dump-id = <0x61>;
qcom,dump-size = <0x22100>; };
qcom,dump-id = <0x62>;
}; l1_icache200 {
qcom,dump-size = <0x22100>;
l1_icache300 { qcom,dump-id = <0x62>;
qcom,dump-size = <0x22100>; };
qcom,dump-id = <0x63>;
}; l1_icache300 {
qcom,dump-size = <0x22100>;
l1_icache400 { qcom,dump-id = <0x63>;
qcom,dump-size = <0x22100>; };
qcom,dump-id = <0x64>;
}; l1_icache400 {
qcom,dump-size = <0x22100>;
l1_icache500 { qcom,dump-id = <0x64>;
qcom,dump-size = <0x22100>; };
qcom,dump-id = <0x65>;
}; l1_icache500 {
qcom,dump-size = <0x22100>;
l1_icache600 { qcom,dump-id = <0x65>;
qcom,dump-size = <0x22100>; };
qcom,dump-id = <0x66>;
}; l1_icache600 {
qcom,dump-size = <0x22100>;
l1_icache700 { qcom,dump-id = <0x66>;
qcom,dump-size = <0x22100>; };
qcom,dump-id = <0x67>;
}; l1_icache700 {
qcom,dump-size = <0x22100>;
l1_dcache0 { qcom,dump-id = <0x67>;
qcom,dump-size = <0x12100>; };
qcom,dump-id = <0x80>;
}; l1_dcache0 {
qcom,dump-size = <0x12100>;
l1_dcache100 { qcom,dump-id = <0x80>;
qcom,dump-size = <0x12100>; };
qcom,dump-id = <0x81>;
}; l1_dcache100 {
qcom,dump-size = <0x12100>;
l1_dcache200 { qcom,dump-id = <0x81>;
qcom,dump-size = <0x1a100>; };
qcom,dump-id = <0x82>;
}; l1_dcache200 {
qcom,dump-size = <0x1a100>;
l1_dcache300 { qcom,dump-id = <0x82>;
qcom,dump-size = <0x1a100>; };
qcom,dump-id = <0x83>;
}; l1_dcache300 {
qcom,dump-size = <0x1a100>;
l1_dcache400 { qcom,dump-id = <0x83>;
qcom,dump-size = <0x1a100>; };
qcom,dump-id = <0x84>;
}; l1_dcache400 {
qcom,dump-size = <0x1a100>;
l1_dcache500 { qcom,dump-id = <0x84>;
qcom,dump-size = <0x1a100>; };
qcom,dump-id = <0x85>;
}; l1_dcache500 {
qcom,dump-size = <0x1a100>;
l1_dcache600 { qcom,dump-id = <0x85>;
qcom,dump-size = <0x1a100>; };
qcom,dump-id = <0x86>;
}; l1_dcache600 {
qcom,dump-size = <0x1a100>;
l1_dcache700 { qcom,dump-id = <0x86>;
qcom,dump-size = <0x1a100>; };
qcom,dump-id = <0x87>;
}; l1_dcache700 {
qcom,dump-size = <0x1a100>;
l1_itlb700 { qcom,dump-id = <0x87>;
qcom,dump-size = <0x600>; };
qcom,dump-id = <0x27>;
}; l1_itlb700 {
qcom,dump-size = <0x600>;
l1_dtlb700 { qcom,dump-id = <0x27>;
qcom,dump-size = <0xa00>; };
qcom,dump-id = <0x47>;
}; l1_dtlb700 {
qcom,dump-size = <0xa00>;
l2_cache0 { qcom,dump-id = <0x47>;
qcom,dump-size = <0x90100>; };
qcom,dump-id = <0xc0>;
}; l2_cache0 {
qcom,dump-size = <0x90100>;
l2_cache100 { qcom,dump-id = <0xc0>;
qcom,dump-size = <0x90100>; };
qcom,dump-id = <0xc1>;
}; l2_cache100 {
qcom,dump-size = <0x90100>;
l2_cache200 { qcom,dump-id = <0xc1>;
qcom,dump-size = <0xd0100>; };
qcom,dump-id = <0xc2>;
}; l2_cache200 {
qcom,dump-size = <0xd0100>;
l2_cache300 { qcom,dump-id = <0xc2>;
qcom,dump-size = <0xd0100>; };
qcom,dump-id = <0xc3>;
}; l2_cache300 {
qcom,dump-size = <0xd0100>;
l2_cache400 { qcom,dump-id = <0xc3>;
qcom,dump-size = <0xd0100>; };
qcom,dump-id = <0xc4>;
}; l2_cache400 {
qcom,dump-size = <0xd0100>;
l2_cache500 { qcom,dump-id = <0xc4>;
qcom,dump-size = <0xd0100>; };
qcom,dump-id = <0xc5>;
}; l2_cache500 {
qcom,dump-size = <0xd0100>;
l2_cache600 { qcom,dump-id = <0xc5>;
qcom,dump-size = <0xd0100>; };
qcom,dump-id = <0xc6>;
}; l2_cache600 {
qcom,dump-size = <0xd0100>;
l2_cache700 { qcom,dump-id = <0xc6>;
qcom,dump-size = <0x340100>; };
qcom,dump-id = <0xc7>;
}; l2_cache700 {
qcom,dump-size = <0x340100>;
l2_tlb0 { qcom,dump-id = <0xc7>;
qcom,dump-size = <0xf700>; };
qcom,dump-id = <0x120>;
}; l2_tlb0 {
qcom,dump-size = <0xf700>;
l2_tlb100 { qcom,dump-id = <0x120>;
qcom,dump-size = <0xf700>; };
qcom,dump-id = <0x121>;
}; l2_tlb100 {
qcom,dump-size = <0xf700>;
l2_tlb700 { qcom,dump-id = <0x121>;
qcom,dump-size = <0xa900>; };
qcom,dump-id = <0x127>;
}; l2_tlb700 {
qcom,dump-size = <0xa900>;
l1dcdirty0 { qcom,dump-id = <0x127>;
qcom,dump-size = <0x2100>; };
qcom,dump-id = <0x170>;
}; l1dcdirty0 {
qcom,dump-size = <0x2100>;
l1dcdirty100 { qcom,dump-id = <0x170>;
qcom,dump-size = <0x2100>; };
qcom,dump-id = <0x171>;
}; l1dcdirty100 {
qcom,dump-size = <0x2100>;
l1dcmte0 { qcom,dump-id = <0x171>;
qcom,dump-size = <0x2100>; };
qcom,dump-id = <0x180>;
}; l1dcmte0 {
qcom,dump-size = <0x2100>;
l1dcmte100 { qcom,dump-id = <0x180>;
qcom,dump-size = <0x2100>; };
qcom,dump-id = <0x181>;
}; l1dcmte100 {
qcom,dump-size = <0x2100>;
l2dcmte0 { qcom,dump-id = <0x181>;
qcom,dump-size = <0x10100>; };
qcom,dump-id = <0x190>;
}; l2dcmte0 {
qcom,dump-size = <0x10100>;
l2dcmte100 { qcom,dump-id = <0x190>;
qcom,dump-size = <0x10100>; };
qcom,dump-id = <0x191>;
}; l2dcmte100 {
qcom,dump-size = <0x10100>;
l0mopca700 { qcom,dump-id = <0x191>;
qcom,dump-size = <0x4100>; };
qcom,dump-id = <0x1a7>;
}; l0mopca700 {
qcom,dump-size = <0x4100>;
l2victim700 { qcom,dump-id = <0x1a7>;
qcom,dump-size = <0x2100>; };
qcom,dump-id = <0x1e7>;
}; l2victim700 {
qcom,dump-size = <0x2100>;
l2tldtcsp200 { qcom,dump-id = <0x1e7>;
qcom,dump-size = <0x7900>; };
qcom,dump-id = <0x202>;
}; l2tldtcsp200 {
qcom,dump-size = <0x7900>;
l2tldtcsp300 { qcom,dump-id = <0x202>;
qcom,dump-size = <0x7900>; };
qcom,dump-id = <0x203>;
}; l2tldtcsp300 {
qcom,dump-size = <0x7900>;
l2tldtcsp400 { qcom,dump-id = <0x203>;
qcom,dump-size = <0x7900>; };
qcom,dump-id = <0x204>;
}; l2tldtcsp400 {
qcom,dump-size = <0x7900>;
l2tldtcsp500 { qcom,dump-id = <0x204>;
qcom,dump-size = <0x7900>; };
qcom,dump-id = <0x205>;
}; l2tldtcsp500 {
qcom,dump-size = <0x7900>;
l2tldtcsp600 { qcom,dump-id = <0x205>;
qcom,dump-size = <0x7900>; };
qcom,dump-id = <0x206>;
}; l2tldtcsp600 {
qcom,dump-size = <0x7900>;
l2tldtcmp200 { qcom,dump-id = <0x206>;
qcom,dump-size = <0x1300>; };
qcom,dump-id = <0x212>;
}; l2tldtcmp200 {
qcom,dump-size = <0x1300>;
l2tldtcmp300 { qcom,dump-id = <0x212>;
qcom,dump-size = <0x1300>; };
qcom,dump-id = <0x213>;
}; l2tldtcmp300 {
qcom,dump-size = <0x1300>;
l2tldtcmp400 { qcom,dump-id = <0x213>;
qcom,dump-size = <0x1300>; };
qcom,dump-id = <0x214>;
}; l2tldtcmp400 {
qcom,dump-size = <0x1300>;
l2tldtcmp500 { qcom,dump-id = <0x214>;
qcom,dump-size = <0x1300>; };
qcom,dump-id = <0x215>;
}; l2tldtcmp500 {
qcom,dump-size = <0x1300>;
l2tldtcmp600 { qcom,dump-id = <0x215>;
qcom,dump-size = <0x1300>; };
qcom,dump-id = <0x216>;
}; l2tldtcmp600 {
qcom,dump-size = <0x1300>;
cpuss_reg { qcom,dump-id = <0x216>;
qcom,dump-size = <0x36000>; };
qcom,dump-id = <0xef>;
}; cpuss_reg {
qcom,dump-size = <0x36000>;
rpmh { qcom,dump-id = <0xef>;
qcom,dump-size = <0x400000>; };
qcom,dump-id = <0xec>;
}; rpmh {
qcom,dump-size = <0x400000>;
rpm_sw { qcom,dump-id = <0xec>;
qcom,dump-size = <0x28000>; };
qcom,dump-id = <0xea>;
}; rpm_sw {
qcom,dump-size = <0x28000>;
pmic { qcom,dump-id = <0xea>;
qcom,dump-size = <0x200000>; };
qcom,dump-id = <0xe4>;
}; pmic {
qcom,dump-size = <0x200000>;
fcm { qcom,dump-id = <0xe4>;
qcom,dump-size = <0x8400>; };
qcom,dump-id = <0xee>;
}; fcm {
qcom,dump-size = <0x8400>;
etf_swao { qcom,dump-id = <0xee>;
qcom,dump-size = <0x10000>; };
qcom,dump-id = <0xf1>;
}; etf_swao {
qcom,dump-size = <0x10000>;
etr_reg { qcom,dump-id = <0xf1>;
qcom,dump-size = <0x1000>; };
qcom,dump-id = <0x100>;
}; etr_reg {
qcom,dump-size = <0x1000>;
etfswao_reg { qcom,dump-id = <0x100>;
qcom,dump-size = <0x1000>; };
qcom,dump-id = <0x102>;
}; etfswao_reg {
qcom,dump-size = <0x1000>;
etr1_reg { qcom,dump-id = <0x102>;
qcom,dump-size = <0x1000>; };
qcom,dump-id = <0x105>;
}; etr1_reg {
qcom,dump-size = <0x1000>;
misc_data { qcom,dump-id = <0x105>;
qcom,dump-size = <0x1000>; };
qcom,dump-id = <0xe8>;
}; misc_data {
qcom,dump-size = <0x1000>;
etf_slpi { qcom,dump-id = <0xe8>;
qcom,dump-size = <0x4000>; };
qcom,dump-id = <0xf3>;
}; etf_slpi {
qcom,dump-size = <0x4000>;
etfslpi_reg { qcom,dump-id = <0xf3>;
qcom,dump-size = <0x1000>; };
qcom,dump-id = <0x103>;
}; etfslpi_reg {
qcom,dump-size = <0x1000>;
etf_lpass { qcom,dump-id = <0x103>;
qcom,dump-size = <0x4000>; };
qcom,dump-id = <0xf4>;
}; etf_lpass {
qcom,dump-size = <0x4000>;
etflpass_reg { qcom,dump-id = <0xf4>;
qcom,dump-size = <0x1000>; };
qcom,dump-id = <0x104>;
}; etflpass_reg {
qcom,dump-size = <0x1000>;
osm_reg { qcom,dump-id = <0x104>;
qcom,dump-size = <0x400>; };
qcom,dump-id = <0x163>;
}; osm_reg {
qcom,dump-size = <0x400>;
pcu_reg { qcom,dump-id = <0x163>;
qcom,dump-size = <0x400>; };
qcom,dump-id = <0x164>;
}; pcu_reg {
qcom,dump-size = <0x400>;
fsm_data { qcom,dump-id = <0x164>;
qcom,dump-size = <0x400>; };
qcom,dump-id = <0x165>;
}; fsm_data {
qcom,dump-size = <0x400>;
spr_cpu0 { qcom,dump-id = <0x165>;
qcom,dump-size = <0x2000>; };
qcom,dump-id = <0x1f0>;
}; spr_cpu0 {
qcom,dump-size = <0x2000>;
spr_cpu1 { qcom,dump-id = <0x1f0>;
qcom,dump-size = <0x2000>; };
qcom,dump-id = <0x1f1>;
}; spr_cpu1 {
qcom,dump-size = <0x2000>;
spr_cpu2 { qcom,dump-id = <0x1f1>;
qcom,dump-size = <0x2000>; };
qcom,dump-id = <0x1f2>;
}; spr_cpu2 {
qcom,dump-size = <0x2000>;
spr_cpu3 { qcom,dump-id = <0x1f2>;
qcom,dump-size = <0x2000>; };
qcom,dump-id = <0x1f3>;
}; spr_cpu3 {
qcom,dump-size = <0x2000>;
spr_cpu4 { qcom,dump-id = <0x1f3>;
qcom,dump-size = <0x2000>; };
qcom,dump-id = <0x1f4>;
}; spr_cpu4 {
qcom,dump-size = <0x2000>;
spr_cpu5 { qcom,dump-id = <0x1f4>;
qcom,dump-size = <0x2000>; };
qcom,dump-id = <0x1f5>;
}; spr_cpu5 {
qcom,dump-size = <0x2000>;
spr_cpu6 { qcom,dump-id = <0x1f5>;
qcom,dump-size = <0x2000>; };
qcom,dump-id = <0x1f6>;
}; spr_cpu6 {
qcom,dump-size = <0x2000>;
spr_cpu7 { qcom,dump-id = <0x1f6>;
qcom,dump-size = <0x2000>; };
qcom,dump-id = <0x1f7>;
}; spr_cpu7 {
qcom,dump-size = <0x2000>;
scandump_smmu { qcom,dump-id = <0x1f7>;
qcom,dump-size = <0x40000>; };
qcom,dump-id = <0x220>;
}; scandump_smmu {
qcom,dump-size = <0x40000>;
scandump_gpu { qcom,dump-id = <0x220>;
qcom,dump-size = <0x300000>; };
qcom,dump-id = <0x221>;
scandump_gpu {
qcom,dump-size = <0x300000>;
qcom,dump-id = <0x221>;
};
}; };
}; };
}; };