diff mbox series

[1/1] arm64: dts: qcom: msm8994-angler: Disable memory@3800000

Message ID 20210622034408.24904-1-petr.vorel@gmail.com (mailing list archive)
State Superseded
Headers show
Series [1/1] arm64: dts: qcom: msm8994-angler: Disable memory@3800000 | expand

Commit Message

Petr Vorel June 22, 2021, 3:44 a.m. UTC
It prevents booting angler.

cont_splash_mem was introduced in 74d6d0a145835, but the problem
manifested after 86588296acbf ("fdt: Properly handle "no-map" field
in the memory region").

Fixes: 74d6d0a145835 ("arm64: dts: qcom: msm8994/8994-kitakami: Fix up
the memory map")

Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
---
Hi,

not sure if cont_splash_mem memory@3800000 is msm8994 specific.
BTW I haven't found it in LineageOS git [1]

Maybe it should go to msm8994-sony-xperia-kitakami.dtsi.
And I suppose it breaks also bullhead, thus this probably should go also
to msm8992-bullhead-rev-101.dts.

Kind regards,
Petr

[1] https://github.com/LineageOS/android_kernel_sony_msm8994

 arch/arm64/boot/dts/qcom/msm8994-angler-rev-101.dts | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Alexey Minnekhanov June 22, 2021, 12:09 p.m. UTC | #1
22.06.2021 06:44, Petr Vorel:> Hi,
> 
> not sure if cont_splash_mem memory@3800000 is msm8994 specific.
> BTW I haven't found it in LineageOS git [1]
> 
> Maybe it should go to msm8994-sony-xperia-kitakami.dtsi.
> And I suppose it breaks also bullhead, thus this probably should go also
> to msm8992-bullhead-rev-101.dts.

Moving reserved-memory nodes from SoC level .dtsi files to device 
specific .dts seems like a better idea, isn't it? Maybe not all of them, 
but some seem to be device-specific and should not be in .dtsi at all.
Konrad Dybcio June 22, 2021, 1:36 p.m. UTC | #2
Hi,

I see no reason why reserving memory would make your phone unbootable.

With that, please check your downstream dmesg and look for a line like this:


"<6>[    0.000000] cma: CMA: reserved 36 MiB at 0x0000000003800000 for cont_splash_mem"


This is there for me on both 8994-kitakami and 8992-xiaomi-libra.

Qualcomm devices tend to map "dynamically-allocated" regions to the same addresses every time.


Konrad
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/qcom/msm8994-angler-rev-101.dts b/arch/arm64/boot/dts/qcom/msm8994-angler-rev-101.dts
index ffe1a9bd8f70..af5ff9badec9 100644
--- a/arch/arm64/boot/dts/qcom/msm8994-angler-rev-101.dts
+++ b/arch/arm64/boot/dts/qcom/msm8994-angler-rev-101.dts
@@ -1,6 +1,7 @@ 
 // SPDX-License-Identifier: GPL-2.0-only
 /* Copyright (c) 2015, Huawei Inc. All rights reserved.
  * Copyright (c) 2016, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2021, Petr Vorel <petr.vorel@gmail.com>
  */
 
 /dts-v1/;
@@ -31,6 +32,10 @@  serial@f991e000 {
 			pinctrl-1 = <&blsp1_uart2_sleep>;
 		};
 	};
+
+	reserved-memory {
+		/delete-node/ memory@3800000;
+	};
 };
 
 &tlmm {