From: Greg Kroah-Hartman Date: Sat, 18 Feb 2023 11:59:10 +0000 (+0100) Subject: drop mmc patch from 4.19 and 5.4 that broke the build X-Git-Tag: v4.14.306~26 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5736da0afc69ae69a8efe5c528b126abbad2452d;p=thirdparty%2Fkernel%2Fstable-queue.git drop mmc patch from 4.19 and 5.4 that broke the build --- diff --git a/queue-4.19/mmc-jz4740-work-around-bug-on-jz4760-b.patch b/queue-4.19/mmc-jz4740-work-around-bug-on-jz4760-b.patch deleted file mode 100644 index 9403a28a92f..00000000000 --- a/queue-4.19/mmc-jz4740-work-around-bug-on-jz4760-b.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 3f18c5046e633cc4bbad396b74c05d46d353033d Mon Sep 17 00:00:00 2001 -From: Paul Cercueil -Date: Tue, 31 Jan 2023 21:02:28 +0000 -Subject: mmc: jz4740: Work around bug on JZ4760(B) - -From: Paul Cercueil - -commit 3f18c5046e633cc4bbad396b74c05d46d353033d upstream. - -On JZ4760 and JZ4760B, SD cards fail to run if the maximum clock -rate is set to 50 MHz, even though the controller officially does -support it. - -Until the actual bug is found and fixed, limit the maximum clock rate to -24 MHz. - -Signed-off-by: Paul Cercueil -Cc: stable@vger.kernel.org -Link: https://lore.kernel.org/r/20230131210229.68129-1-paul@crapouillou.net -Signed-off-by: Ulf Hansson -Signed-off-by: Greg Kroah-Hartman ---- - drivers/mmc/host/jz4740_mmc.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - ---- a/drivers/mmc/host/jz4740_mmc.c -+++ b/drivers/mmc/host/jz4740_mmc.c -@@ -1082,6 +1082,16 @@ static int jz4740_mmc_probe(struct platf - mmc->ops = &jz4740_mmc_ops; - if (!mmc->f_max) - mmc->f_max = JZ_MMC_CLK_RATE; -+ -+ /* -+ * There seems to be a problem with this driver on the JZ4760 and -+ * JZ4760B SoCs. There, when using the maximum rate supported (50 MHz), -+ * the communication fails with many SD cards. -+ * Until this bug is sorted out, limit the maximum rate to 24 MHz. -+ */ -+ if (host->version == JZ_MMC_JZ4760 && mmc->f_max > JZ_MMC_CLK_RATE) -+ mmc->f_max = JZ_MMC_CLK_RATE; -+ - mmc->f_min = mmc->f_max / 128; - mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34; - diff --git a/queue-4.19/series b/queue-4.19/series index 6b7545cdcb1..ed3afd8f6c9 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -68,7 +68,6 @@ nvme-fc-fix-a-missing-queue-put-in-nvmet_fc_ls_creat.patch aio-fix-mremap-after-fork-null-deref.patch netfilter-nft_tproxy-restrict-to-prerouting-hook.patch revert-x86-fpu-use-_alignof-to-avoid-undefined-behavior-in-type_align.patch -mmc-jz4740-work-around-bug-on-jz4760-b.patch mmc-sdio-fix-possible-resource-leaks-in-some-error-paths.patch alsa-hda-conexant-add-a-new-hda-codec-sn6180.patch alsa-hda-realtek-fixed-wrong-gpio-assigned.patch diff --git a/queue-5.4/mmc-jz4740-work-around-bug-on-jz4760-b.patch b/queue-5.4/mmc-jz4740-work-around-bug-on-jz4760-b.patch deleted file mode 100644 index 501f4851131..00000000000 --- a/queue-5.4/mmc-jz4740-work-around-bug-on-jz4760-b.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 3f18c5046e633cc4bbad396b74c05d46d353033d Mon Sep 17 00:00:00 2001 -From: Paul Cercueil -Date: Tue, 31 Jan 2023 21:02:28 +0000 -Subject: mmc: jz4740: Work around bug on JZ4760(B) - -From: Paul Cercueil - -commit 3f18c5046e633cc4bbad396b74c05d46d353033d upstream. - -On JZ4760 and JZ4760B, SD cards fail to run if the maximum clock -rate is set to 50 MHz, even though the controller officially does -support it. - -Until the actual bug is found and fixed, limit the maximum clock rate to -24 MHz. - -Signed-off-by: Paul Cercueil -Cc: stable@vger.kernel.org -Link: https://lore.kernel.org/r/20230131210229.68129-1-paul@crapouillou.net -Signed-off-by: Ulf Hansson -Signed-off-by: Greg Kroah-Hartman ---- - drivers/mmc/host/jz4740_mmc.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - ---- a/drivers/mmc/host/jz4740_mmc.c -+++ b/drivers/mmc/host/jz4740_mmc.c -@@ -1006,6 +1006,16 @@ static int jz4740_mmc_probe(struct platf - mmc->ops = &jz4740_mmc_ops; - if (!mmc->f_max) - mmc->f_max = JZ_MMC_CLK_RATE; -+ -+ /* -+ * There seems to be a problem with this driver on the JZ4760 and -+ * JZ4760B SoCs. There, when using the maximum rate supported (50 MHz), -+ * the communication fails with many SD cards. -+ * Until this bug is sorted out, limit the maximum rate to 24 MHz. -+ */ -+ if (host->version == JZ_MMC_JZ4760 && mmc->f_max > JZ_MMC_CLK_RATE) -+ mmc->f_max = JZ_MMC_CLK_RATE; -+ - mmc->f_min = mmc->f_max / 128; - mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34; - diff --git a/queue-5.4/series b/queue-5.4/series index e3e19fb386d..89084534ad3 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -126,7 +126,6 @@ xfs-prevent-uaf-in-xfs_log_item_in_current_chkpt.patch xfs-sync-lazy-sb-accounting-on-quiesce-of-read-only-mounts.patch revert-ipv4-fix-incorrect-route-flushing-when-source-address-is-deleted.patch ipv4-fix-incorrect-route-flushing-when-source-address-is-deleted.patch -mmc-jz4740-work-around-bug-on-jz4760-b.patch mmc-sdio-fix-possible-resource-leaks-in-some-error-paths.patch mmc-mmc_spi-fix-error-handling-in-mmc_spi_probe.patch alsa-hda-conexant-add-a-new-hda-codec-sn6180.patch