From: Bjorn Andersson <andersson@kernel.org>
To: Petr Vorel <pvorel@suse.cz>
Cc: linux-arm-msm@vger.kernel.org,
Konrad Dybcio <konradybcio@gmail.com>,
Andy Gross <agross@kernel.org>,
Dominik Kobinski <dominikkobinski314@gmail.com>,
Jamie Douglass <jamiemdouglass@gmail.com>
Subject: Re: [PATCH 2/2] arm64: dts: msm8994-angler: removed clash with smem_region
Date: Wed, 8 Feb 2023 15:47:17 -0800 [thread overview]
Message-ID: <20230208234717.gums2uqipzzbkhwn@ripper> (raw)
In-Reply-To: <20230131200414.24373-3-pvorel@suse.cz>
On Tue, Jan 31, 2023 at 09:04:14PM +0100, Petr Vorel wrote:
> This fixes memory overlap error:
> [ 0.000000] reserved@6300000 (0x0000000006300000--0x0000000007000000) overlaps with smem_region@6a00000 (0x0000000006a00000--0x0000000006c00000)
>
> smem_region is the same as in downstream (qcom,smem) [1], therefore
> split reserved memory into two sections on either side of smem_region.
>
> Not adding labels as it's not expected to be used.
>
> [1] https://android.googlesource.com/kernel/msm/+/refs/heads/android-msm-angler-3.10-marshmallow-mr1/arch/arm/boot/dts/qcom/msm8994.dtsi#948
>
> Fixes: 380cd3a34b7f ("arm64: dts: msm8994-angler: fix the memory map")
>
> Signed-off-by: Petr Vorel <pvorel@suse.cz>
> ---
> arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi | 5 -----
> arch/arm64/boot/dts/qcom/msm8994-huawei-angler-rev-101.dts | 4 ++--
> arch/arm64/boot/dts/qcom/msm8994.dtsi | 5 +++++
> 3 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
> index cdd796040703..a100b05abf56 100644
> --- a/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
> @@ -60,11 +60,6 @@ reserved@5000000 {
> reg = <0x0 0x05000000 0x0 0x1a00000>;
> no-map;
> };
> -
> - reserved@6c00000 {
> - reg = <0x0 0x06c00000 0x0 0x400000>;
> - no-map;
> - };
I've not picked up the change that introduces this, and it seems that
there's some request for changes on that thread.
Please try to sync up with Jamie to get the patch updated, or let me
know how you would like me to proceed.
Thanks,
Bjorn
> };
> };
>
> 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 59b9ed78cf0c..29e79ae0849d 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
> @@ -41,8 +41,8 @@ tzapp_mem: tzapp@4800000 {
> no-map;
> };
>
> - removed_region: reserved@6300000 {
> - reg = <0 0x06300000 0 0xD00000>;
> + reserved@6300000 {
> + reg = <0 0x06300000 0 0x700000>;
> no-map;
> };
> };
> diff --git a/arch/arm64/boot/dts/qcom/msm8994.dtsi b/arch/arm64/boot/dts/qcom/msm8994.dtsi
> index 9ff9d35496d2..24c3fced8df7 100644
> --- a/arch/arm64/boot/dts/qcom/msm8994.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8994.dtsi
> @@ -228,6 +228,11 @@ adsp_mem: memory@c9400000 {
> reg = <0 0xc9400000 0 0x3f00000>;
> no-map;
> };
> +
> + reserved@6c00000 {
> + reg = <0 0x06c00000 0 0x400000>;
> + no-map;
> + };
> };
>
> smd {
> --
> 2.39.1
>
next prev parent reply other threads:[~2023-02-08 23:45 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 ` [PATCH 1/2] arm64: dts: msm8994-angler: Fix cont_splash_mem mapping Petr Vorel
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 [this message]
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=20230208234717.gums2uqipzzbkhwn@ripper \
--to=andersson@kernel.org \
--cc=agross@kernel.org \
--cc=dominikkobinski314@gmail.com \
--cc=jamiemdouglass@gmail.com \
--cc=konradybcio@gmail.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=pvorel@suse.cz \
/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).