-
Notifications
You must be signed in to change notification settings - Fork 19.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
generic: backport Winbond W25N02KV SPI-NAND support
This flash-chip is used on the Asus TUF-AX4200 and TUF-AX6000 routers. As the filogic target only uses kernel 5.15, skip the 5.10 backport. Signed-off-by: David Bauer <mail@david-bauer.net>
- Loading branch information
1 parent
4ce0405
commit 156c00d
Showing
2 changed files
with
146 additions
and
0 deletions.
There are no files selected for viewing
40 changes: 40 additions & 0 deletions
40
target/linux/generic/backport-5.15/890-v6.1-mtd-spinand-winbond-fix-flash-detection.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| From dbf70fc204d2fbb0d8ad8f42038a60846502efda Mon Sep 17 00:00:00 2001 | ||
| From: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu> | ||
| Date: Mon, 10 Oct 2022 13:51:09 +0300 | ||
| Subject: [PATCH] mtd: spinand: winbond: fix flash identification | ||
|
|
||
| Winbond uses 3 bytes to identify flash: vendor_id, dev_id_0, dev_id_1, | ||
| but current driver uses only first 2 bytes of it for devices | ||
| identification. As result Winbond W25N02KV flash (id_bytes: EF, AA, 22) | ||
| is identified as W25N01GV (id_bytes: EF, AA, 21). | ||
|
|
||
| Fix this by adding missed identification bytes. | ||
|
|
||
| Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu> | ||
| Reviewed-by: Frieder Schrempf <frieder.schrempf@kontron.de> | ||
| Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> | ||
| Link: https://lore.kernel.org/linux-mtd/20221010105110.446674-1-mikhail.kshevetskiy@iopsys.eu | ||
| --- | ||
| drivers/mtd/nand/spi/winbond.c | 4 ++-- | ||
| 1 file changed, 2 insertions(+), 2 deletions(-) | ||
|
|
||
| --- a/drivers/mtd/nand/spi/winbond.c | ||
| +++ b/drivers/mtd/nand/spi/winbond.c | ||
| @@ -76,7 +76,7 @@ static int w25m02gv_select_target(struct | ||
|
|
||
| static const struct spinand_info winbond_spinand_table[] = { | ||
| SPINAND_INFO("W25M02GV", | ||
| - SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xab), | ||
| + SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xab, 0x21), | ||
| NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 2), | ||
| NAND_ECCREQ(1, 512), | ||
| SPINAND_INFO_OP_VARIANTS(&read_cache_variants, | ||
| @@ -86,7 +86,7 @@ static const struct spinand_info winbond | ||
| SPINAND_ECCINFO(&w25m02gv_ooblayout, NULL), | ||
| SPINAND_SELECT_TARGET(w25m02gv_select_target)), | ||
| SPINAND_INFO("W25N01GV", | ||
| - SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xaa), | ||
| + SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xaa, 0x21), | ||
| NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 1), | ||
| NAND_ECCREQ(1, 512), | ||
| SPINAND_INFO_OP_VARIANTS(&read_cache_variants, |
106 changes: 106 additions & 0 deletions
106
target/linux/generic/backport-5.15/891-v6.1-mtd-spinand-winbond-add-W25N02KV.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| From 6154c7a583483d7b69f53bea868efdc369edd563 Mon Sep 17 00:00:00 2001 | ||
| From: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu> | ||
| Date: Mon, 10 Oct 2022 13:51:10 +0300 | ||
| Subject: [PATCH] mtd: spinand: winbond: add Winbond W25N02KV flash support | ||
|
|
||
| Add support of Winbond W25N02KV flash | ||
|
|
||
| Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu> | ||
| Reviewed-by: Frieder Schrempf <frieder.schrempf@kontron.de> | ||
| Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> | ||
| Link: https://lore.kernel.org/linux-mtd/20221010105110.446674-2-mikhail.kshevetskiy@iopsys.eu | ||
| --- | ||
| drivers/mtd/nand/spi/winbond.c | 75 ++++++++++++++++++++++++++++++++++ | ||
| 1 file changed, 75 insertions(+) | ||
|
|
||
| --- a/drivers/mtd/nand/spi/winbond.c | ||
| +++ b/drivers/mtd/nand/spi/winbond.c | ||
| @@ -74,6 +74,72 @@ static int w25m02gv_select_target(struct | ||
| return spi_mem_exec_op(spinand->spimem, &op); | ||
| } | ||
|
|
||
| +static int w25n02kv_ooblayout_ecc(struct mtd_info *mtd, int section, | ||
| + struct mtd_oob_region *region) | ||
| +{ | ||
| + if (section > 3) | ||
| + return -ERANGE; | ||
| + | ||
| + region->offset = 64 + (16 * section); | ||
| + region->length = 13; | ||
| + | ||
| + return 0; | ||
| +} | ||
| + | ||
| +static int w25n02kv_ooblayout_free(struct mtd_info *mtd, int section, | ||
| + struct mtd_oob_region *region) | ||
| +{ | ||
| + if (section > 3) | ||
| + return -ERANGE; | ||
| + | ||
| + region->offset = (16 * section) + 2; | ||
| + region->length = 14; | ||
| + | ||
| + return 0; | ||
| +} | ||
| + | ||
| +static const struct mtd_ooblayout_ops w25n02kv_ooblayout = { | ||
| + .ecc = w25n02kv_ooblayout_ecc, | ||
| + .free = w25n02kv_ooblayout_free, | ||
| +}; | ||
| + | ||
| +static int w25n02kv_ecc_get_status(struct spinand_device *spinand, | ||
| + u8 status) | ||
| +{ | ||
| + struct nand_device *nand = spinand_to_nand(spinand); | ||
| + u8 mbf = 0; | ||
| + struct spi_mem_op op = SPINAND_GET_FEATURE_OP(0x30, &mbf); | ||
| + | ||
| + switch (status & STATUS_ECC_MASK) { | ||
| + case STATUS_ECC_NO_BITFLIPS: | ||
| + return 0; | ||
| + | ||
| + case STATUS_ECC_UNCOR_ERROR: | ||
| + return -EBADMSG; | ||
| + | ||
| + case STATUS_ECC_HAS_BITFLIPS: | ||
| + /* | ||
| + * Let's try to retrieve the real maximum number of bitflips | ||
| + * in order to avoid forcing the wear-leveling layer to move | ||
| + * data around if it's not necessary. | ||
| + */ | ||
| + if (spi_mem_exec_op(spinand->spimem, &op)) | ||
| + return nanddev_get_ecc_conf(nand)->strength; | ||
| + | ||
| + mbf >>= 4; | ||
| + | ||
| + if (WARN_ON(mbf > nanddev_get_ecc_conf(nand)->strength || !mbf)) | ||
| + return nanddev_get_ecc_conf(nand)->strength; | ||
| + | ||
| + return mbf; | ||
| + | ||
| + default: | ||
| + break; | ||
| + } | ||
| + | ||
| + return -EINVAL; | ||
| +} | ||
| + | ||
| static const struct spinand_info winbond_spinand_table[] = { | ||
| SPINAND_INFO("W25M02GV", | ||
| SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xab, 0x21), | ||
| @@ -94,6 +160,15 @@ static const struct spinand_info winbond | ||
| &update_cache_variants), | ||
| 0, | ||
| SPINAND_ECCINFO(&w25m02gv_ooblayout, NULL)), | ||
| + SPINAND_INFO("W25N02KV", | ||
| + SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xaa, 0x22), | ||
| + NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 1, 1, 1), | ||
| + NAND_ECCREQ(8, 512), | ||
| + SPINAND_INFO_OP_VARIANTS(&read_cache_variants, | ||
| + &write_cache_variants, | ||
| + &update_cache_variants), | ||
| + 0, | ||
| + SPINAND_ECCINFO(&w25n02kv_ooblayout, w25n02kv_ecc_get_status)), | ||
| }; | ||
|
|
||
| static int winbond_spinand_init(struct spinand_device *spinand) |