eternalwrt/eternalwrt-mt798x
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: backport pending fixes for FM25G0{1,2}B Quad I/O read

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen
2026-07-22 11:03:16 +08:00
parent ef74cfd14f
commit af85f902be
2 changed files with 69 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
target/linux/generic/hack-6.18/400-mtd-spinand-Support-fmsh.patch
+2 -2
View File
@@ -17,7 +17,7 @@ Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
--- a/drivers/mtd/nand/spi/fmsh.c
+++ b/drivers/mtd/nand/spi/fmsh.c
@@ -187,6 +187,115 @@ static const struct mtd_ooblayout_ops fm
@@ -195,6 +195,115 @@ static const struct mtd_ooblayout_ops fm
.free = fm25s01bi3_ooblayout_free,
};
@@ -133,7 +133,7 @@ Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
static const struct spinand_info fmsh_spinand_table[] = {
SPINAND_INFO("FM25G01B",
SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xd1),
@@ -227,6 +336,51 @@ static const struct spinand_info fmsh_sp
@@ -235,6 +344,51 @@ static const struct spinand_info fmsh_sp
SPINAND_HAS_QE_BIT,
SPINAND_ECCINFO(&fm25s01bi3_ooblayout,
fm25s01bi3_ecc_get_status)),
target/linux/generic/pending-6.18/401-mtd-spinand-fmsh-fix-FM25G01B-FM25G02B-Quad-I-O-read.patch
+67
View File
@@ -0,0 +1,67 @@
From git@z Thu Jan 1 00:00:00 1970
Subject: [PATCH v2] mtd: spinand: fmsh: fix FM25G01B/FM25G02B Quad I/O read
dummy cycles
From: Aleksandr Mineev <sanderrrs@gmail.com>
Date: Fri, 17 Jul 2026 18:50:50 +0300
Message-Id: <20260717155051.50-1-sanderrrs@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
The FM25G01B/FM25G02B datasheets specify a single dummy byte for the
0xEB Quad I/O read-from-cache operation, but the generic
read_cache_variants set uses two dummy bytes for the 1S-4S-4S variant.
The extra dummy byte shifts the data phase and returns corrupted data
with no ECC error, breaking boot on boards using these chips.
Use a dedicated read-from-cache variant set with ndummy=1 for the
1S-4S-4S (0xEB) operation.
FM25G01B datasheet: https://www.fmsh.com/nvm/FM25G01B_ds_eng.pdf
FM25G02B datasheet: https://www.fmsh.com/nvm/FM25G02B_ds_eng.pdf
Fixes: d5a5c9eb2ee9 ("mtd: spinand: fmsh: add support for FM25G{01,02}B")
Cc: stable@vger.kernel.org
Signed-off-by: Aleksandr Mineev <sanderrrs@gmail.com>
---
v2:
- Add Cc: stable tag (Miquel Raynal)
drivers/mtd/nand/spi/fmsh.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
--- a/drivers/mtd/nand/spi/fmsh.c
+++ b/drivers/mtd/nand/spi/fmsh.c
@@ -44,6 +44,14 @@ static SPINAND_OP_VARIANTS(update_cache_
SPINAND_PROG_LOAD_1S_1S_4S_OP(false, 0, NULL, 0),
SPINAND_PROG_LOAD_1S_1S_1S_OP(false, 0, NULL, 0));
+static SPINAND_OP_VARIANTS(fm25g_read_cache_variants,
+ SPINAND_PAGE_READ_FROM_CACHE_1S_4S_4S_OP(0, 1, NULL, 0, 0),
+ SPINAND_PAGE_READ_FROM_CACHE_1S_1S_4S_OP(0, 1, NULL, 0, 0),
+ SPINAND_PAGE_READ_FROM_CACHE_1S_2S_2S_OP(0, 1, NULL, 0, 0),
+ SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0, 0),
+ SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0, 0),
+ SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0, 0));
+
static int fm25g01b_ooblayout_ecc(struct mtd_info *mtd, int section,
struct mtd_oob_region *region)
{
@@ -192,7 +200,7 @@ static const struct spinand_info fmsh_sp
SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xd1),
NAND_MEMORG(1, 2048, 128, 64, 1024, 21, 1, 1, 1),
NAND_ECCREQ(8, 528),
- SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
+ SPINAND_INFO_OP_VARIANTS(&fm25g_read_cache_variants,
&write_cache_variants,
&update_cache_variants),
SPINAND_HAS_QE_BIT,
@@ -202,7 +210,7 @@ static const struct spinand_info fmsh_sp
SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xd2),
NAND_MEMORG(1, 2048, 128, 64, 2048, 41, 1, 1, 1),
NAND_ECCREQ(8, 528),
- SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
+ SPINAND_INFO_OP_VARIANTS(&fm25g_read_cache_variants,
&write_cache_variants,
&update_cache_variants),
SPINAND_HAS_QE_BIT,