mirror of
https://github.com/hanwckf/immortalwrt-mt798x.git
synced 2025-01-10 03:09:08 +08:00
274 lines
9.1 KiB
Diff
274 lines
9.1 KiB
Diff
Index: a/drivers/mtd/nand/spi/Makefile
|
|
===================================================================
|
|
--- a/drivers/mtd/nand/spi/Makefile
|
|
+++ b/drivers/mtd/nand/spi/Makefile
|
|
@@ -1,3 +1,3 @@
|
|
# SPDX-License-Identifier: GPL-2.0
|
|
-spinand-objs := core.o gigadevice.o macronix.o micron.o paragon.o toshiba.o winbond.o foresee.o etron.o esmt.o fmsh.o
|
|
+spinand-objs := core.o gigadevice.o macronix.o micron.o paragon.o toshiba.o winbond.o foresee.o etron.o esmt.o fmsh.o dosilicon.o
|
|
obj-$(CONFIG_MTD_SPI_NAND) += spinand.o
|
|
Index: a/drivers/mtd/nand/spi/core.c
|
|
===================================================================
|
|
--- a/drivers/mtd/nand/spi/core.c
|
|
+++ b/drivers/mtd/nand/spi/core.c
|
|
@@ -764,6 +764,7 @@ static const struct spinand_manufacturer *spinand_manufacturers[] = {
|
|
&foresee_spinand_manufacturer,
|
|
&esmt_c8_spinand_manufacturer,
|
|
&fmsh_spinand_manufacturer,
|
|
+ &dosilicon_spinand_manufacturer,
|
|
};
|
|
|
|
static int spinand_manufacturer_match(struct spinand_device *spinand,
|
|
--- /dev/null
|
|
+++ b/drivers/mtd/nand/spi/dosilicon.c
|
|
@@ -0,0 +1,240 @@
|
|
+// SPDX-License-Identifier: GPL-2.0
|
|
+/*
|
|
+ * Copyright (c) 2020 Rockchip Electronics Co., Ltd
|
|
+ *
|
|
+ * Authors:
|
|
+ * Dingqiang Lin <jon.lin@rock-chips.com>
|
|
+ */
|
|
+
|
|
+#include <linux/device.h>
|
|
+#include <linux/kernel.h>
|
|
+#include <linux/mtd/spinand.h>
|
|
+
|
|
+#define SPINAND_MFR_DOSILICON 0xE5
|
|
+
|
|
+#define DOSICON_STATUS_ECC_MASK GENMASK(6, 4)
|
|
+#define DOSICON_STATUS_ECC_NO_BITFLIPS (0 << 4)
|
|
+#define DOSICON_STATUS_ECC_1TO3_BITFLIPS (1 << 4)
|
|
+#define DOSICON_STATUS_ECC_4TO6_BITFLIPS (3 << 4)
|
|
+#define DOSICON_STATUS_ECC_7TO8_BITFLIPS (5 << 4)
|
|
+
|
|
+static SPINAND_OP_VARIANTS(read_cache_variants,
|
|
+ SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
|
|
+ SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
|
|
+ SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0),
|
|
+ SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0),
|
|
+ SPINAND_PAGE_READ_FROM_CACHE_OP(true, 0, 1, NULL, 0),
|
|
+ SPINAND_PAGE_READ_FROM_CACHE_OP(false, 0, 1, NULL, 0));
|
|
+
|
|
+static SPINAND_OP_VARIANTS(write_cache_variants,
|
|
+ SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),
|
|
+ SPINAND_PROG_LOAD(true, 0, NULL, 0));
|
|
+
|
|
+static SPINAND_OP_VARIANTS(update_cache_variants,
|
|
+ SPINAND_PROG_LOAD_X4(false, 0, NULL, 0),
|
|
+ SPINAND_PROG_LOAD(false, 0, NULL, 0));
|
|
+
|
|
+static int ds35xxga_ooblayout_ecc(struct mtd_info *mtd, int section,
|
|
+ struct mtd_oob_region *region)
|
|
+{
|
|
+ if (section > 3)
|
|
+ return -ERANGE;
|
|
+
|
|
+ region->offset = (16 * section) + 8;
|
|
+ region->length = 8;
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int ds35xxga_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 = 6;
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static const struct mtd_ooblayout_ops ds35xxga_ooblayout = {
|
|
+ .ecc = ds35xxga_ooblayout_ecc,
|
|
+ .free = ds35xxga_ooblayout_free,
|
|
+};
|
|
+
|
|
+static int ds35xxgb_ooblayout_ecc(struct mtd_info *mtd, int section,
|
|
+ struct mtd_oob_region *region)
|
|
+{
|
|
+ if (section)
|
|
+ return -ERANGE;
|
|
+
|
|
+ region->offset = 64;
|
|
+ region->length = 64;
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int ds35xxgb_ooblayout_free(struct mtd_info *mtd, int section,
|
|
+ struct mtd_oob_region *region)
|
|
+{
|
|
+ if (section)
|
|
+ return -ERANGE;
|
|
+
|
|
+ /* Reserve 1 bytes for the BBM. */
|
|
+ region->offset = 1;
|
|
+ region->length = 63;
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static const struct mtd_ooblayout_ops ds35xxgb_ooblayout = {
|
|
+ .ecc = ds35xxgb_ooblayout_ecc,
|
|
+ .free = ds35xxgb_ooblayout_free,
|
|
+};
|
|
+
|
|
+static int ds35xxgb_ecc_get_status(struct spinand_device *spinand,
|
|
+ u8 status)
|
|
+{
|
|
+ switch (status & DOSICON_STATUS_ECC_MASK) {
|
|
+ case STATUS_ECC_NO_BITFLIPS:
|
|
+ return 0;
|
|
+
|
|
+ case STATUS_ECC_UNCOR_ERROR:
|
|
+ return -EBADMSG;
|
|
+
|
|
+ case DOSICON_STATUS_ECC_1TO3_BITFLIPS:
|
|
+ return 3;
|
|
+
|
|
+ case DOSICON_STATUS_ECC_4TO6_BITFLIPS:
|
|
+ return 6;
|
|
+
|
|
+ case DOSICON_STATUS_ECC_7TO8_BITFLIPS:
|
|
+ return 8;
|
|
+
|
|
+ default:
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ return -EINVAL;
|
|
+}
|
|
+
|
|
+static const struct spinand_info dosilicon_spinand_table[] = {
|
|
+ SPINAND_INFO("DS35X1GA",
|
|
+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x71),
|
|
+ NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 1),
|
|
+ NAND_ECCREQ(4, 512),
|
|
+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
|
|
+ &write_cache_variants,
|
|
+ &update_cache_variants),
|
|
+ SPINAND_HAS_QE_BIT,
|
|
+ SPINAND_ECCINFO(&ds35xxga_ooblayout, NULL)),
|
|
+ SPINAND_INFO("DS35Q2GA",
|
|
+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x72),
|
|
+ NAND_MEMORG(1, 2048, 64, 64, 2048, 40, 2, 1, 1),
|
|
+ NAND_ECCREQ(4, 512),
|
|
+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
|
|
+ &write_cache_variants,
|
|
+ &update_cache_variants),
|
|
+ SPINAND_HAS_QE_BIT,
|
|
+ SPINAND_ECCINFO(&ds35xxga_ooblayout, NULL)),
|
|
+ SPINAND_INFO("DS35M1GA",
|
|
+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x21),
|
|
+ NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 1),
|
|
+ NAND_ECCREQ(4, 512),
|
|
+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
|
|
+ &write_cache_variants,
|
|
+ &update_cache_variants),
|
|
+ SPINAND_HAS_QE_BIT,
|
|
+ SPINAND_ECCINFO(&ds35xxga_ooblayout, NULL)),
|
|
+ SPINAND_INFO("DS35M2GA",
|
|
+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x22),
|
|
+ NAND_MEMORG(1, 2048, 64, 64, 2048, 40, 2, 1, 1),
|
|
+ NAND_ECCREQ(4, 512),
|
|
+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
|
|
+ &write_cache_variants,
|
|
+ &update_cache_variants),
|
|
+ SPINAND_HAS_QE_BIT,
|
|
+ SPINAND_ECCINFO(&ds35xxga_ooblayout, NULL)),
|
|
+ SPINAND_INFO("DS35Q2GB",
|
|
+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xF2),
|
|
+ NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 2, 1, 1),
|
|
+ NAND_ECCREQ(8, 512),
|
|
+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
|
|
+ &write_cache_variants,
|
|
+ &update_cache_variants),
|
|
+ SPINAND_HAS_QE_BIT,
|
|
+ SPINAND_ECCINFO(&ds35xxgb_ooblayout,
|
|
+ ds35xxgb_ecc_get_status)),
|
|
+ SPINAND_INFO("DS35M1GB",
|
|
+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xA1),
|
|
+ NAND_MEMORG(1, 2048, 128, 64, 1024, 20, 1, 1, 1),
|
|
+ NAND_ECCREQ(8, 512),
|
|
+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
|
|
+ &write_cache_variants,
|
|
+ &update_cache_variants),
|
|
+ SPINAND_HAS_QE_BIT,
|
|
+ SPINAND_ECCINFO(&ds35xxgb_ooblayout,
|
|
+ ds35xxgb_ecc_get_status)),
|
|
+ SPINAND_INFO("DS35Q1GB",
|
|
+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xF1),
|
|
+ NAND_MEMORG(1, 2048, 128, 64, 1024, 20, 1, 1, 1),
|
|
+ NAND_ECCREQ(8, 512),
|
|
+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
|
|
+ &write_cache_variants,
|
|
+ &update_cache_variants),
|
|
+ SPINAND_HAS_QE_BIT,
|
|
+ SPINAND_ECCINFO(&ds35xxgb_ooblayout,
|
|
+ ds35xxgb_ecc_get_status)),
|
|
+ SPINAND_INFO("DS35Q4GM",
|
|
+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xF4),
|
|
+ NAND_MEMORG(1, 2048, 128, 64, 4096, 80, 2, 1, 1),
|
|
+ NAND_ECCREQ(8, 512),
|
|
+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
|
|
+ &write_cache_variants,
|
|
+ &update_cache_variants),
|
|
+ SPINAND_HAS_QE_BIT,
|
|
+ SPINAND_ECCINFO(&ds35xxgb_ooblayout,
|
|
+ ds35xxgb_ecc_get_status)),
|
|
+ SPINAND_INFO("DS35Q12B",
|
|
+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xF5),
|
|
+ NAND_MEMORG(1, 2048, 128, 64, 512, 10, 1, 1, 1),
|
|
+ NAND_ECCREQ(8, 512),
|
|
+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
|
|
+ &write_cache_variants,
|
|
+ &update_cache_variants),
|
|
+ SPINAND_HAS_QE_BIT,
|
|
+ SPINAND_ECCINFO(&ds35xxgb_ooblayout,
|
|
+ ds35xxgb_ecc_get_status)),
|
|
+ SPINAND_INFO("DS35M12B",
|
|
+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xA5),
|
|
+ NAND_MEMORG(1, 2048, 128, 64, 512, 10, 1, 1, 1),
|
|
+ NAND_ECCREQ(8, 512),
|
|
+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
|
|
+ &write_cache_variants,
|
|
+ &update_cache_variants),
|
|
+ SPINAND_HAS_QE_BIT,
|
|
+ SPINAND_ECCINFO(&ds35xxgb_ooblayout,
|
|
+ ds35xxgb_ecc_get_status)),
|
|
+ SPINAND_INFO("DS35Q1GD-IB",
|
|
+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x51),
|
|
+ NAND_MEMORG(1, 2048, 128, 64, 1024, 20, 1, 1, 1),
|
|
+ NAND_ECCREQ(8, 512),
|
|
+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
|
|
+ &write_cache_variants,
|
|
+ &update_cache_variants),
|
|
+ SPINAND_HAS_QE_BIT,
|
|
+ SPINAND_ECCINFO(&ds35xxgb_ooblayout, ds35xxgb_ecc_get_status)),
|
|
+};
|
|
+
|
|
+static const struct spinand_manufacturer_ops dosilicon_spinand_manuf_ops = {
|
|
+};
|
|
+
|
|
+const struct spinand_manufacturer dosilicon_spinand_manufacturer = {
|
|
+ .id = SPINAND_MFR_DOSILICON,
|
|
+ .name = "dosilicon",
|
|
+ .chips = dosilicon_spinand_table,
|
|
+ .nchips = ARRAY_SIZE(dosilicon_spinand_table),
|
|
+ .ops = &dosilicon_spinand_manuf_ops,
|
|
+};
|
|
+
|
|
Index: a/include/linux/mtd/spinand.h
|
|
===================================================================
|
|
--- a/include/linux/mtd/spinand.h
|
|
+++ b/include/linux/mtd/spinand.h
|
|
@@ -248,6 +248,7 @@ extern const struct spinand_manufacturer winbond_spinand_manufacturer;
|
|
extern const struct spinand_manufacturer foresee_spinand_manufacturer;
|
|
extern const struct spinand_manufacturer esmt_c8_spinand_manufacturer;
|
|
extern const struct spinand_manufacturer fmsh_spinand_manufacturer;
|
|
+extern const struct spinand_manufacturer dosilicon_spinand_manufacturer;
|