qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rockchip: vendor: export vendor_storage_test() 

used for rockchip test driver.

Change-Id: Ib25a5ff4bae5fdf510dbbb89defabd8e3d0fcbfd
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
This commit is contained in:
Joseph Chen 2018-07-03 17:13:58 +08:00 committed by Jianhong Chen
parent 3ee3aa8966
commit 143a7f24b7
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/include/asm/arch-rockchip/vendor.h
View File

@ -11,6 +11,7 @@
#define VENDOR_LAN_MAC_ID 3 /* lan mac */ #define VENDOR_LAN_MAC_ID 3 /* lan mac */
#define VENDOR_BLUETOOTH_ID 4 /* bluetooth mac */ #define VENDOR_BLUETOOTH_ID 4 /* bluetooth mac */
int vendor_storage_test(void);
int vendor_storage_read(u16 id, void *pbuf, u16 size); int vendor_storage_read(u16 id, void *pbuf, u16 size);
int vendor_storage_write(u16 id, void *pbuf, u16 size); int vendor_storage_write(u16 id, void *pbuf, u16 size);

42
arch/arm/mach-rockchip/vendor.c
View File

@ -40,10 +40,7 @@
#define FLASH_VENDOR_ITEM_NUM 62 #define FLASH_VENDOR_ITEM_NUM 62
/* Vendor uinit test define */ /* Vendor uinit test define */
/* #define VENDOR_STORAGE_TEST */
#ifdef VENDOR_STORAGE_TEST
int vendor_storage_test(void); int vendor_storage_test(void);
#endif /* VENDOR_STORAGE_TEST */
struct vendor_item { struct vendor_item {
u16 id; u16 id;
@ -176,6 +173,7 @@ static int vendor_ops(u8 *buffer, u32 addr, u32 n_sec, int write)
int vendor_storage_init(void) int vendor_storage_init(void)
{ {
int ret = 0; int ret = 0;
int ret_size;
u8 *buffer; u8 *buffer;
u32 size, i; u32 size, i;
u32 max_ver = 0; u32 max_ver = 0;
@ -235,9 +233,12 @@ int vendor_storage_init(void)
/* Find valid and up-to-date one from (vendor0 - vendor3) */ /* Find valid and up-to-date one from (vendor0 - vendor3) */
for (i = 0; i < VENDOR_PART_NUM; i++) { for (i = 0; i < VENDOR_PART_NUM; i++) {
ret = vendor_ops((u8 *)vendor_info.hdr, part_size * i, part_size, 0); ret_size = vendor_ops((u8 *)vendor_info.hdr,
if (ret != part_size) part_size * i, part_size, 0);
return -EIO; if (ret_size != part_size) {
ret = -EIO;
goto out;
}
if ((vendor_info.hdr->tag == VENDOR_TAG) && if ((vendor_info.hdr->tag == VENDOR_TAG) &&
(*(vendor_info.version2) == vendor_info.hdr->version)) { (*(vendor_info.version2) == vendor_info.hdr->version)) {
@ -247,6 +248,7 @@ int vendor_storage_init(void)
} }
} }
} }
if (max_ver) { if (max_ver) {
debug("[Vendor INFO]:max_ver=%d, vendor_id=%d.\n", max_ver, max_index); debug("[Vendor INFO]:max_ver=%d, vendor_id=%d.\n", max_ver, max_index);
/* /*
@ -254,9 +256,12 @@ int vendor_storage_init(void)
* version of vendor * version of vendor
*/ */
if (max_index != (VENDOR_PART_NUM - 1)) { if (max_index != (VENDOR_PART_NUM - 1)) {
ret = vendor_ops((u8 *)vendor_info.hdr, part_size * max_index, part_size, 0); ret_size = vendor_ops((u8 *)vendor_info.hdr,
if (ret != part_size) part_size * max_index, part_size, 0);
return -EIO; if (ret_size != part_size) {
ret = -EIO;
goto out;
}
} }
} else { } else {
debug("[Vendor INFO]:Reset vendor info...\n"); debug("[Vendor INFO]:Reset vendor info...\n");
@ -271,11 +276,7 @@ int vendor_storage_init(void)
} }
debug("[Vendor INFO]:ret=%d.\n", ret); debug("[Vendor INFO]:ret=%d.\n", ret);
#ifdef VENDOR_STORAGE_TEST out:
if (vendor_storage_test())
printf("[Vendor ERROR]:Vendor test result:failure\n");
#endif
return ret; return ret;
} }
@ -421,9 +422,8 @@ int vendor_storage_write(u16 id, void *pbuf, u16 size)
/**********************************************************/ /**********************************************************/
/* vendor API uinit test */ /* vendor API uinit test */
/**********************************************************/ /**********************************************************/
#ifdef VENDOR_STORAGE_TEST
/* Reset the vendor storage space to the initial state */ /* Reset the vendor storage space to the initial state */
void vendor_test_reset(void) static void vendor_test_reset(void)
{ {
u16 i, part_size; u16 i, part_size;
u32 size; u32 size;
@ -474,6 +474,15 @@ int vendor_storage_test(void)
u8 *buffer = NULL; u8 *buffer = NULL;
int ret = 0; int ret = 0;
if (!bootdev_type) {
ret = vendor_storage_init();
if (ret) {
printf("%s: vendor storage init failed, ret=%d\n",
__func__, ret);
return ret;
}
}
/* /*
* Calculate the maximum number of items and the maximum * Calculate the maximum number of items and the maximum
* allocable memory for each item. * allocable memory for each item.
@ -639,4 +648,3 @@ int vendor_storage_test(void)
return 0; return 0;
} }
#endif /* VENDOR_STORAGE_TEST */