--- /dev/null
+From 93942b70461574ca7fc3d91494ca89b16a4c64c7 Mon Sep 17 00:00:00 2001
+From: Arseniy Krasnov <avkrasnov@sberdevices.ru>
+Date: Wed, 29 Mar 2023 10:47:26 +0300
+Subject: mtd: rawnand: meson: fix bitmask for length in command word
+
+From: Arseniy Krasnov <avkrasnov@sberdevices.ru>
+
+commit 93942b70461574ca7fc3d91494ca89b16a4c64c7 upstream.
+
+Valid mask is 0x3FFF, without this patch the following problems were
+found:
+
+1) [ 0.938914] Could not find a valid ONFI parameter page, trying
+ bit-wise majority to recover it
+ [ 0.947384] ONFI parameter recovery failed, aborting
+
+2) Read with disabled ECC mode was broken.
+
+Fixes: 8fae856c5350 ("mtd: rawnand: meson: add support for Amlogic NAND flash controller")
+Cc: <Stable@vger.kernel.org>
+Signed-off-by: Arseniy Krasnov <AVKrasnov@sberdevices.ru>
+Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
+Link: https://lore.kernel.org/linux-mtd/3794ffbf-dfea-e96f-1f97-fe235b005e19@sberdevices.ru
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/mtd/nand/raw/meson_nand.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/drivers/mtd/nand/raw/meson_nand.c
++++ b/drivers/mtd/nand/raw/meson_nand.c
+@@ -276,7 +276,7 @@ static void meson_nfc_cmd_access(struct
+
+ if (raw) {
+ len = mtd->writesize + mtd->oobsize;
+- cmd = (len & GENMASK(5, 0)) | scrambler | DMA_DIR(dir);
++ cmd = (len & GENMASK(13, 0)) | scrambler | DMA_DIR(dir);
+ writel(cmd, nfc->reg_base + NFC_REG_CMD);
+ return;
+ }
+@@ -540,7 +540,7 @@ static int meson_nfc_read_buf(struct nan
+ if (ret)
+ goto out;
+
+- cmd = NFC_CMD_N2M | (len & GENMASK(5, 0));
++ cmd = NFC_CMD_N2M | (len & GENMASK(13, 0));
+ writel(cmd, nfc->reg_base + NFC_REG_CMD);
+
+ meson_nfc_drain_cmd(nfc);
+@@ -564,7 +564,7 @@ static int meson_nfc_write_buf(struct na
+ if (ret)
+ return ret;
+
+- cmd = NFC_CMD_M2N | (len & GENMASK(5, 0));
++ cmd = NFC_CMD_M2N | (len & GENMASK(13, 0));
+ writel(cmd, nfc->reg_base + NFC_REG_CMD);
+
+ meson_nfc_drain_cmd(nfc);
--- /dev/null
+From f71e0e329c152c7f11ddfd97ffc62aba152fad3f Mon Sep 17 00:00:00 2001
+From: Christophe Kerello <christophe.kerello@foss.st.com>
+Date: Tue, 28 Mar 2023 17:58:18 +0200
+Subject: mtd: rawnand: stm32_fmc2: remove unsupported EDO mode
+
+From: Christophe Kerello <christophe.kerello@foss.st.com>
+
+commit f71e0e329c152c7f11ddfd97ffc62aba152fad3f upstream.
+
+Remove the EDO mode support from as the FMC2 controller does not
+support the feature.
+
+Signed-off-by: Christophe Kerello <christophe.kerello@foss.st.com>
+Fixes: 2cd457f328c1 ("mtd: rawnand: stm32_fmc2: add STM32 FMC2 NAND flash controller driver")
+Cc: stable@vger.kernel.org #v5.4+
+Reviewed-by: Tudor Ambarus <tudor.ambarus@linaro.org>
+Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
+Link: https://lore.kernel.org/linux-mtd/20230328155819.225521-2-christophe.kerello@foss.st.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/mtd/nand/raw/stm32_fmc2_nand.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/mtd/nand/raw/stm32_fmc2_nand.c
++++ b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
+@@ -1525,6 +1525,9 @@ static int stm32_fmc2_nfc_setup_interfac
+ if (IS_ERR(sdrt))
+ return PTR_ERR(sdrt);
+
++ if (sdrt->tRC_min < 30000)
++ return -EOPNOTSUPP;
++
+ if (chipnr == NAND_DATA_IFACE_CHECK_ONLY)
+ return 0;
+
--- /dev/null
+From ddbb664b6ab8de7dffa388ae0c88cd18616494e5 Mon Sep 17 00:00:00 2001
+From: Christophe Kerello <christophe.kerello@foss.st.com>
+Date: Tue, 28 Mar 2023 17:58:19 +0200
+Subject: mtd: rawnand: stm32_fmc2: use timings.mode instead of checking tRC_min
+
+From: Christophe Kerello <christophe.kerello@foss.st.com>
+
+commit ddbb664b6ab8de7dffa388ae0c88cd18616494e5 upstream.
+
+Use timings.mode value instead of checking tRC_min timing
+for EDO mode support.
+
+Signed-off-by: Christophe Kerello <christophe.kerello@foss.st.com>
+Fixes: 2cd457f328c1 ("mtd: rawnand: stm32_fmc2: add STM32 FMC2 NAND flash controller driver")
+Cc: stable@vger.kernel.org #v5.10+
+Reviewed-by: Tudor Ambarus <tudor.ambarus@linaro.org>
+Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
+Link: https://lore.kernel.org/linux-mtd/20230328155819.225521-3-christophe.kerello@foss.st.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/mtd/nand/raw/stm32_fmc2_nand.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/mtd/nand/raw/stm32_fmc2_nand.c
++++ b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
+@@ -1525,7 +1525,7 @@ static int stm32_fmc2_nfc_setup_interfac
+ if (IS_ERR(sdrt))
+ return PTR_ERR(sdrt);
+
+- if (sdrt->tRC_min < 30000)
++ if (conf->timings.mode > 3)
+ return -EOPNOTSUPP;
+
+ if (chipnr == NAND_DATA_IFACE_CHECK_ONLY)
--- /dev/null
+From 0c3089601f064d80b3838eceb711fcac04bceaad Mon Sep 17 00:00:00 2001
+From: Bang Li <libang.linuxer@gmail.com>
+Date: Wed, 29 Mar 2023 00:30:12 +0800
+Subject: mtdblock: tolerate corrected bit-flips
+
+From: Bang Li <libang.linuxer@gmail.com>
+
+commit 0c3089601f064d80b3838eceb711fcac04bceaad upstream.
+
+mtd_read() may return -EUCLEAN in case of corrected bit-flips.This
+particular condition should not be treated like an error.
+
+Signed-off-by: Bang Li <libang.linuxer@gmail.com>
+Fixes: e47f68587b82 ("mtd: check for max_bitflips in mtd_read_oob()")
+Cc: <stable@vger.kernel.org> # v3.7
+Acked-by: Richard Weinberger <richard@nod.at>
+Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
+Link: https://lore.kernel.org/linux-mtd/20230328163012.4264-1-libang.linuxer@gmail.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/mtd/mtdblock.c | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+--- a/drivers/mtd/mtdblock.c
++++ b/drivers/mtd/mtdblock.c
+@@ -153,7 +153,7 @@ static int do_cached_write (struct mtdbl
+ mtdblk->cache_state = STATE_EMPTY;
+ ret = mtd_read(mtd, sect_start, sect_size,
+ &retlen, mtdblk->cache_data);
+- if (ret)
++ if (ret && !mtd_is_bitflip(ret))
+ return ret;
+ if (retlen != sect_size)
+ return -EIO;
+@@ -188,8 +188,12 @@ static int do_cached_read (struct mtdblk
+ pr_debug("mtdblock: read on \"%s\" at 0x%lx, size 0x%x\n",
+ mtd->name, pos, len);
+
+- if (!sect_size)
+- return mtd_read(mtd, pos, len, &retlen, buf);
++ if (!sect_size) {
++ ret = mtd_read(mtd, pos, len, &retlen, buf);
++ if (ret && !mtd_is_bitflip(ret))
++ return ret;
++ return 0;
++ }
+
+ while (len > 0) {
+ unsigned long sect_start = (pos/sect_size)*sect_size;
+@@ -209,7 +213,7 @@ static int do_cached_read (struct mtdblk
+ memcpy (buf, mtdblk->cache_data + offset, size);
+ } else {
+ ret = mtd_read(mtd, pos, size, &retlen, buf);
+- if (ret)
++ if (ret && !mtd_is_bitflip(ret))
+ return ret;
+ if (retlen != size)
+ return -EIO;
btrfs-print-checksum-type-and-implementation-at-mount-time.patch
btrfs-fix-fast-csum-implementation-detection.patch
fbmem-reject-fb_activate_kd_text-from-userspace.patch
+mtdblock-tolerate-corrected-bit-flips.patch
+mtd-rawnand-meson-fix-bitmask-for-length-in-command-word.patch
+mtd-rawnand-stm32_fmc2-remove-unsupported-edo-mode.patch
+mtd-rawnand-stm32_fmc2-use-timings.mode-instead-of-checking-trc_min.patch
projects / thirdparty / kernel / stable-queue.git / commitdiff
