Commit 3f27eeaa authored by Amit Pundir's avatar Amit Pundir Committed by Guo Mengqi
Browse files

arm64: dts: qcom: sdm845-db845c: Mark cont splash memory region as reserved 

mainline inclusion
from mainline-v6.6-rc1
commit 110e70fc
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I95ATF
CVE: CVE-2023-52561

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=110e70fccce4f22b53986ae797d665ffb1950aa6



--------------------------------

[ Upstream commit 110e70fc ]

Adding a reserved memory region for the framebuffer memory
(the splash memory region set up by the bootloader).

It fixes a kernel panic (arm-smmu: Unhandled context fault
at this particular memory region) reported on DB845c running
v5.10.y.

Cc: stable@vger.kernel.org # v5.10+
Reviewed-by: default avatarCaleb Connolly <caleb.connolly@linaro.org>
Signed-off-by: default avatarAmit Pundir <amit.pundir@linaro.org>
Acked-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20230726132719.2117369-2-amit.pundir@linaro.org


Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarGuo Mengqi <guomengqi3@huawei.com>
parent a474d353

arch/arm64/boot/dts/qcom/sdm845-db845c.dts

+9 −0
Original line number Diff line number Diff line
@@ -85,6 +85,14 @@ 
		};

	};



	reserved-memory {

		/* Cont splash region set up by the bootloader */

		cont_splash_mem: framebuffer@9d400000 {

			reg = <0x0 0x9d400000 0x0 0x2400000>;

			no-map;

		};

	};



	lt9611_1v8: lt9611-vdd18-regulator {

		compatible = "regulator-fixed";

		regulator-name = "LT9611_1V8";
@@ -482,6 +490,7 @@ 
};



&mdss {

	memory-region = <&cont_splash_mem>;

	status = "okay";

};