kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/drivers/soc/rockchip/mtd_vendor_storage.c
..
..
@@ -20,6 +20,7 @@
20
20
 
21
21
 #define MTD_VENDOR_PART_START		0
22
22
 #define MTD_VENDOR_PART_SIZE		FLASH_VENDOR_PART_SIZE
23
+#define MTD_VENDOR_NOR_BLOCK_SIZE	128
23
24
 #define MTD_VENDOR_PART_NUM		1
24
25
 #define MTD_VENDOR_TAG			VENDOR_HEAD_TAG
25
26
 
..
..
@@ -43,6 +44,7 @@
43
44
 static struct flash_vendor_info *g_vendor;
44
45
 static DEFINE_MUTEX(vendor_ops_mutex);
45
46
 static struct mtd_info *mtd;
47
+static u32 mtd_erase_size;
46
48
 static const char *vendor_mtd_name = "vnvm";
47
49
 static struct mtd_nand_info nand_info;
48
50
 static struct platform_device *g_pdev;
..
..
@@ -54,8 +56,8 @@
54
56
 	struct erase_info ei;
55
57
 
56
58
 re_write:
57
-	if (nand_info.page_offset >= mtd->erasesize) {
58
-		nand_info.blk_offset += mtd->erasesize;
59
+	if (nand_info.page_offset >= mtd_erase_size) {
60
+		nand_info.blk_offset += mtd_erase_size;
59
61
 		if (nand_info.blk_offset >= mtd->size)
60
62
 			nand_info.blk_offset = 0;
61
63
 		if (mtd_block_isbad(mtd, nand_info.blk_offset))
..
..
@@ -63,7 +65,7 @@
63
65
 
64
66
 		memset(&ei, 0, sizeof(struct erase_info));
65
67
 		ei.addr = nand_info.blk_offset;
66
-		ei.len	= mtd->erasesize;
68
+		ei.len	= mtd_erase_size;
67
69
 		if (mtd_erase(mtd, &ei))
68
70
 			goto re_write;
69
71
 
..
..
@@ -100,7 +102,15 @@
100
102
 	nand_info.ops_size = (sizeof(*g_vendor) + mtd->writesize - 1) / mtd->writesize;
101
103
 	nand_info.ops_size *= mtd->writesize;
102
104
 
103
-	for (offset = 0; offset < mtd->size; offset += mtd->erasesize) {
105
+	/*
106
+	 * The NOR FLASH erase size maybe config as 4KB, need to re-define
107
+	 * and maintain consistency with uboot.
108
+	 */
109
+	mtd_erase_size = mtd->erasesize;
110
+	if (mtd_erase_size <= MTD_VENDOR_NOR_BLOCK_SIZE * 512)
111
+		mtd_erase_size = MTD_VENDOR_NOR_BLOCK_SIZE * 512;
112
+
113
+	for (offset = 0; offset < mtd->size; offset += mtd_erase_size) {
104
114
 		if (!mtd_block_isbad(mtd, offset)) {
105
115
 			err = mtd_read(mtd, offset, sizeof(*g_vendor),
106
116
 				       &bytes_read, (u8 *)g_vendor);
..
..
@@ -115,11 +125,11 @@
115
125
 				}
116
126
 			}
117
127
 		} else if (nand_info.blk_offset == offset)
118
-			nand_info.blk_offset += mtd->erasesize;
128
+			nand_info.blk_offset += mtd_erase_size;
119
129
 	}
120
130
 
121
131
 	if (nand_info.version) {
122
-		for (offset = mtd->erasesize - nand_info.ops_size;
132
+		for (offset = mtd_erase_size - nand_info.ops_size;
123
133
 		     offset >= 0;
124
134
 		     offset -= nand_info.ops_size) {
125
135
 			err = mtd_read(mtd, nand_info.blk_offset + offset,
..
..
@@ -145,7 +155,10 @@
145
155
 			if (bytes_read == sizeof(*g_vendor) &&
146
156
 			    g_vendor->tag == MTD_VENDOR_TAG &&
147
157
 			    g_vendor->version == g_vendor->version2) {
148
-				nand_info.version = g_vendor->version;
158
+				if (nand_info.version > g_vendor->version)
159
+					g_vendor->version = nand_info.version;
160
+				else
161
+					nand_info.version = g_vendor->version;
149
162
 				break;
150
163
 			}
151
164
 		}
..
..
@@ -155,11 +168,11 @@
155
168
 		g_vendor->tag = MTD_VENDOR_TAG;
156
169
 		g_vendor->free_size = sizeof(g_vendor->data);
157
170
 		g_vendor->version2 = g_vendor->version;
158
-		for (offset = 0; offset < mtd->size; offset += mtd->erasesize) {
171
+		for (offset = 0; offset < mtd->size; offset += mtd_erase_size) {
159
172
 			if (!mtd_block_isbad(mtd, offset)) {
160
173
 				memset(&ei, 0, sizeof(struct erase_info));
161
174
 				ei.addr = nand_info.blk_offset + offset;
162
-				ei.len  = mtd->erasesize;
175
+				ei.len  = mtd_erase_size;
163
176
 				mtd_erase(mtd, &ei);
164
177
 			}
165
178
 		}