mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 07:22:33 +00:00
42e14d3ed8
Rename two patches which were only accepted in Linux 6.2, but were marked as if they were accepted in Linux 6.1. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
107 lines
3.0 KiB
Diff
107 lines
3.0 KiB
Diff
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)
|