rk3568 rt init

hc

2023-11-06 e3e12f52b214121840b44c91de5b3e5af5d3eb84

 kernel/drivers/soc/rockchip/sdmmc_vendor_storage.c
..
..
@@ -23,41 +23,15 @@
23
23
 #include <linux/soc/rockchip/rk_vendor_storage.h>
24
24
 #include <linux/kthread.h>
25
25
 #include <linux/delay.h>
26
+#include <misc/rkflash_vendor_storage.h>
26
27
 
27
28
 #define EMMC_IDB_PART_OFFSET		64
28
29
 #define EMMC_SYS_PART_OFFSET		8064
29
30
 #define EMMC_BOOT_PART_SIZE		1024
30
31
 #define EMMC_VENDOR_PART_START		(1024 * 7)
31
-#define EMMC_VENDOR_PART_SIZE		128
32
+#define EMMC_VENDOR_PART_SIZE		VENDOR_PART_SIZE
32
33
 #define EMMC_VENDOR_PART_NUM		4
33
-#define EMMC_VENDOR_TAG			0x524B5644
34
-
35
-struct rk_vendor_req {
36
-	u32 tag;
37
-	u16 id;
38
-	u16 len;
39
-	u8 data[1024];
40
-};
41
-
42
-struct vendor_item {
43
-	u16  id;
44
-	u16  offset;
45
-	u16  size;
46
-	u16  flag;
47
-};
48
-
49
-struct vendor_info {
50
-	u32	tag;
51
-	u32	version;
52
-	u16	next_index;
53
-	u16	item_num;
54
-	u16	free_offset;
55
-	u16	free_size;
56
-	struct	vendor_item item[126]; /* 126 * 8*/
57
-	u8	data[EMMC_VENDOR_PART_SIZE * 512 - 1024 - 8];
58
-	u32	hash;
59
-	u32	version2;
60
-};
34
+#define EMMC_VENDOR_TAG			VENDOR_HEAD_TAG
61
35
 
62
36
 #ifdef CONFIG_ROCKCHIP_VENDOR_STORAGE_UPDATE_LOADER
63
37
 #define READ_SECTOR_IO		_IOW('r', 0x04, unsigned int)
..
..
@@ -67,10 +41,6 @@
67
41
 #define GET_BAD_BLOCK_IO	_IOW('r', 0x03, unsigned int)
68
42
 #define GET_LOCK_FLAG_IO	_IOW('r', 0x53, unsigned int)
69
43
 #endif
70
-
71
-#define VENDOR_REQ_TAG		0x56524551
72
-#define VENDOR_READ_IO		_IOW('v', 0x01, unsigned int)
73
-#define VENDOR_WRITE_IO		_IOW('v', 0x02, unsigned int)
74
44
 
75
45
 static u8 *g_idb_buffer;
76
46
 static struct vendor_info *g_vendor;
..
..
@@ -406,7 +376,7 @@
406
376
 {
407
377
 	long ret = -1;
408
378
 	int size;
409
-	struct rk_vendor_req *v_req;
379
+	struct RK_VENDOR_REQ *v_req;
410
380
 	u32 *page_buf;
411
381
 
412
382
 	page_buf = kmalloc(4096, GFP_KERNEL);
..
..
@@ -415,7 +385,7 @@
415
385
 
416
386
 	mutex_lock(&vendor_ops_mutex);
417
387
 
418
-	v_req = (struct rk_vendor_req *)page_buf;
388
+	v_req = (struct RK_VENDOR_REQ *)page_buf;
419
389
 
420
390
 	switch (cmd) {
421
391
 	case VENDOR_READ_IO:
..
..
@@ -574,7 +544,7 @@
574
544
 	return ret;
575
545
 }
576
546
 
577
-const struct file_operations vendor_storage_fops = {
547
+static const struct file_operations vendor_storage_fops = {
578
548
 	.open = vendor_storage_open,
579
549
 	.compat_ioctl	= vendor_storage_ioctl,
580
550
 	.unlocked_ioctl = vendor_storage_ioctl,