[openwrt/openwrt] ath79: cfi: cmdset_0002: amd chip 0x2201 - write words

[LEDE Commits]

ynezz pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/8cc0fa8faceadac85353bb1a96e074518ef124e2

commit 8cc0fa8faceadac85353bb1a96e074518ef124e2
Author: Mauri Sandberg <sandberg at mailfence.com>
AuthorDate: Mon Sep 14 22:45:15 2020 +0300

    ath79: cfi: cmdset_0002: amd chip 0x2201 - write words
    
    Generally, in upstream CFI flash memory driver uses buffers for write
    operations. That does not work with AMD chip with id 0x2201 and we must
    resort to writing word sized chunks only. That is, to not apply general
    buffer write functionality for this given chip.
    
    Without the patch kernel logs will be flooded with entries like below:
    
    MTD do_erase_oneblock(): ERASE 0x01fa0000
    MTD do_write_buffer(): WRITE 0x01fa0000(0x00001985)
    MTD do_erase_oneblock(): ERASE 0x01f80000
    MTD do_write_buffer(): WRITE 0x01f80000(0x00001985)
    MTD do_write_buffer_wait(): software timeout, address:0x01f8000a.
    jffs2: Write clean marker to block at 0x01a60000 failed: -5
    MTD do_erase_oneblock(): ERASE 0x01f60000
    MTD do_write_buffer(): WRITE 0x01f60000(0x00001985)
    MTD do_write_buffer_wait(): software timeout, address:0x01f6000a.
    jffs2: Write clean marker to block at 0x01a40000 failed: -5
    
    References: http://patchwork.ozlabs.org/project/linux-mtd/patch/20210309174859.362060-1-sandberg@mailfence.com/
    Signed-off-by: Mauri Sandberg <sandberg at mailfence.com>
    [added link to usptream fix submission]
    Signed-off-by: Petr Štetiar <ynezz at true.cz>
---
 ...i_cmdset_0002-AMD-chip-0x2201-write-words.patch | 58 ++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/target/linux/ath79/patches-5.4/471-mtd-cfi_cmdset_0002-AMD-chip-0x2201-write-words.patch b/target/linux/ath79/patches-5.4/471-mtd-cfi_cmdset_0002-AMD-chip-0x2201-write-words.patch
new file mode 100644
index 0000000000..3c80872ef4
--- /dev/null
+++ b/target/linux/ath79/patches-5.4/471-mtd-cfi_cmdset_0002-AMD-chip-0x2201-write-words.patch
@@ -0,0 +1,58 @@
+From f1f811410af297c848e9ec17eaa280d190fdce10 Mon Sep 17 00:00:00 2001
+From: Mauri Sandberg <sandberg at mailfence.com>
+Date: Tue, 23 Feb 2021 18:09:31 +0200
+Subject: [PATCH] mtd: cfi_cmdset_0002: AMD chip 0x2201 - write words
+
+Buffer writes do not work with AMD chip 0x2201. The chip in question
+is a AMD/Spansion/Cypress Semiconductor S29GL256N and datasheet [1]
+talks about writing buffers being possible. While waiting for a neater
+solution resort to writing word-sized chunks only.
+
+Without the patch kernel logs will be flooded with entries like below:
+
+jffs2_scan_eraseblock(): End of filesystem marker found at 0x0
+jffs2_build_filesystem(): unlocking the mtd device...
+done.
+jffs2_build_filesystem(): erasing all blocks after the end marker...
+MTD do_write_buffer_wait(): software timeout, address:0x01ec000a.
+jffs2: Write clean marker to block at 0x01920000 failed: -5
+MTD do_write_buffer_wait(): software timeout, address:0x01e2000a.
+jffs2: Write clean marker to block at 0x01880000 failed: -5
+MTD do_write_buffer_wait(): software timeout, address:0x01e0000a.
+jffs2: Write clean marker to block at 0x01860000 failed: -5
+MTD do_write_buffer_wait(): software timeout, address:0x01dc000a.
+jffs2: Write clean marker to block at 0x01820000 failed: -5
+MTD do_write_buffer_wait(): software timeout, address:0x01da000a.
+jffs2: Write clean marker to block at 0x01800000 failed: -5
+...
+
+Tested on a Buffalo wzr-hp-g300nh running kernel 5.10.16.
+
+[1] https://www.cypress.com/file/219941/download
+or  https://datasheetspdf.com/pdf-file/565708/SPANSION/S29GL256N/1
+
+Signed-off-by: Mauri Sandberg <sandberg at mailfence.com>
+---
+ drivers/mtd/chips/cfi_cmdset_0002.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
+index a1f3e1031c3d..28b6f3583f8a 100644
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
+@@ -272,6 +272,10 @@ static void fixup_use_write_buffers(struct mtd_info *mtd)
+ {
+ 	struct map_info *map = mtd->priv;
+ 	struct cfi_private *cfi = map->fldrv_priv;
++
++	if ((cfi->mfr == CFI_MFR_AMD) && (cfi->id == 0x2201))
++		return;
++
+ 	if (cfi->cfiq->BufWriteTimeoutTyp) {
+ 		pr_debug("Using buffer write method\n");
+ 		mtd->_write = cfi_amdstd_write_buffers;
+
+base-commit: 5de15b610f785f0e188fefb707f0b19de156968a
+-- 
+2.25.1
+