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

test: storage: support rkflash 

1.Support RKNANDC_NAND, RKSFC_NAND and RKSFC_NOR;
2.Adjust Userdata part size to reasonable value.

Change-Id: I20a4264848ba4ccd8385e9dee36cd16391cd517e
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
This commit is contained in:
Jon Lin 2019-12-31 14:46:05 +08:00 committed by Jianhong Chen
parent 2f0750eb18
commit 9cde1b1d03
1 changed files with 55 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
test/rockchip/test-storage.c
View File

@ -23,22 +23,22 @@
#include "test-rockchip.h"
#define DEFAULT_STORAGE_RW_PART "userdata"
enum if_type blk_get_type_by_name(char* devtype)
static enum if_type blk_get_type_by_name_and_num(char *devtype, int devnum)
{
int type = -1;
if (!strcmp(devtype, "mmc"))
type = IF_TYPE_MMC;
#ifdef CONFIG_RKNAND
#if defined(CONFIG_RKNAND) || defined(CONFIG_RKNANDC_NAND)
else if (!strcmp(devtype, "rknand"))
type = IF_TYPE_RKNAND;
#endif
#ifdef CONFIG_RKSFC_NAND
else if (!strcmp(devtype, "spinand"))
else if (!strcmp(devtype, "rksfc") && devnum == 0)
type = IF_TYPE_SPINAND;
#endif
#ifdef CONFIG_RKSFC_NOR
else if (!strcmp(devtype, "spinor"))
else if (!strcmp(devtype, "rksfc") && devnum == 1)
type = IF_TYPE_SPINOR;
#endif
#ifdef CONFIG_DM_RAMDISK
@ -55,7 +55,13 @@ enum if_type blk_get_type_by_name(char* devtype)
return type;
}
#if defined(CONFIG_MMC) || defined(CONFIG_RKNAND) || defined(CONFIG_DM_RAMDISK) || defined(CONFIG_USB_HOST)
#if defined(CONFIG_MMC) ||\
defined(CONFIG_RKNAND) ||\
defined(CONFIG_DM_RAMDISK) ||\
defined(CONFIG_USB_HOST) ||\
defined(CONFIG_RKNANDC_NAND) ||\
defined(CONFIG_RKSFC_NAND) ||\
defined(CONFIG_RKSFC_NOR)
static int do_test_storage(cmd_tbl_t *cmdtp, int flag,
int argc, char *const argv[],
const char *devtype,
@ -96,7 +102,8 @@ static int do_test_storage(cmd_tbl_t *cmdtp, int flag,
} else {
int if_type;
int num = simple_strtoul(devnum, NULL, 10);
if_type = blk_get_type_by_name((char *)devtype);
if_type = blk_get_type_by_name_and_num((char *)devtype, num);
dev_desc = blk_get_devnum_by_type(if_type, num);
}
if (!dev_desc) {
@ -114,6 +121,8 @@ static int do_test_storage(cmd_tbl_t *cmdtp, int flag,
/* 32MB */
sector = part.start;
if (part.start + part.size > dev_desc->lba)
part.size = dev_desc->lba - part.start;
blocks = part.size > 0x10000 ? 0x10000 : part.size;
round = 4;
@ -126,7 +135,6 @@ static int do_test_storage(cmd_tbl_t *cmdtp, int flag,
sector, sector + blocks,
(blocks * dev_desc->blksz) >> 20, round);
/* 3. Prepare memory */
#ifdef CONFIG_RKIMG_BOOTLOADER
w_buf = sysmem_alloc_by_name("storage_w", blocks * dev_desc->blksz);
@ -259,7 +267,7 @@ static int do_test_sdmmc(cmd_tbl_t *cmdtp, int flag,
}
#endif
#ifdef CONFIG_RKNAND
#if defined(CONFIG_RKNAND) || defined(CONFIG_RKNANDC_NAND)
static int do_test_rknand(cmd_tbl_t *cmdtp, int flag,
int argc, char *const argv[])
{
@ -267,6 +275,22 @@ static int do_test_rknand(cmd_tbl_t *cmdtp, int flag,
}
#endif
#ifdef CONFIG_RKSFC_NAND
static int do_test_rkflash_spinand(cmd_tbl_t *cmdtp, int flag,
int argc, char *const argv[])
{
return do_test_storage(cmdtp, flag, argc, argv, "rksfc", "0", "RKSFC0");
}
#endif
#ifdef CONFIG_RKSFC_NOR
static int do_test_rkflash_spinor(cmd_tbl_t *cmdtp, int flag,
int argc, char *const argv[])
{
return do_test_storage(cmdtp, flag, argc, argv, "rksfc", "1", "RKSFC1");
}
#endif
#ifdef CONFIG_DM_RAMDISK
static int do_test_blk(cmd_tbl_t *cmdtp, int flag,
int argc, char *const argv[])
@ -274,7 +298,14 @@ static int do_test_blk(cmd_tbl_t *cmdtp, int flag,
return do_test_storage(cmdtp, flag, argc, argv, NULL, NULL, "BLK");
}
#endif
#endif/* defined(CONFIG_MMC) || defined(CONFIG_RKNAND) || defined(CONFIG_DM_RAMDISK) */
#endif/* defined(CONFIG_MMC) ||\
* defined(CONFIG_RKNAND) ||\
* defined(CONFIG_DM_RAMDISK) ||\
* defined(CONFIG_USB_HOST) ||\
* defined(CONFIG_RKNANDC_NAND) ||\
* defined(CONFIG_RKSFC_NAND) ||\
* defined(CONFIG_RKSFC_NOR)
*/
#if defined(CONFIG_OPTEE_CLIENT) && defined(CONFIG_MMC)
static int do_test_secure_storage(cmd_tbl_t *cmdtp, int flag,
@ -374,7 +405,7 @@ static int do_test_part(cmd_tbl_t *cmdtp, int flag,
#ifdef CONFIG_USB_HOST
static int do_test_usb(cmd_tbl_t *cmdtp, int flag,
int argc, char *const argv[])
int argc, char *const argv[])
{
run_command("usb start", 0);
return do_test_storage(cmdtp, flag, argc, argv, "usb", "0", "usb0");
@ -398,9 +429,15 @@ static cmd_tbl_t sub_cmd[] = {
#ifdef CONFIG_ROCKCHIP_OTP
UNIT_CMD_DEFINE(otp, 0),
#endif
#ifdef CONFIG_RKNAND
#if defined(CONFIG_RKNAND) || defined(CONFIG_RKNANDC_NAND)
UNIT_CMD_DEFINE(rknand, 0),
#endif
#ifdef CONFIG_RKSFC_NAND
UNIT_CMD_DEFINE(rkflash_spinand, 0),
#endif
#ifdef CONFIG_RKSFC_NOR
UNIT_CMD_DEFINE(rkflash_spinor, 0),
#endif
#if defined(CONFIG_OPTEE_CLIENT) && defined(CONFIG_MMC)
UNIT_CMD_DEFINE(secure_storage, 0),
#endif
@ -426,9 +463,15 @@ static char sub_cmd_help[] =
" [.] rktest emmc - test emmc read/write speed\n"
" [.] rktest sdmmc - test sd card and fat fs read/write\n"
#endif
#ifdef CONFIG_RKNAND
#if defined(CONFIG_RKNAND) || defined(CONFIG_RKNANDC_NAND)
" [.] rktest rknand - test rknand read/write speed\n"
#endif
#ifdef CONFIG_RKSFC_NAND
" [.] rktest rkflash_spinand - test RKFLASH DM driver spinand read/write speed\n"
#endif
#ifdef CONFIG_RKSFC_NOR
" [.] rktest rkflash_spinor - test RKFLASH DM driver read/write speed\n"
#endif
#if defined(CONFIG_OPTEE_CLIENT) && defined(CONFIG_MMC)
" [.] rktest secure_storage - test secure storage\n"
#endif