| Message ID | 20230314045812.3673958-1-caleb.connolly@linaro.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/2] arm64: dts: qcom: sdm845: add framebuffer reserved memory | expand |
On 14.03.2023 05:58, Caleb Connolly wrote: > Almost all of the SDM845 devices actually map the same region for the > continuous splash / framebuffer. de-dup all the devices that specify it > manually and put it in sdm845.dtsi instead. > > This now reserves it on the OnePlus 6 where it was not reserved before, > this is intentional. > > Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org> > --- You didn't explain why is not done on 850 (which I assume has to do with the windows memory map being different and putting it somewhere else) and the reasoning for reserving it at all. If that's the framebuffer handoff issue with smmu faults happening, it may be worth looking into solving that properly, i.e. introducing something like qcom,framebuffer which would suck up the starting address and figure out the required size based on MDP5 VIG pipes' registers and could tickle the autorefresh regs if needed. See how lk2nd does it, the hardware underneath hasn't changed since msm8974. Then, on drm handoff it could free the memory and let drm/msm initialize its own, new, dynamically-allocated and dynamically-sized region as it wants. Or we can use mdss's never-used memory-region property, but that would kill 35 or so megs of ram for everyone, no matter display their resolution. Konrad > arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi | 6 ------ > arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts | 5 ----- > arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 5 ----- > arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi | 6 ------ > .../arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 6 ------ > arch/arm64/boot/dts/qcom/sdm845.dtsi | 5 +++++ > arch/arm64/boot/dts/qcom/sdm850.dtsi | 2 ++ > 7 files changed, 7 insertions(+), 28 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi > index f942c5afea9b..6a1c674a015b 100644 > --- a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi > +++ b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi > @@ -93,12 +93,6 @@ spss_mem: memory@99000000 { > no-map; > }; > > - /* Framebuffer region */ > - memory@9d400000 { > - reg = <0x0 0x9d400000 0x0 0x2400000>; > - no-map; > - }; > - > /* rmtfs lower guard */ > memory@f0800000 { > reg = <0 0xf0800000 0 0x1000>; > diff --git a/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts b/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts > index d37a433130b9..7c2457948a32 100644 > --- a/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts > +++ b/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts > @@ -55,11 +55,6 @@ vreg_s4a_1p8: pm8998-smps4 { > }; > > reserved-memory { > - memory@9d400000 { > - reg = <0x0 0x9d400000 0x0 0x02400000>; > - no-map; > - }; > - > memory@a1300000 { > compatible = "ramoops"; > reg = <0x0 0xa1300000 0x0 0x100000>; > diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts > index b54e304abf71..4f6b1053c15b 100644 > --- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts > +++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts > @@ -60,11 +60,6 @@ key-vol-up { > }; > > reserved-memory { > - framebuffer_region@9d400000 { > - reg = <0x0 0x9d400000 0x0 (1080 * 2160 * 4)>; > - no-map; > - }; > - > ramoops: ramoops@b0000000 { > compatible = "ramoops"; > reg = <0 0xb0000000 0 0x00400000>; > diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi > index 4984c7496c31..7e273cc0158d 100644 > --- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi > +++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi > @@ -79,12 +79,6 @@ vreg_s4a_1p8: pm8998-smps4 { > }; > > reserved-memory { > - /* SONY was cool and didn't diverge from MTP this time, yay! */ > - cont_splash_mem: memory@9d400000 { > - reg = <0x0 0x9d400000 0x0 0x2400000>; > - no-map; > - }; > - > ramoops@ffc00000 { > compatible = "ramoops"; > reg = <0x0 0xffc00000 0x0 0x100000>; > diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi > index e0fda4d754fe..191c2664f721 100644 > --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi > +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi > @@ -98,12 +98,6 @@ spss_mem: memory@97f00000 { > no-map; > }; > > - /* Cont splash region set up by the bootloader */ > - cont_splash_mem: framebuffer@9d400000 { > - reg = <0 0x9d400000 0 0x2400000>; > - no-map; > - }; > - > rmtfs_mem: memory@f6301000 { > compatible = "qcom,rmtfs-mem"; > reg = <0 0xf6301000 0 0x200000>; > diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi > index 479859bd8ab3..ecec2ee46683 100644 > --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi > +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi > @@ -865,6 +865,11 @@ spss_mem: spss@97b00000 { > no-map; > }; > > + cont_splash_mem: framebuffer@9d400000 { > + reg = <0 0x9d400000 0 0x2400000>; > + no-map; > + }; > + > mdata_mem: mpss-metadata { > alloc-ranges = <0 0xa0000000 0 0x20000000>; > size = <0 0x4000>; > diff --git a/arch/arm64/boot/dts/qcom/sdm850.dtsi b/arch/arm64/boot/dts/qcom/sdm850.dtsi > index da9f6fbe32f6..b787575c77a5 100644 > --- a/arch/arm64/boot/dts/qcom/sdm850.dtsi > +++ b/arch/arm64/boot/dts/qcom/sdm850.dtsi > @@ -7,6 +7,8 @@ > > #include "sdm845.dtsi" > > +/delete-node/ &cont_splash_mem; > + > &cpu4_opp_table { > cpu4_opp33: opp-2841600000 { > opp-hz = /bits/ 64 <2841600000>;
On 14/03/2023 10:05, Konrad Dybcio wrote: > > > On 14.03.2023 05:58, Caleb Connolly wrote: >> Almost all of the SDM845 devices actually map the same region for the >> continuous splash / framebuffer. de-dup all the devices that specify it >> manually and put it in sdm845.dtsi instead. >> >> This now reserves it on the OnePlus 6 where it was not reserved before, >> this is intentional. >> >> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org> >> --- > You didn't explain why is not done on 850 (which I assume has to do with > the windows memory map being different and putting it somewhere else) and > the reasoning for reserving it at all. Patch 2 reserves it for 850 (not sure I understand you correctly?). The only difference there is the address. The reason for reserving it at all has been previously discussed, when it was added for db845c [1], the conclusion being that a better approach would be nice but didn't seem to be trivial to implement (Cc'd Dmitry). I acknowledge that reserving this region as we do currently may not be the optimal way of doing so, but I would like to avoid the kernel trying to map memory here and crash my device - and this does that at least :> Basically, my thinking: * NOT reserving this region is known to cause crashes * The OnePlus 6 doesn't currently reserve this region, and has some crashes * All the devices that do, reserve it at the same address * Some don't reserve the full size which is WRONG * I'll reserve it for the OnePlus 6, de-dup the DT and ensure that the whole size is reserved for all devices. * ? * Profit > > If that's the framebuffer handoff issue with smmu faults happening, it may > be worth looking into solving that properly, i.e. introducing something like > qcom,framebuffer which would suck up the starting address and figure out the > required size based on MDP5 VIG pipes' registers and could tickle the > autorefresh regs if needed. See how lk2nd does it, the hardware underneath > hasn't changed since msm8974. > > Then, on drm handoff it could free the memory and let drm/msm initialize > its own, new, dynamically-allocated and dynamically-sized region as it wants. > > Or we can use mdss's never-used memory-region property, but that would > kill 35 or so megs of ram for everyone, no matter display their resolution. Freeing up this ~30mb region sounds like a good improvement to me. I don't see how it's related to this patch though - especially given that commonising the region will make whatever long-term handoff solution we come up with easier anyway. Apologies if I'm jumping the gun a bit, I'm just trying to avoid blocking this patch on a tangential discussion. [1]: https://lore.kernel.org/linux-arm-msm/dfcc8baa-c0a3-c554-a8cf-75702a1c4cad@linaro.org/ [2]: https://lore.kernel.org/linux-arm-msm/2c0a893f-b1c2-a77e-4ad4-409c1c778655@linaro.org/ > > Konrad >> arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi | 6 ------ >> arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts | 5 ----- >> arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 5 ----- >> arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi | 6 ------ >> .../arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 6 ------ >> arch/arm64/boot/dts/qcom/sdm845.dtsi | 5 +++++ >> arch/arm64/boot/dts/qcom/sdm850.dtsi | 2 ++ >> 7 files changed, 7 insertions(+), 28 deletions(-) >> >> diff --git a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi >> index f942c5afea9b..6a1c674a015b 100644 >> --- a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi >> +++ b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi >> @@ -93,12 +93,6 @@ spss_mem: memory@99000000 { >> no-map; >> }; >> >> - /* Framebuffer region */ >> - memory@9d400000 { >> - reg = <0x0 0x9d400000 0x0 0x2400000>; >> - no-map; >> - }; >> - >> /* rmtfs lower guard */ >> memory@f0800000 { >> reg = <0 0xf0800000 0 0x1000>; >> diff --git a/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts b/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts >> index d37a433130b9..7c2457948a32 100644 >> --- a/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts >> +++ b/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts >> @@ -55,11 +55,6 @@ vreg_s4a_1p8: pm8998-smps4 { >> }; >> >> reserved-memory { >> - memory@9d400000 { >> - reg = <0x0 0x9d400000 0x0 0x02400000>; >> - no-map; >> - }; >> - >> memory@a1300000 { >> compatible = "ramoops"; >> reg = <0x0 0xa1300000 0x0 0x100000>; >> diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts >> index b54e304abf71..4f6b1053c15b 100644 >> --- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts >> +++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts >> @@ -60,11 +60,6 @@ key-vol-up { >> }; >> >> reserved-memory { >> - framebuffer_region@9d400000 { >> - reg = <0x0 0x9d400000 0x0 (1080 * 2160 * 4)>; >> - no-map; >> - }; >> - >> ramoops: ramoops@b0000000 { >> compatible = "ramoops"; >> reg = <0 0xb0000000 0 0x00400000>; >> diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi >> index 4984c7496c31..7e273cc0158d 100644 >> --- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi >> +++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi >> @@ -79,12 +79,6 @@ vreg_s4a_1p8: pm8998-smps4 { >> }; >> >> reserved-memory { >> - /* SONY was cool and didn't diverge from MTP this time, yay! */ >> - cont_splash_mem: memory@9d400000 { >> - reg = <0x0 0x9d400000 0x0 0x2400000>; >> - no-map; >> - }; >> - >> ramoops@ffc00000 { >> compatible = "ramoops"; >> reg = <0x0 0xffc00000 0x0 0x100000>; >> diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi >> index e0fda4d754fe..191c2664f721 100644 >> --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi >> +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi >> @@ -98,12 +98,6 @@ spss_mem: memory@97f00000 { >> no-map; >> }; >> >> - /* Cont splash region set up by the bootloader */ >> - cont_splash_mem: framebuffer@9d400000 { >> - reg = <0 0x9d400000 0 0x2400000>; >> - no-map; >> - }; >> - >> rmtfs_mem: memory@f6301000 { >> compatible = "qcom,rmtfs-mem"; >> reg = <0 0xf6301000 0 0x200000>; >> diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi >> index 479859bd8ab3..ecec2ee46683 100644 >> --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi >> +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi >> @@ -865,6 +865,11 @@ spss_mem: spss@97b00000 { >> no-map; >> }; >> >> + cont_splash_mem: framebuffer@9d400000 { >> + reg = <0 0x9d400000 0 0x2400000>; >> + no-map; >> + }; >> + >> mdata_mem: mpss-metadata { >> alloc-ranges = <0 0xa0000000 0 0x20000000>; >> size = <0 0x4000>; >> diff --git a/arch/arm64/boot/dts/qcom/sdm850.dtsi b/arch/arm64/boot/dts/qcom/sdm850.dtsi >> index da9f6fbe32f6..b787575c77a5 100644 >> --- a/arch/arm64/boot/dts/qcom/sdm850.dtsi >> +++ b/arch/arm64/boot/dts/qcom/sdm850.dtsi >> @@ -7,6 +7,8 @@ >> >> #include "sdm845.dtsi" >> >> +/delete-node/ &cont_splash_mem; >> + >> &cpu4_opp_table { >> cpu4_opp33: opp-2841600000 { >> opp-hz = /bits/ 64 <2841600000>;
On 14.03.2023 11:46, Caleb Connolly wrote: > > > On 14/03/2023 10:05, Konrad Dybcio wrote: >> >> >> On 14.03.2023 05:58, Caleb Connolly wrote: >>> Almost all of the SDM845 devices actually map the same region for the >>> continuous splash / framebuffer. de-dup all the devices that specify it >>> manually and put it in sdm845.dtsi instead. >>> >>> This now reserves it on the OnePlus 6 where it was not reserved before, >>> this is intentional. >>> >>> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org> >>> --- >> You didn't explain why is not done on 850 (which I assume has to do with >> the windows memory map being different and putting it somewhere else) and >> the reasoning for reserving it at all. > > Patch 2 reserves it for 850 (not sure I understand you correctly?). The > only difference there is the address. Okay, but you did not say anything about it in this patch even though you made changes to sdm850, perhaps either doing it in one go or explaining it here would have been beneficial. > > The reason for reserving it at all has been previously discussed, when > it was added for db845c [1], the conclusion being that a better approach > would be nice but didn't seem to be trivial to implement (Cc'd Dmitry). > > I acknowledge that reserving this region as we do currently may not be > the optimal way of doing so, but I would like to avoid the kernel trying > to map memory here and crash my device - and this does that at least :> Missing Fixes, then? > > Basically, my thinking: > * NOT reserving this region is known to cause crashes Missing from the commit message > * The OnePlus 6 doesn't currently reserve this region, and has some crashes The crashing part is missing from the commit message > * All the devices that do, reserve it at the same address Missing from the commit message > * Some don't reserve the full size which is WRONG Missing from the commit message > * I'll reserve it for the OnePlus 6, de-dup the DT and ensure that the > whole size is reserved for all devices. Missing from the commit message > * ? > * Profit Yes > >> >> If that's the framebuffer handoff issue with smmu faults happening, it may >> be worth looking into solving that properly, i.e. introducing something like >> qcom,framebuffer which would suck up the starting address and figure out the >> required size based on MDP5 VIG pipes' registers and could tickle the >> autorefresh regs if needed. See how lk2nd does it, the hardware underneath >> hasn't changed since msm8974. >> >> Then, on drm handoff it could free the memory and let drm/msm initialize >> its own, new, dynamically-allocated and dynamically-sized region as it wants. >> >> Or we can use mdss's never-used memory-region property, but that would >> kill 35 or so megs of ram for everyone, no matter display their resolution. > > Freeing up this ~30mb region sounds like a good improvement to me. I > don't see how it's related to this patch though - especially given that > commonising the region will make whatever long-term handoff solution we > come up with easier anyway. > > Apologies if I'm jumping the gun a bit, I'm just trying to avoid > blocking this patch on a tangential discussion. Okay sure, all of that is valid, but you need to explain these changes, or people will just think that you decided to randomly steal RAM from them only to commonize some nodes! I'm not saying the contents of this patch are very bad, but I am saying that you're not selling it to me well enough. Konrad > > [1]: > https://lore.kernel.org/linux-arm-msm/dfcc8baa-c0a3-c554-a8cf-75702a1c4cad@linaro.org/ > [2]: > https://lore.kernel.org/linux-arm-msm/2c0a893f-b1c2-a77e-4ad4-409c1c778655@linaro.org/ >> >> Konrad >>> arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi | 6 ------ >>> arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts | 5 ----- >>> arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 5 ----- >>> arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi | 6 ------ >>> .../arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 6 ------ >>> arch/arm64/boot/dts/qcom/sdm845.dtsi | 5 +++++ >>> arch/arm64/boot/dts/qcom/sdm850.dtsi | 2 ++ >>> 7 files changed, 7 insertions(+), 28 deletions(-) >>> >>> diff --git a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi >>> index f942c5afea9b..6a1c674a015b 100644 >>> --- a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi >>> +++ b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi >>> @@ -93,12 +93,6 @@ spss_mem: memory@99000000 { >>> no-map; >>> }; >>> >>> - /* Framebuffer region */ >>> - memory@9d400000 { >>> - reg = <0x0 0x9d400000 0x0 0x2400000>; >>> - no-map; >>> - }; >>> - >>> /* rmtfs lower guard */ >>> memory@f0800000 { >>> reg = <0 0xf0800000 0 0x1000>; >>> diff --git a/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts b/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts >>> index d37a433130b9..7c2457948a32 100644 >>> --- a/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts >>> +++ b/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts >>> @@ -55,11 +55,6 @@ vreg_s4a_1p8: pm8998-smps4 { >>> }; >>> >>> reserved-memory { >>> - memory@9d400000 { >>> - reg = <0x0 0x9d400000 0x0 0x02400000>; >>> - no-map; >>> - }; >>> - >>> memory@a1300000 { >>> compatible = "ramoops"; >>> reg = <0x0 0xa1300000 0x0 0x100000>; >>> diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts >>> index b54e304abf71..4f6b1053c15b 100644 >>> --- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts >>> +++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts >>> @@ -60,11 +60,6 @@ key-vol-up { >>> }; >>> >>> reserved-memory { >>> - framebuffer_region@9d400000 { >>> - reg = <0x0 0x9d400000 0x0 (1080 * 2160 * 4)>; >>> - no-map; >>> - }; >>> - >>> ramoops: ramoops@b0000000 { >>> compatible = "ramoops"; >>> reg = <0 0xb0000000 0 0x00400000>; >>> diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi >>> index 4984c7496c31..7e273cc0158d 100644 >>> --- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi >>> +++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi >>> @@ -79,12 +79,6 @@ vreg_s4a_1p8: pm8998-smps4 { >>> }; >>> >>> reserved-memory { >>> - /* SONY was cool and didn't diverge from MTP this time, yay! */ >>> - cont_splash_mem: memory@9d400000 { >>> - reg = <0x0 0x9d400000 0x0 0x2400000>; >>> - no-map; >>> - }; >>> - >>> ramoops@ffc00000 { >>> compatible = "ramoops"; >>> reg = <0x0 0xffc00000 0x0 0x100000>; >>> diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi >>> index e0fda4d754fe..191c2664f721 100644 >>> --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi >>> +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi >>> @@ -98,12 +98,6 @@ spss_mem: memory@97f00000 { >>> no-map; >>> }; >>> >>> - /* Cont splash region set up by the bootloader */ >>> - cont_splash_mem: framebuffer@9d400000 { >>> - reg = <0 0x9d400000 0 0x2400000>; >>> - no-map; >>> - }; >>> - >>> rmtfs_mem: memory@f6301000 { >>> compatible = "qcom,rmtfs-mem"; >>> reg = <0 0xf6301000 0 0x200000>; >>> diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi >>> index 479859bd8ab3..ecec2ee46683 100644 >>> --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi >>> +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi >>> @@ -865,6 +865,11 @@ spss_mem: spss@97b00000 { >>> no-map; >>> }; >>> >>> + cont_splash_mem: framebuffer@9d400000 { >>> + reg = <0 0x9d400000 0 0x2400000>; >>> + no-map; >>> + }; >>> + >>> mdata_mem: mpss-metadata { >>> alloc-ranges = <0 0xa0000000 0 0x20000000>; >>> size = <0 0x4000>; >>> diff --git a/arch/arm64/boot/dts/qcom/sdm850.dtsi b/arch/arm64/boot/dts/qcom/sdm850.dtsi >>> index da9f6fbe32f6..b787575c77a5 100644 >>> --- a/arch/arm64/boot/dts/qcom/sdm850.dtsi >>> +++ b/arch/arm64/boot/dts/qcom/sdm850.dtsi >>> @@ -7,6 +7,8 @@ >>> >>> #include "sdm845.dtsi" >>> >>> +/delete-node/ &cont_splash_mem; >>> + >>> &cpu4_opp_table { >>> cpu4_opp33: opp-2841600000 { >>> opp-hz = /bits/ 64 <2841600000>; >
On 14/03/2023 10:52, Konrad Dybcio wrote: > > > On 14.03.2023 11:46, Caleb Connolly wrote: >> >> >> On 14/03/2023 10:05, Konrad Dybcio wrote: >>> >>> >>> On 14.03.2023 05:58, Caleb Connolly wrote: >>>> Almost all of the SDM845 devices actually map the same region for the >>>> continuous splash / framebuffer. de-dup all the devices that specify it >>>> manually and put it in sdm845.dtsi instead. >>>> >>>> This now reserves it on the OnePlus 6 where it was not reserved before, >>>> this is intentional. >>>> >>>> Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org> >>>> --- >>> You didn't explain why is not done on 850 (which I assume has to do with >>> the windows memory map being different and putting it somewhere else) and >>> the reasoning for reserving it at all. >> >> Patch 2 reserves it for 850 (not sure I understand you correctly?). The >> only difference there is the address. > Okay, but you did not say anything about it in this patch even though > you made changes to sdm850, perhaps either doing it in one go or > explaining it here would have been beneficial. > >> >> The reason for reserving it at all has been previously discussed, when >> it was added for db845c [1], the conclusion being that a better approach >> would be nice but didn't seem to be trivial to implement (Cc'd Dmitry). >> >> I acknowledge that reserving this region as we do currently may not be >> the optimal way of doing so, but I would like to avoid the kernel trying >> to map memory here and crash my device - and this does that at least :> > Missing Fixes, then? A backport would need to be sent separately for each device to avoid conflicts. > >> >> Basically, my thinking: >> * NOT reserving this region is known to cause crashes > Missing from the commit message > >> * The OnePlus 6 doesn't currently reserve this region, and has some crashes > The crashing part is missing from the commit message > >> * All the devices that do, reserve it at the same address > Missing from the commit message > >> * Some don't reserve the full size which is WRONG > Missing from the commit message > >> * I'll reserve it for the OnePlus 6, de-dup the DT and ensure that the >> whole size is reserved for all devices. > Missing from the commit message If the status quo is anything to go by (and I would generally defend that it is) then none of these things are actually relevant to this patch. This region *should* be reserved ("downstream reserves it"), it already is for all devices except the op6. The address and size are the same for all sdm845 devices. None of these assertions are in question and they suitably justify this patch, so what purpose is there to including extra information? > >> * ? >> * Profit > Yes > >> >>> [snip] >> >> Apologies if I'm jumping the gun a bit, I'm just trying to avoid >> blocking this patch on a tangential discussion. > Okay sure, all of that is valid, but you need to explain these changes, > or people will just think that you decided to randomly steal RAM from > them only to commonize some nodes! I'm not saying the contents of this> patch are very bad, but I am saying that you're not selling it to me > well enough. Fair enough, thanks for explaining. I should have mentioned that the op6 reserves this region in downstream, and that reserving anything except the full size is an error. Thanks for pointing these out. I'll spin a v2 with the context you asked for and take the opportunity to note the current state of things wrt potentially freeing this region up in the future. > > Konrad >> >> [1]: >> https://lore.kernel.org/linux-arm-msm/dfcc8baa-c0a3-c554-a8cf-75702a1c4cad@linaro.org/ >> [2]: >> https://lore.kernel.org/linux-arm-msm/2c0a893f-b1c2-a77e-4ad4-409c1c778655@linaro.org/ >>> >>> Konrad >>>> arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi | 6 ------ >>>> arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts | 5 ----- >>>> arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 5 ----- >>>> arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi | 6 ------ >>>> .../arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 6 ------ >>>> arch/arm64/boot/dts/qcom/sdm845.dtsi | 5 +++++ >>>> arch/arm64/boot/dts/qcom/sdm850.dtsi | 2 ++ >>>> 7 files changed, 7 insertions(+), 28 deletions(-) >>>> >>>> diff --git a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi >>>> index f942c5afea9b..6a1c674a015b 100644 >>>> --- a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi >>>> +++ b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi >>>> @@ -93,12 +93,6 @@ spss_mem: memory@99000000 { >>>> no-map; >>>> }; >>>> >>>> - /* Framebuffer region */ >>>> - memory@9d400000 { >>>> - reg = <0x0 0x9d400000 0x0 0x2400000>; >>>> - no-map; >>>> - }; >>>> - >>>> /* rmtfs lower guard */ >>>> memory@f0800000 { >>>> reg = <0 0xf0800000 0 0x1000>; >>>> diff --git a/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts b/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts >>>> index d37a433130b9..7c2457948a32 100644 >>>> --- a/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts >>>> +++ b/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts >>>> @@ -55,11 +55,6 @@ vreg_s4a_1p8: pm8998-smps4 { >>>> }; >>>> >>>> reserved-memory { >>>> - memory@9d400000 { >>>> - reg = <0x0 0x9d400000 0x0 0x02400000>; >>>> - no-map; >>>> - }; >>>> - >>>> memory@a1300000 { >>>> compatible = "ramoops"; >>>> reg = <0x0 0xa1300000 0x0 0x100000>; >>>> diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts >>>> index b54e304abf71..4f6b1053c15b 100644 >>>> --- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts >>>> +++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts >>>> @@ -60,11 +60,6 @@ key-vol-up { >>>> }; >>>> >>>> reserved-memory { >>>> - framebuffer_region@9d400000 { >>>> - reg = <0x0 0x9d400000 0x0 (1080 * 2160 * 4)>; >>>> - no-map; >>>> - }; >>>> - >>>> ramoops: ramoops@b0000000 { >>>> compatible = "ramoops"; >>>> reg = <0 0xb0000000 0 0x00400000>; >>>> diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi >>>> index 4984c7496c31..7e273cc0158d 100644 >>>> --- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi >>>> +++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi >>>> @@ -79,12 +79,6 @@ vreg_s4a_1p8: pm8998-smps4 { >>>> }; >>>> >>>> reserved-memory { >>>> - /* SONY was cool and didn't diverge from MTP this time, yay! */ >>>> - cont_splash_mem: memory@9d400000 { >>>> - reg = <0x0 0x9d400000 0x0 0x2400000>; >>>> - no-map; >>>> - }; >>>> - >>>> ramoops@ffc00000 { >>>> compatible = "ramoops"; >>>> reg = <0x0 0xffc00000 0x0 0x100000>; >>>> diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi >>>> index e0fda4d754fe..191c2664f721 100644 >>>> --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi >>>> +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi >>>> @@ -98,12 +98,6 @@ spss_mem: memory@97f00000 { >>>> no-map; >>>> }; >>>> >>>> - /* Cont splash region set up by the bootloader */ >>>> - cont_splash_mem: framebuffer@9d400000 { >>>> - reg = <0 0x9d400000 0 0x2400000>; >>>> - no-map; >>>> - }; >>>> - >>>> rmtfs_mem: memory@f6301000 { >>>> compatible = "qcom,rmtfs-mem"; >>>> reg = <0 0xf6301000 0 0x200000>; >>>> diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi >>>> index 479859bd8ab3..ecec2ee46683 100644 >>>> --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi >>>> +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi >>>> @@ -865,6 +865,11 @@ spss_mem: spss@97b00000 { >>>> no-map; >>>> }; >>>> >>>> + cont_splash_mem: framebuffer@9d400000 { >>>> + reg = <0 0x9d400000 0 0x2400000>; >>>> + no-map; >>>> + }; >>>> + >>>> mdata_mem: mpss-metadata { >>>> alloc-ranges = <0 0xa0000000 0 0x20000000>; >>>> size = <0 0x4000>; >>>> diff --git a/arch/arm64/boot/dts/qcom/sdm850.dtsi b/arch/arm64/boot/dts/qcom/sdm850.dtsi >>>> index da9f6fbe32f6..b787575c77a5 100644 >>>> --- a/arch/arm64/boot/dts/qcom/sdm850.dtsi >>>> +++ b/arch/arm64/boot/dts/qcom/sdm850.dtsi >>>> @@ -7,6 +7,8 @@ >>>> >>>> #include "sdm845.dtsi" >>>> >>>> +/delete-node/ &cont_splash_mem; >>>> + >>>> &cpu4_opp_table { >>>> cpu4_opp33: opp-2841600000 { >>>> opp-hz = /bits/ 64 <2841600000>; >>
diff --git a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi index f942c5afea9b..6a1c674a015b 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi @@ -93,12 +93,6 @@ spss_mem: memory@99000000 { no-map; }; - /* Framebuffer region */ - memory@9d400000 { - reg = <0x0 0x9d400000 0x0 0x2400000>; - no-map; - }; - /* rmtfs lower guard */ memory@f0800000 { reg = <0 0xf0800000 0 0x1000>; diff --git a/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts b/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts index d37a433130b9..7c2457948a32 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts @@ -55,11 +55,6 @@ vreg_s4a_1p8: pm8998-smps4 { }; reserved-memory { - memory@9d400000 { - reg = <0x0 0x9d400000 0x0 0x02400000>; - no-map; - }; - memory@a1300000 { compatible = "ramoops"; reg = <0x0 0xa1300000 0x0 0x100000>; diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts index b54e304abf71..4f6b1053c15b 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts @@ -60,11 +60,6 @@ key-vol-up { }; reserved-memory { - framebuffer_region@9d400000 { - reg = <0x0 0x9d400000 0x0 (1080 * 2160 * 4)>; - no-map; - }; - ramoops: ramoops@b0000000 { compatible = "ramoops"; reg = <0 0xb0000000 0 0x00400000>; diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi index 4984c7496c31..7e273cc0158d 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi @@ -79,12 +79,6 @@ vreg_s4a_1p8: pm8998-smps4 { }; reserved-memory { - /* SONY was cool and didn't diverge from MTP this time, yay! */ - cont_splash_mem: memory@9d400000 { - reg = <0x0 0x9d400000 0x0 0x2400000>; - no-map; - }; - ramoops@ffc00000 { compatible = "ramoops"; reg = <0x0 0xffc00000 0x0 0x100000>; diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi index e0fda4d754fe..191c2664f721 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi @@ -98,12 +98,6 @@ spss_mem: memory@97f00000 { no-map; }; - /* Cont splash region set up by the bootloader */ - cont_splash_mem: framebuffer@9d400000 { - reg = <0 0x9d400000 0 0x2400000>; - no-map; - }; - rmtfs_mem: memory@f6301000 { compatible = "qcom,rmtfs-mem"; reg = <0 0xf6301000 0 0x200000>; diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index 479859bd8ab3..ecec2ee46683 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -865,6 +865,11 @@ spss_mem: spss@97b00000 { no-map; }; + cont_splash_mem: framebuffer@9d400000 { + reg = <0 0x9d400000 0 0x2400000>; + no-map; + }; + mdata_mem: mpss-metadata { alloc-ranges = <0 0xa0000000 0 0x20000000>; size = <0 0x4000>; diff --git a/arch/arm64/boot/dts/qcom/sdm850.dtsi b/arch/arm64/boot/dts/qcom/sdm850.dtsi index da9f6fbe32f6..b787575c77a5 100644 --- a/arch/arm64/boot/dts/qcom/sdm850.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm850.dtsi @@ -7,6 +7,8 @@ #include "sdm845.dtsi" +/delete-node/ &cont_splash_mem; + &cpu4_opp_table { cpu4_opp33: opp-2841600000 { opp-hz = /bits/ 64 <2841600000>;
Almost all of the SDM845 devices actually map the same region for the continuous splash / framebuffer. de-dup all the devices that specify it manually and put it in sdm845.dtsi instead. This now reserves it on the OnePlus 6 where it was not reserved before, this is intentional. Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org> --- arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi | 6 ------ arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts | 5 ----- arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 5 ----- arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi | 6 ------ .../arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 6 ------ arch/arm64/boot/dts/qcom/sdm845.dtsi | 5 +++++ arch/arm64/boot/dts/qcom/sdm850.dtsi | 2 ++ 7 files changed, 7 insertions(+), 28 deletions(-)