hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
u-boot/drivers/mtd/nand/spi/skyhigh.c
....@@ -14,6 +14,10 @@
1414
1515 #define SPINAND_MFR_SKYHIGH 0x01
1616
17
+#define SKYHIGH_STATUS_ECC_1_2_BITFLIPS (1 << 4)
18
+#define SKYHIGH_STATUS_ECC_3_4_BITFLIPS (2 << 4)
19
+#define SKYHIGH_STATUS_ECC_UNCOR_ERROR (3 << 4)
20
+
1721 static SPINAND_OP_VARIANTS(read_cache_variants,
1822 SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0),
1923 SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0),
....@@ -27,8 +31,8 @@
2731 SPINAND_PROG_LOAD(true, 0, NULL, 0));
2832
2933 static SPINAND_OP_VARIANTS(update_cache_variants,
30
- SPINAND_PROG_LOAD_X4(false, 0, NULL, 0),
31
- SPINAND_PROG_LOAD(false, 0, NULL, 0));
34
+ SPINAND_PROG_LOAD_X4(true, 0, NULL, 0),
35
+ SPINAND_PROG_LOAD(true, 0, NULL, 0));
3236
3337 static int s35ml04g3_ooblayout_ecc(struct mtd_info *mtd, int section,
3438 struct mtd_oob_region *region)
....@@ -53,7 +57,48 @@
5357 .rfree = s35ml04g3_ooblayout_free,
5458 };
5559
60
+
61
+static int s35ml0xg3_ecc_get_status(struct spinand_device *spinand,
62
+ u8 status)
63
+{
64
+ struct nand_device *nand = spinand_to_nand(spinand);
65
+
66
+ switch (status & STATUS_ECC_MASK) {
67
+ case STATUS_ECC_NO_BITFLIPS:
68
+ return 0;
69
+
70
+ case SKYHIGH_STATUS_ECC_UNCOR_ERROR:
71
+ return -EBADMSG;
72
+
73
+ case SKYHIGH_STATUS_ECC_1_2_BITFLIPS:
74
+ return 2;
75
+
76
+ default:
77
+ return nand->eccreq.strength;
78
+ }
79
+
80
+ return -EINVAL;
81
+}
82
+
5683 static const struct spinand_info skyhigh_spinand_table[] = {
84
+ SPINAND_INFO("S35ML01G3",
85
+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x15),
86
+ NAND_MEMORG(1, 2048, 128, 64, 1024, 2, 1, 1),
87
+ NAND_ECCREQ(4, 512),
88
+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
89
+ &write_cache_variants,
90
+ &update_cache_variants),
91
+ SPINAND_HAS_QE_BIT,
92
+ SPINAND_ECCINFO(&s35ml04g3_ooblayout, s35ml0xg3_ecc_get_status)),
93
+ SPINAND_INFO("S35ML02G3",
94
+ SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x25),
95
+ NAND_MEMORG(1, 2048, 128, 64, 2048, 2, 1, 1),
96
+ NAND_ECCREQ(4, 512),
97
+ SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
98
+ &write_cache_variants,
99
+ &update_cache_variants),
100
+ SPINAND_HAS_QE_BIT,
101
+ SPINAND_ECCINFO(&s35ml04g3_ooblayout, s35ml0xg3_ecc_get_status)),
57102 SPINAND_INFO("S35ML04G3",
58103 SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x35),
59104 NAND_MEMORG(1, 2048, 128, 64, 4096, 2, 1, 1),
....@@ -62,7 +107,7 @@
62107 &write_cache_variants,
63108 &update_cache_variants),
64109 SPINAND_HAS_QE_BIT,
65
- SPINAND_ECCINFO(&s35ml04g3_ooblayout, NULL)),
110
+ SPINAND_ECCINFO(&s35ml04g3_ooblayout, s35ml0xg3_ecc_get_status)),
66111 };
67112
68113 static const struct spinand_manufacturer_ops skyhigh_spinand_manuf_ops = {