Skip to contentSkip to conversation

arm64: dts: qcom: msm8994-angler: Disable cont_splash_mem

PATCH Superseded Petr Vorel 2 participants 4 messages Jun 22, 2021

Subsystems (3)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Petr Vorel

author
#0 lore raw

PATCH v3 1/1 arm64: dts: qcom: msm8994-angler: Disable cont_splash_mem

As the default definition breaks booting angler:

[    1.862561] printk: console [ttyMSM0] enabled
[    1.872260] msm_serial: driver initialized

D - 15524 - pm_driver_init, Delta

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

Disabling it because downstream kernel does not report where the memory is allocated:

[    0.000000] cma: Found cont_splash_mem@0, memory base 0x0000000000000000, size 16 MiB, limit 0x0000000000000000
[    0.000000] cma: CMA: reserved 16 MiB at 0x0000000000000000 for cont_splash_mem
Fixes 74d6d0a145835 ("arm64: dts: qcom: msm8994/8994-kitakami: Fix up

the memory map")

---
Changes v2->v3:
* get back to v1 which just disabled the node
* use alias instead of memory@3800000

 arch/arm64/boot/dts/qcom/msm8994-angler-rev-101.dts | 3 +++
 1 file changed, 3 insertions(+)
arch/arm64/boot/dts/qcom/msm8994-angler-rev-101.dts +3 -0
index ffe1a9bd8f70..2c1881a22fee 100644
@@ -1,12 +1,15 @@
 // 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 <[email protected]>
  */
 
 /dts-v1/;
 
 #include "msm8994.dtsi"
 
+/delete-node/ &cont_splash_mem;
+
 / {
 	model = "Huawei Nexus 6P";
 	compatible = "huawei,angler", "qcom,msm8994";
Signature · 1 line
2.32.0
#1 lore raw

I'm terribly sorry for not asking for this before, but could you please add a comment above the /delete-node/ explaining the weird firmware situation? It hasn't happened before to any board to my knowledge..

Sorry once again!

Konrad

author
#2 lore raw

Hi Konrad,

Quoted 3 lines

I'm terribly sorry for not asking for this before, but could you please add a comment above the /delete-node/ explaining the weird firmware situation? It hasn't happened before to any board to my knowledge..

I thought explaining in the commit message would be enough, but sure comment does not harm => I'll send v4.

Quoted 1 line

Sorry once again!

np. Thanks for all your comments.

Quoted 1 line

Konrad

Kind regards,
Petr

#3 lore raw
Quoted 7 lines · Petr Vorel

Hi Konrad,

Quoted 3 lines

I'm terribly sorry for not asking for this before, but could you please add a comment above the /delete-node/ explaining the weird firmware situation? It hasn't happened before to any board to my knowledge..

I thought explaining in the commit message would be enough, but sure comment does not harm => I'll send v4.

Maybe I'm just too young, but I rarely ever read those and I am pretty sure

I'm not alone in this manner, heh

Konrad