Skip to contentSkip to conversation

Nexus 5X (lg-bullhead) boot fixes

PATCH New Petr Vorel 1 participant 3 messages Jul 13, 2021

Subsystems (3)
Device tree bindings Arm Qualcomm mailing list Arm Qualcomm support
lore
Share & tools
lore

Petr Vorel

author
#0 lore raw

cover Nexus 5X (lg-bullhead) boot fixes

Petr Vorel (2):
arm64: dts: qcom: msm8992-bullhead: Remove PSCI
arm64: dts: qcom: msm8992-bullhead: Fix cont_splash_mem mapping

 .../arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts | 12 ++++++++++++
 1 file changed, 12 insertions(+)
Signature · 1 line
2.32.0
author
#1 lore raw

PATCH 1/2 arm64: dts: qcom: msm8992-bullhead: Remove PSCI

Bullhead firmware obviously doesn't support PSCI as it fails to boot with this definition.

Fixes 329e16d5f8fc ("arm64: dts: qcom: msm8992: Add PSCI support.")
Signed-off-by Petr Vorel <[email protected]>
---
 arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts | 4 ++++
 1 file changed, 4 insertions(+)
arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts +4 -0
index 23cdcc9f7c72..5c6e17f11ee9 100644
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /* Copyright (c) 2015, LGE Inc. All rights reserved.
  * Copyright (c) 2016, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2021, Petr Vorel <[email protected]>
  */
 
 /dts-v1/;

@@ -17,6 +18,9 @@ / {
 	qcom,board-id = <0xb64 0>;
 	qcom,pmic-id = <0x10009 0x1000A 0x0 0x0>;
 
+	/* Bullhead firmware doesn't support PSCI */
+	/delete-node/ psci;
+
 	aliases {
 		serial0 = &blsp1_uart2;
 	};
Signature · 1 line
2.32.0
author
#2 lore raw

PATCH 2/2 arm64: dts: qcom: msm8992-bullhead: Fix cont_splash_mem mapping

In reply to Petr Vorel

cont_splash_mem has different memory mapping than generic from msm8994.dtsi:

[    0.000000] cma: Found cont_splash_mem@0, memory base 0x0000000003400000, size 12 MiB, limit 0xffffffffffffffff
[    0.000000] cma: CMA: reserved 12 MiB at 0x0000000003400000 for cont_splash_mem

This fixes boot.

Fixes 976d321f32dc ("arm64: dts: qcom: msm8992: Make the DT an overlay

on top of 8994")

Signed-off-by Petr Vorel <[email protected]>
---
 arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts +8 -0
index 5c6e17f11ee9..1ccca83292ac 100644
@@ -10,6 +10,9 @@
 #include "pm8994.dtsi"
 #include "pmi8994.dtsi"
 
+/* cont_splash_mem has different memory mapping */
+/delete-node/ &cont_splash_mem;
+
 / {
 	model = "LG Nexus 5X";
 	compatible = "lg,bullhead", "qcom,msm8992";

@@ -42,6 +45,11 @@ ramoops@1ff00000 {
 			ftrace-size = <0x10000>;
 			pmsg-size = <0x20000>;
 		};
+
+		cont_splash_mem: memory@3400000 {
+			reg = <0 0x03400000 0 0x1200000>;
+			no-map;
+		};
 	};
 };
Signature · 1 line
2.32.0