From: Petr Vorel <petr.vorel@gmail.com>
To: linux-arm-msm@vger.kernel.org
Cc: Petr Vorel <petr.vorel@gmail.com>,
Konrad Dybcio <konradybcio@gmail.com>,
Alexey Minnekhanov <alexeymin@postmarketos.org>,
Andy Gross <agross@kernel.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Rob Herring <robh+dt@kernel.org>,
devicetree@vger.kernel.org
Subject: [PATCH v2 1/1] arm64: dts: qcom: msm8994-angler: Fix cont_splash_mem
Date: Tue, 22 Jun 2021 20:10:56 +0200 [thread overview]
Message-ID: <20210622181056.27632-1-petr.vorel@gmail.com> (raw)
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").
Using new definition from downstream kernel:
[ 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")
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
---
Changes v1->v2:
* redefine address instead of deleting it (as suggested by Konrad)
Kind regards,
Petr
[1] https://wiki.postmarketos.org/wiki/Google_Nexus_5X_(lg-bullhead)
arch/arm64/boot/dts/qcom/msm8994-angler-rev-101.dts | 10 ++++++++++
1 file changed, 10 insertions(+)
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..4f8a5f5cbbaa 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,15 @@ serial@f991e000 {
pinctrl-1 = <&blsp1_uart2_sleep>;
};
};
+
+ reserved-memory {
+ /delete-node/ memory@3800000;
+
+ cont_splash_mem: memory@0 {
+ reg = <0 0 0 0x1600000>;
+ no-map;
+ };
+ };
};
&tlmm {
--
2.32.0
next reply other threads:[~2021-06-22 18:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-22 18:10 Petr Vorel [this message]
2021-06-22 18:29 ` [PATCH v2 1/1] arm64: dts: qcom: msm8994-angler: Fix cont_splash_mem Konrad Dybcio
2021-06-22 18:43 ` Petr Vorel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210622181056.27632-1-petr.vorel@gmail.com \
--to=petr.vorel@gmail.com \
--cc=agross@kernel.org \
--cc=alexeymin@postmarketos.org \
--cc=bjorn.andersson@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=konradybcio@gmail.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).