4.20-stable review patch. If anyone has any objections, please let me know. ------------------ From: Marc Gonzalez <marc.w.gonzalez@xxxxxxx> commit 6e53330909672bd9a8c9f826e989a5945d9d9fdf upstream. 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@xxxxxxxxxxxxxxx # 4.20+ Reviewed-by: Sibi Sankar <sibis@xxxxxxxxxxxxxx> Fixes: c7833949564ec ("arm64: dts: qcom: msm8998: Add smem related nodes") Signed-off-by: Marc Gonzalez <marc.w.gonzalez@xxxxxxx> Signed-off-by: Andy Gross <andy.gross@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- arch/arm64/boot/dts/qcom/msm8998.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/arm64/boot/dts/qcom/msm8998.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi @@ -36,7 +36,7 @@ }; memory@86200000 { - reg = <0x0 0x86200000 0x0 0x2600000>; + reg = <0x0 0x86200000 0x0 0x2d00000>; no-map; };