From: Petr Vorel <pvorel@suse.cz>
To: linux-arm-msm@vger.kernel.org
Cc: Petr Vorel <pvorel@suse.cz>,
Konrad Dybcio <konradybcio@gmail.com>,
Andy Gross <agross@kernel.org>,
Bjorn Andersson <andersson@kernel.org>,
Dominik Kobinski <dominikkobinski314@gmail.com>,
Jamie Douglass <jamiemdouglass@gmail.com>
Subject: [PATCH 1/2] arm64: dts: msm8994-angler: Fix cont_splash_mem mapping
Date: Tue, 31 Jan 2023 21:04:13 +0100 [thread overview]
Message-ID: <20230131200414.24373-2-pvorel@suse.cz> (raw)
In-Reply-To: <20230131200414.24373-1-pvorel@suse.cz>
Angler's cont_splash_mem mapping is shorter in downstream [1],
therefore 380cd3a34b7f was wrong. Obviously also 0e5ded926f2a was wrong
(workaround which fixed booting at the time).
This fixes error:
[ 0.000000] memory@3401000 (0x0000000003401000--0x0000000005601000) overlaps with tzapp@4800000 (0x0000000004800000--0x0000000006100000)
[1] https://android.googlesource.com/kernel/msm/+/refs/heads/android-msm-angler-3.10-marshmallow-mr1/arch/arm64/boot/dts/huawei/huawei_msm8994_angler_row_vn1/huawei-fingerprint.dtsi#16
Fixes: 380cd3a34b7f ("arm64: dts: msm8994-angler: fix the memory map")
Fixes: 0e5ded926f2a ("arm64: dts: qcom: msm8994-angler: Disable cont_splash_mem")
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
NOTE: this should be applied on the top of Jamie's patch:
https://lore.kernel.org/linux-arm-msm/20230128055214.33648-1-jamiemdouglass@gmail.com/
arch/arm64/boot/dts/qcom/msm8994-huawei-angler-rev-101.dts | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/qcom/msm8994-huawei-angler-rev-101.dts b/arch/arm64/boot/dts/qcom/msm8994-huawei-angler-rev-101.dts
index 7b0f62144c3e..59b9ed78cf0c 100644
--- a/arch/arm64/boot/dts/qcom/msm8994-huawei-angler-rev-101.dts
+++ b/arch/arm64/boot/dts/qcom/msm8994-huawei-angler-rev-101.dts
@@ -2,7 +2,7 @@
/*
* Copyright (c) 2015, Huawei Inc. All rights reserved.
* Copyright (c) 2016, The Linux Foundation. All rights reserved.
- * Copyright (c) 2021-2022, Petr Vorel <petr.vorel@gmail.com>
+ * Copyright (c) 2021-2023, Petr Vorel <petr.vorel@gmail.com>
*/
/dts-v1/;
@@ -31,6 +31,11 @@ reserved-memory {
#size-cells = <2>;
ranges;
+ cont_splash_mem: memory@3401000 {
+ reg = <0 0x03401000 0 0x1000000>;
+ no-map;
+ };
+
tzapp_mem: tzapp@4800000 {
reg = <0 0x04800000 0 0x1900000>;
no-map;
--
2.39.1
next prev parent reply other threads:[~2023-01-31 20:04 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-31 20:04 [PATCH 0/2] msm8994-angler memory overlap fixes Petr Vorel
2023-01-31 20:04 ` Petr Vorel [this message]
2023-01-31 20:04 ` [PATCH 2/2] arm64: dts: msm8994-angler: removed clash with smem_region Petr Vorel
2023-02-08 23:47 ` Bjorn Andersson
2023-02-09 8:12 ` Petr Vorel
2023-04-01 18:23 ` Petr Vorel
2023-04-07 17:41 ` [PATCH 0/2] msm8994-angler memory overlap fixes Bjorn Andersson
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=20230131200414.24373-2-pvorel@suse.cz \
--to=pvorel@suse.cz \
--cc=agross@kernel.org \
--cc=andersson@kernel.org \
--cc=dominikkobinski314@gmail.com \
--cc=jamiemdouglass@gmail.com \
--cc=konradybcio@gmail.com \
--cc=linux-arm-msm@vger.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.