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

rockchip: vendor: fix return value error 

1. initialize global variant bootdev_type;
2. fix return value;

Change-Id: I0f20ff931c5896be06e802cffbc1b4a7a6848c94
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
This commit is contained in:
Joseph Chen 2018-06-05 15:25:41 +08:00
parent 9cc336e89e
commit 72c2cf15e0
1 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -212,6 +212,10 @@ int vendor_storage_init(void)
/* Invalid bootdev type */ /* Invalid bootdev type */
if (ret) if (ret)
return ret; return ret;
/* Initialize */
bootdev_type = dev_desc->if_type;
/* Always use, no need to release */ /* Always use, no need to release */
buffer = (u8 *)malloc(size); buffer = (u8 *)malloc(size);
if (!buffer) { if (!buffer) {
@ -228,8 +232,8 @@ 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 = vendor_ops((u8 *)vendor_info.hdr, part_size * i, part_size, 0);
if (ret < 0) if (ret != part_size)
return ret; return -EIO;
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)) {
@ -245,8 +249,11 @@ int vendor_storage_init(void)
* Keep vendor_info the same as the largest * Keep vendor_info the same as the largest
* 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 = vendor_ops((u8 *)vendor_info.hdr, part_size * max_index, part_size, 0);
if (ret != part_size)
return -EIO;
}
} else { } else {
debug("[Vednor INFO]:Reset vendor info...\n"); debug("[Vednor INFO]:Reset vendor info...\n");
memset((u8 *)vendor_info.hdr, 0, size); memset((u8 *)vendor_info.hdr, 0, size);
@ -268,6 +275,17 @@ int vendor_storage_init(void)
return ret; return ret;
} }
/*
* @id: item id, first 4 id is occupied:
* VENDOR_SN_ID
* VENDOR_WIFI_MAC_ID
* VENDOR_LAN_MAC_ID
* VENDOR_BLUETOOTH_ID
* @pbuf: read data buffer;
* @size: read bytes;
*
* return: bytes equal to @size is success, other fail;
*/
int vendor_storage_read(u16 id, void *pbuf, u16 size) int vendor_storage_read(u16 id, void *pbuf, u16 size)
{ {
int ret = 0; int ret = 0;
@ -299,9 +317,20 @@ int vendor_storage_read(u16 id, void *pbuf, u16 size)
return -EINVAL; return -EINVAL;
} }
/*
* @id: item id, first 4 id is occupied:
* VENDOR_SN_ID
* VENDOR_WIFI_MAC_ID
* VENDOR_LAN_MAC_ID
* VENDOR_BLUETOOTH_ID
* @pbuf: write data buffer;
* @size: write bytes;
*
* return: bytes equal to @size is success, other fail;
*/
int vendor_storage_write(u16 id, void *pbuf, u16 size) int vendor_storage_write(u16 id, void *pbuf, u16 size)
{ {
int ret = 0; int cnt, ret = 0;
u32 i, next_index, align_size; u32 i, next_index, align_size;
struct vendor_item *item; struct vendor_item *item;
u16 part_size, max_item_num, offset; u16 part_size, max_item_num, offset;
@ -351,7 +380,8 @@ int vendor_storage_write(u16 id, void *pbuf, u16 size)
vendor_info.hdr->next_index++; vendor_info.hdr->next_index++;
if (vendor_info.hdr->next_index >= VENDOR_PART_NUM) if (vendor_info.hdr->next_index >= VENDOR_PART_NUM)
vendor_info.hdr->next_index = 0; vendor_info.hdr->next_index = 0;
return vendor_ops((u8 *)vendor_info.hdr, part_size * next_index, part_size, 1); cnt = vendor_ops((u8 *)vendor_info.hdr, part_size * next_index, part_size, 1);
return (cnt == part_size) ? size : -EIO;
} }
} }
/* /*
@ -376,7 +406,8 @@ int vendor_storage_write(u16 id, void *pbuf, u16 size)
if (vendor_info.hdr->next_index >= VENDOR_PART_NUM) if (vendor_info.hdr->next_index >= VENDOR_PART_NUM)
vendor_info.hdr->next_index = 0; vendor_info.hdr->next_index = 0;
return vendor_ops((u8 *)vendor_info.hdr, part_size * next_index, part_size, 1); cnt = vendor_ops((u8 *)vendor_info.hdr, part_size * next_index, part_size, 1);
return (cnt == part_size) ? size : -EIO;
} }
debug("[Vednor ERROR]:Vendor has no space left!\n"); debug("[Vednor ERROR]:Vendor has no space left!\n");
@ -496,7 +527,7 @@ int vendor_storage_test(void)
for (id = 0; id < item_num; id++) { for (id = 0; id < item_num; id++) {
memset(buffer, 0, size); memset(buffer, 0, size);
ret = vendor_storage_read(id, buffer, size); ret = vendor_storage_read(id, buffer, size);
if (ret != size) { if (ret < 0) {
printf("[Vendor Test]:vendor read failed(id=%d)!\n", id); printf("[Vendor Test]:vendor read failed(id=%d)!\n", id);
free(buffer); free(buffer);
return ret; return ret;