| Message ID | 2a7e3834-a3b2-8c58-011b-a266967bd479@free.fr (mailing list archive) |
|---|---|
| State | Mainlined |
| Headers | show |
| Series | [RESEND,v2] arm64: dts: qcom: msm8998: Extend TZ reserved memory area | expand |
On Mon 25 Feb 02:41 PST 2019, Marc Gonzalez wrote: > My console locks up as soon as Linux writes to [88800000,88f00000[ > AFAIU, that memory area is reserved for trustzone. > > Extend TZ reserved memory range, to prevent Linux from stepping on > trustzone's toes. > > Cc: stable@vger.kernel.org # 4.20+ > Reviewed-by: Sibi Sankar <sibis@codeaurora.org> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> > Fixes: c7833949564ec ("arm64: dts: qcom: msm8998: Add smem related nodes") > Signed-off-by: Marc Gonzalez <marc.w.gonzalez@free.fr> > --- > Resending through different SMTP server to avoid Google's banhammer > > Diff with v1: > Add Sibi's Rb > Tweak commit message > > Can we land this patch ASAP, so I don't have to remember to cherry-pick it > in every new branch? > --- > arch/arm64/boot/dts/qcom/msm8998.dtsi | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi > index d69401152089..f5ec83a91fe4 100644 > --- a/arch/arm64/boot/dts/qcom/msm8998.dtsi > +++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi > @@ -38,7 +38,7 @@ > }; > > memory@86200000 { > - reg = <0x0 0x86200000 0x0 0x2600000>; > + reg = <0x0 0x86200000 0x0 0x2d00000>; > no-map; > }; > > -- > 2.17.1
On Tue, 26 Feb 2019, Bjorn Andersson wrote: > On Mon 25 Feb 02:41 PST 2019, Marc Gonzalez wrote: > > > My console locks up as soon as Linux writes to [88800000,88f00000[ > > AFAIU, that memory area is reserved for trustzone. > > > > Extend TZ reserved memory range, to prevent Linux from stepping on > > trustzone's toes. > > > > Cc: stable@vger.kernel.org # 4.20+ > > Reviewed-by: Sibi Sankar <sibis@codeaurora.org> > > Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> Who will pick this up? Looks like a fix, so should really be merged post-haste.
On Thu, Feb 28, 2019 at 9:19 AM Lee Jones <lee.jones@linaro.org> wrote: > > On Tue, 26 Feb 2019, Bjorn Andersson wrote: > > > On Mon 25 Feb 02:41 PST 2019, Marc Gonzalez wrote: > > > > > My console locks up as soon as Linux writes to [88800000,88f00000[ > > > AFAIU, that memory area is reserved for trustzone. > > > > > > Extend TZ reserved memory range, to prevent Linux from stepping on > > > trustzone's toes. > > > > > > Cc: stable@vger.kernel.org # 4.20+ > > > Reviewed-by: Sibi Sankar <sibis@codeaurora.org> > > > > Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> > > Who will pick this up? > > Looks like a fix, so should really be merged post-haste. https://lore.kernel.org/linux-arm-kernel/1551245889-15219-1-git-send-email-andy.gross@linaro.org/ > > -- > Lee Jones [李琼斯] > Linaro Services Technical Lead > Linaro.org │ Open source software for ARM SoCs > Follow Linaro: Facebook | Twitter | Blog
diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi index d69401152089..f5ec83a91fe4 100644 --- a/arch/arm64/boot/dts/qcom/msm8998.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi @@ -38,7 +38,7 @@ }; memory@86200000 { - reg = <0x0 0x86200000 0x0 0x2600000>; + reg = <0x0 0x86200000 0x0 0x2d00000>; no-map; };