diff mbox series

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

Message ID 20230131200414.24373-3-pvorel@suse.cz
State New
Headers show
Series msm8994-angler memory overlap fixes | expand

Commit Message

Petr Vorel Jan. 31, 2023, 8:04 p.m. UTC 
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(-)

Comments

Bjorn Andersson Feb. 8, 2023, 11:47 p.m. UTC | #1 
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
>
Petr Vorel Feb. 9, 2023, 8:12 a.m. UTC | #2 
> 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
Petr Vorel April 1, 2023, 6:23 p.m. UTC | #3 
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
>
diff mbox series

Patch

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 {