[PATCH 0/2] msm8994-angler memory overlap fixes

[PATCH 0/2] msm8994-angler memory overlap fixes

[Petr Vorel]

NOTE: this should be applied on the top of Jamie's patch [1].
(I'll rebase it if changes needed.)

Kind regards,
Petr

[1] https://lore.kernel.org/linux-arm-msm/20230128055214.33648-1-jamiemdouglass@gmail.com/

Petr Vorel (2):
  arm64: dts: msm8994-angler: Fix cont_splash_mem mapping
  arm64: dts: msm8994-angler: removed clash with smem_region

 arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi     |  5 -----
 .../boot/dts/qcom/msm8994-huawei-angler-rev-101.dts   | 11 ++++++++---
 arch/arm64/boot/dts/qcom/msm8994.dtsi                 |  5 +++++
 3 files changed, 13 insertions(+), 8 deletions(-)

-- 
2.39.1

[PATCH 1/2] arm64: dts: msm8994-angler: Fix cont_splash_mem mapping

[Petr Vorel]

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

[PATCH 2/2] arm64: dts: msm8994-angler: removed clash with smem_region

[Petr Vorel]

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;
-		};
 	};
 };
 
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

Re: [PATCH 2/2] arm64: dts: msm8994-angler: removed clash with smem_region

[Bjorn Andersson]

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
> 

Re: [PATCH 2/2] arm64: dts: msm8994-angler: removed clash with smem_region

[Petr Vorel]

> 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.

You merged v2 [1] as cd451939fdda ("arm64: dts: msm8994-angler: removed clash
with smem_region"), therefore my patchset is applicable the current
qcom/for-next. Can you please merge it? Or am I missing something?

Kind regards,
Petr

[1] https://lore.kernel.org/linux-arm-msm/167591660371.1230100.18259207897974955566.b4-ty@kernel.org/

> 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

Re: [PATCH 2/2] arm64: dts: msm8994-angler: removed clash with smem_region

[Petr Vorel]

Hi Bjorn,

any chance you could merge this patchset? Both patches apply on the
top of current qcom/for-next tree, because (as I wrote 2 months ago)
you applied Jamie's patch [1].

Kind regards,
Petr

[1] https://lore.kernel.org/linux-arm-msm/167591660371.1230100.18259207897974955566.b4-ty@kernel.org/

On Thu, 9 Feb 2023 at 09:12, Petr Vorel <pvorel@suse.cz> wrote:
>
> > 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.
>
> You merged v2 [1] as cd451939fdda ("arm64: dts: msm8994-angler: removed clash
> with smem_region"), therefore my patchset is applicable the current
> qcom/for-next. Can you please merge it? Or am I missing something?
>
> Kind regards,
> Petr
>
> [1] https://lore.kernel.org/linux-arm-msm/167591660371.1230100.18259207897974955566.b4-ty@kernel.org/
>
> > 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
>

Re: [PATCH 0/2] msm8994-angler memory overlap fixes

[Bjorn Andersson]

On Tue, 31 Jan 2023 21:04:12 +0100, Petr Vorel wrote:
> NOTE: this should be applied on the top of Jamie's patch [1].
> (I'll rebase it if changes needed.)
> 
> Kind regards,
> Petr
> 
> [1] https://lore.kernel.org/linux-arm-msm/20230128055214.33648-1-jamiemdouglass@gmail.com/
> 
> [...]

Applied, thanks!

[1/2] arm64: dts: msm8994-angler: Fix cont_splash_mem mapping
      commit: fe88480a6be92ecbf6f205ff3a7d7e5ded0562dd
[2/2] arm64: dts: msm8994-angler: removed clash with smem_region
      commit: c85c8a992794dfcd7cea7a41871710c27c5592a6

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>