* [PATCH 0/2] Nexus 5X (lg-bullhead) boot fixes
@ 2021-07-13 18:57 Petr Vorel
2021-07-13 18:57 ` [PATCH 1/2] arm64: dts: qcom: msm8992-bullhead: Remove PSCI Petr Vorel
2021-07-13 18:57 ` [PATCH 2/2] arm64: dts: qcom: msm8992-bullhead: Fix cont_splash_mem mapping Petr Vorel
0 siblings, 2 replies; 3+ messages in thread
From: Petr Vorel @ 2021-07-13 18:57 UTC (permalink / raw)
To: linux-arm-msm
Cc: Petr Vorel, Konrad Dybcio, Alexey Minnekhanov, Andy Gross,
Bjorn Andersson, Rob Herring, devicetree
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(+)
--
2.32.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/2] arm64: dts: qcom: msm8992-bullhead: Remove PSCI
2021-07-13 18:57 [PATCH 0/2] Nexus 5X (lg-bullhead) boot fixes Petr Vorel
@ 2021-07-13 18:57 ` Petr Vorel
2021-07-13 18:57 ` [PATCH 2/2] arm64: dts: qcom: msm8992-bullhead: Fix cont_splash_mem mapping Petr Vorel
1 sibling, 0 replies; 3+ messages in thread
From: Petr Vorel @ 2021-07-13 18:57 UTC (permalink / raw)
To: linux-arm-msm
Cc: Petr Vorel, Konrad Dybcio, Alexey Minnekhanov, Andy Gross,
Bjorn Andersson, Rob Herring, devicetree
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 <petr.vorel@gmail.com>
---
arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts b/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts
index 23cdcc9f7c72..5c6e17f11ee9 100644
--- a/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts
+++ b/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts
@@ -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 <petr.vorel@gmail.com>
*/
/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;
};
--
2.32.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] arm64: dts: qcom: msm8992-bullhead: Fix cont_splash_mem mapping
2021-07-13 18:57 [PATCH 0/2] Nexus 5X (lg-bullhead) boot fixes Petr Vorel
2021-07-13 18:57 ` [PATCH 1/2] arm64: dts: qcom: msm8992-bullhead: Remove PSCI Petr Vorel
@ 2021-07-13 18:57 ` Petr Vorel
1 sibling, 0 replies; 3+ messages in thread
From: Petr Vorel @ 2021-07-13 18:57 UTC (permalink / raw)
To: linux-arm-msm
Cc: Petr Vorel, Konrad Dybcio, Alexey Minnekhanov, Andy Gross,
Bjorn Andersson, Rob Herring, devicetree
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 <petr.vorel@gmail.com>
---
arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts b/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts
index 5c6e17f11ee9..1ccca83292ac 100644
--- a/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts
+++ b/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts
@@ -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;
+ };
};
};
--
2.32.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-07-13 18:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-13 18:57 [PATCH 0/2] Nexus 5X (lg-bullhead) boot fixes Petr Vorel
2021-07-13 18:57 ` [PATCH 1/2] arm64: dts: qcom: msm8992-bullhead: Remove PSCI Petr Vorel
2021-07-13 18:57 ` [PATCH 2/2] arm64: dts: qcom: msm8992-bullhead: Fix cont_splash_mem mapping Petr Vorel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).