From: Sasha Levin Date: Fri, 29 Sep 2023 13:54:00 +0000 (-0400) Subject: Drop arm64-dts-qcom-sdm845-db845c-mark-cont-splash-memory.patch from 5.15/5.10 X-Git-Tag: v6.5.6~73 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=44d1f321b4965976e1e3ff74d5cd871a94494891;p=thirdparty%2Fkernel%2Fstable-queue.git Drop arm64-dts-qcom-sdm845-db845c-mark-cont-splash-memory.patch from 5.15/5.10 --- diff --git a/queue-5.10/arm64-dts-qcom-sdm845-db845c-mark-cont-splash-memory.patch b/queue-5.10/arm64-dts-qcom-sdm845-db845c-mark-cont-splash-memory.patch deleted file mode 100644 index 8b36e336110..00000000000 --- a/queue-5.10/arm64-dts-qcom-sdm845-db845c-mark-cont-splash-memory.patch +++ /dev/null @@ -1,58 +0,0 @@ -From edf940766b105830f37ad2cd3ecc56dad21393b4 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 26 Jul 2023 18:57:19 +0530 -Subject: arm64: dts: qcom: sdm845-db845c: Mark cont splash memory region as - reserved - -From: Amit Pundir - -[ Upstream commit 110e70fccce4f22b53986ae797d665ffb1950aa6 ] - -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: Caleb Connolly -Signed-off-by: Amit Pundir -Acked-by: Krzysztof Kozlowski -Link: https://lore.kernel.org/r/20230726132719.2117369-2-amit.pundir@linaro.org -Signed-off-by: Bjorn Andersson -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts -index 1e889ca932e41..67cd869de3528 100644 ---- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts -+++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts -@@ -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"; - }; - --- -2.40.1 - diff --git a/queue-5.10/series b/queue-5.10/series index 3189f7ca864..cc2baf2c4a4 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -75,7 +75,6 @@ media-venus-hfi-define-additional-6xx-registers.patch media-venus-core-add-differentiator-is_v6-core.patch media-venus-hfi-add-a-6xx-boot-logic.patch media-venus-hfi_venus-write-to-vidc_ctrl_init-after-.patch -arm64-dts-qcom-sdm845-db845c-mark-cont-splash-memory.patch netfilter-use-actual-socket-sk-for-reject-action.patch netfilter-nft_exthdr-support-sctp-chunks.patch netfilter-nf_tables-add-and-use-nft_sk-helper.patch diff --git a/queue-5.15/arm64-dts-qcom-sdm845-db845c-mark-cont-splash-memory.patch b/queue-5.15/arm64-dts-qcom-sdm845-db845c-mark-cont-splash-memory.patch deleted file mode 100644 index 93f975f3cf6..00000000000 --- a/queue-5.15/arm64-dts-qcom-sdm845-db845c-mark-cont-splash-memory.patch +++ /dev/null @@ -1,58 +0,0 @@ -From c9add7fc549985de3b89a6b30d6458a107e66f96 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 26 Jul 2023 18:57:19 +0530 -Subject: arm64: dts: qcom: sdm845-db845c: Mark cont splash memory region as - reserved - -From: Amit Pundir - -[ Upstream commit 110e70fccce4f22b53986ae797d665ffb1950aa6 ] - -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: Caleb Connolly -Signed-off-by: Amit Pundir -Acked-by: Krzysztof Kozlowski -Link: https://lore.kernel.org/r/20230726132719.2117369-2-amit.pundir@linaro.org -Signed-off-by: Bjorn Andersson -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts -index 5ce270f0b2ec1..c25d7328c6ccc 100644 ---- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts -+++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts -@@ -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"; - }; - --- -2.40.1 - diff --git a/queue-5.15/series b/queue-5.15/series index f48dc23b98e..ad4e11a26fa 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -79,7 +79,6 @@ input-i8042-rename-i8042-x86ia64io.h-to-i8042-acpipn.patch input-i8042-add-quirk-for-tuxedo-gemini-17-gen1-clev.patch perf-jevents-switch-build-to-use-jevents.py.patch perf-build-update-build-rule-for-generated-files.patch -arm64-dts-qcom-sdm845-db845c-mark-cont-splash-memory.patch netfilter-exthdr-add-support-for-tcp-option-removal.patch netfilter-nft_exthdr-fix-non-linear-header-modificat.patch ata-libata-rename-link-flag-ata_lflag_no_db_delay.patch