| Message ID | 20230128055214.33648-1-jamiemdouglass@gmail.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | arm64: dts: qcom: msm8992-lg-bullhead: Correct memory overlap with SMEM region | expand |
On 28.01.2023 06:52, Jamie Douglass wrote: > A previously committed reserved memory region was overlapping with the > SMEM memory region, causing an error message in dmesg: > OF: reserved mem: OVERLAP DETECTED! > reserved@5000000 (0x0000000005000000--0x0000000007200000) > overlaps with smem_region@6a00000 > (0x0000000006a00000--0x0000000006c00000) > This patch splits the previous reserved memory region into two > reserved sections either side of the SMEM memory region. > > Signed-off-by: Jamie Douglass <jamiemdouglass@gmail.com> > --- > arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi > index 79de9cc395c4..5e375ea73c79 100644 > --- a/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi > +++ b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi > @@ -53,8 +53,13 @@ cont_splash_mem: memory@3400000 { > no-map; > }; > > - removed_region: reserved@5000000 { > - reg = <0 0x05000000 0 0x2200000>; > + reserved@5000000 { > + reg = <0x0 0x05000000 0x0 0x1a00000>; > + no-map; > + }; > + > + reserved@6c00000 { > + reg = <0x0 0x06c00000 0x0 0x400000>; I think you made this 0x200000 too small, unless there is supposed to be functional change. Konrad > no-map; > }; > };
My apologies, I completely forgot that I did that!
That change was necessary, because extending the reserved region
past 0x7000000 creates another memory overlap, this time with the
mpss_mem region:
OF: reserved mem: OVERLAP DETECTED!
reserved@6c00000 (0x0000000006c00000--0x0000000007200000)
overlaps with memory@7000000
(0x0000000007000000--0x000000000ca00000)
So my original patch is correct.
Thanks,
Jamie
On Sun, 29 Jan 2023 at 01:30, Konrad Dybcio <konrad.dybcio@linaro.org> wrote:
>
>
>
> On 28.01.2023 06:52, Jamie Douglass wrote:
> > A previously committed reserved memory region was overlapping with the
> > SMEM memory region, causing an error message in dmesg:
> > OF: reserved mem: OVERLAP DETECTED!
> > reserved@5000000 (0x0000000005000000--0x0000000007200000)
> > overlaps with smem_region@6a00000
> > (0x0000000006a00000--0x0000000006c00000)
> > This patch splits the previous reserved memory region into two
> > reserved sections either side of the SMEM memory region.
> >
> > Signed-off-by: Jamie Douglass <jamiemdouglass@gmail.com>
> > ---
> > arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi | 9 +++++++--
> > 1 file changed, 7 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
> > index 79de9cc395c4..5e375ea73c79 100644
> > --- a/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
> > +++ b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi
> > @@ -53,8 +53,13 @@ cont_splash_mem: memory@3400000 {
> > no-map;
> > };
> >
> > - removed_region: reserved@5000000 {
> > - reg = <0 0x05000000 0 0x2200000>;
> > + reserved@5000000 {
> > + reg = <0x0 0x05000000 0x0 0x1a00000>;
> > + no-map;
> > + };
> > +
> > + reserved@6c00000 {
> > + reg = <0x0 0x06c00000 0x0 0x400000>;
> I think you made this 0x200000 too small, unless there
> is supposed to be functional change.
>
> Konrad
> > no-map;
> > };
> > };
Hi Jamie, On Sat, 28 Jan 2023 at 06:53, Jamie Douglass <jamiemdouglass@gmail.com> wrote: > > A previously committed reserved memory region was overlapping with the IMHO there should be marked commit which you're fixing: Fixes: 22c7e1a0fa45 ("arm64: dts: msm8992-bullhead: add memory hole region") > SMEM memory region, causing an error message in dmesg: > OF: reserved mem: OVERLAP DETECTED! > reserved@5000000 (0x0000000005000000--0x0000000007200000) > overlaps with smem_region@6a00000 > (0x0000000006a00000--0x0000000006c00000) > This patch splits the previous reserved memory region into two > reserved sections either side of the SMEM memory region. Reviewed-by: Petr Vorel <pvorel@suse.cz> Tested-by: Petr Vorel <pvorel@suse.cz> ... > +++ b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi > @@ -53,8 +53,13 @@ cont_splash_mem: memory@3400000 { > no-map; > }; > > - removed_region: reserved@5000000 { > - reg = <0 0x05000000 0 0x2200000>; > + reserved@5000000 { Can we keep "removed_region:" ? removed_region: reserved@5000000 { > + reg = <0x0 0x05000000 0x0 0x1a00000>; > + no-map; > + }; > + > + reserved@6c00000 { Not sure which label to add, maybe append 2? removed_region2: reserved@6c00000 { @Konrad @Krzysztof WDYT? Kind regards, Petr > + reg = <0x0 0x06c00000 0x0 0x400000>; > no-map; > }; > };
On 30.01.2023 15:19, Petr Vorel wrote: > Hi Jamie, > > On Sat, 28 Jan 2023 at 06:53, Jamie Douglass <jamiemdouglass@gmail.com> wrote: >> >> A previously committed reserved memory region was overlapping with the > > IMHO there should be marked commit which you're fixing: > Fixes: 22c7e1a0fa45 ("arm64: dts: msm8992-bullhead: add memory hole region") Yes > >> SMEM memory region, causing an error message in dmesg: >> OF: reserved mem: OVERLAP DETECTED! >> reserved@5000000 (0x0000000005000000--0x0000000007200000) >> overlaps with smem_region@6a00000 >> (0x0000000006a00000--0x0000000006c00000) >> This patch splits the previous reserved memory region into two >> reserved sections either side of the SMEM memory region. > > Reviewed-by: Petr Vorel <pvorel@suse.cz> > Tested-by: Petr Vorel <pvorel@suse.cz> > ... >> +++ b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi >> @@ -53,8 +53,13 @@ cont_splash_mem: memory@3400000 { >> no-map; >> }; >> >> - removed_region: reserved@5000000 { >> - reg = <0 0x05000000 0 0x2200000>; >> + reserved@5000000 { > Can we keep "removed_region:" ? > removed_region: reserved@5000000 { > >> + reg = <0x0 0x05000000 0x0 0x1a00000>; >> + no-map; >> + }; >> + >> + reserved@6c00000 { > Not sure which label to add, maybe append 2? > removed_region2: reserved@6c00000 { > @Konrad @Krzysztof WDYT? Generally, if you don't expect that there'll be a need to amend/reference the node from somewhere else, the label is rather useless.. Konrad > > Kind regards, > Petr > >> + reg = <0x0 0x06c00000 0x0 0x400000>; >> no-map; >> }; >> };
On Mon, 30 Jan 2023 at 15:21, Konrad Dybcio <konrad.dybcio@linaro.org> wrote: > > > > On 30.01.2023 15:19, Petr Vorel wrote: > > Hi Jamie, > > > > On Sat, 28 Jan 2023 at 06:53, Jamie Douglass <jamiemdouglass@gmail.com> wrote: > >> > >> A previously committed reserved memory region was overlapping with the > > > > IMHO there should be marked commit which you're fixing: > > Fixes: 22c7e1a0fa45 ("arm64: dts: msm8992-bullhead: add memory hole region") > Yes > > > > >> SMEM memory region, causing an error message in dmesg: > >> OF: reserved mem: OVERLAP DETECTED! > >> reserved@5000000 (0x0000000005000000--0x0000000007200000) > >> overlaps with smem_region@6a00000 > >> (0x0000000006a00000--0x0000000006c00000) > >> This patch splits the previous reserved memory region into two > >> reserved sections either side of the SMEM memory region. > > > > Reviewed-by: Petr Vorel <pvorel@suse.cz> > > Tested-by: Petr Vorel <pvorel@suse.cz> > > ... > >> +++ b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi > >> @@ -53,8 +53,13 @@ cont_splash_mem: memory@3400000 { > >> no-map; > >> }; > >> > >> - removed_region: reserved@5000000 { > >> - reg = <0 0x05000000 0 0x2200000>; > >> + reserved@5000000 { > > Can we keep "removed_region:" ? > > removed_region: reserved@5000000 { > > > >> + reg = <0x0 0x05000000 0x0 0x1a00000>; > >> + no-map; > >> + }; > >> + > >> + reserved@6c00000 { > > Not sure which label to add, maybe append 2? > > removed_region2: reserved@6c00000 { > > @Konrad @Krzysztof WDYT? > Generally, if you don't expect that there'll be a need to > amend/reference the node from somewhere else, the label is > rather useless.. Thank you for info. To be honest I have no idea. Previously the label was added, but that does not mean that it's used. 'git grep -l removed_region' shows only labels in few dts/dtsi, IMHO it's not used. IMHO it looks ok to avoid it. Kind regards, Petr > > Konrad > > > > > Kind regards, > > Petr > > > >> + reg = <0x0 0x06c00000 0x0 0x400000>; > >> no-map; > >> }; > >> };
diff --git a/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi index 79de9cc395c4..5e375ea73c79 100644 --- a/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi @@ -53,8 +53,13 @@ cont_splash_mem: memory@3400000 { no-map; }; - removed_region: reserved@5000000 { - reg = <0 0x05000000 0 0x2200000>; + reserved@5000000 { + reg = <0x0 0x05000000 0x0 0x1a00000>; + no-map; + }; + + reserved@6c00000 { + reg = <0x0 0x06c00000 0x0 0x400000>; no-map; }; };
A previously committed reserved memory region was overlapping with the SMEM memory region, causing an error message in dmesg: OF: reserved mem: OVERLAP DETECTED! reserved@5000000 (0x0000000005000000--0x0000000007200000) overlaps with smem_region@6a00000 (0x0000000006a00000--0x0000000006c00000) This patch splits the previous reserved memory region into two reserved sections either side of the SMEM memory region. Signed-off-by: Jamie Douglass <jamiemdouglass@gmail.com> --- arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)