[J-u-boot.git] / common / cmd_sf.c

/*
 * Command for accessing SPI flash.
 *
 * Copyright (C) 2008 Atmel Corporation
 * Licensed under the GPL-2 or later.
 */

#include <common.h>
#include <div64.h>
#include <malloc.h>
#include <spi_flash.h>

#include <asm/io.h>

#ifndef CONFIG_SF_DEFAULT_SPEED
# define CONFIG_SF_DEFAULT_SPEED	1000000
#endif
#ifndef CONFIG_SF_DEFAULT_MODE
# define CONFIG_SF_DEFAULT_MODE		SPI_MODE_3
#endif
#ifndef CONFIG_SF_DEFAULT_CS
# define CONFIG_SF_DEFAULT_CS		0
#endif
#ifndef CONFIG_SF_DEFAULT_BUS
# define CONFIG_SF_DEFAULT_BUS		0
#endif

static struct spi_flash *flash;


/*
 * This function computes the length argument for the erase command.
 * The length on which the command is to operate can be given in two forms:
 * 1. <cmd> offset len  - operate on <'offset',  'len')
 * 2. <cmd> offset +len - operate on <'offset',  'round_up(len)')
 * If the second form is used and the length doesn't fall on the
 * sector boundary, than it will be adjusted to the next sector boundary.
 * If it isn't in the flash, the function will fail (return -1).
 * Input:
 *    arg: length specification (i.e. both command arguments)
 * Output:
 *    len: computed length for operation
 * Return:
 *    1: success
 *   -1: failure (bad format, bad address).
 */
static int sf_parse_len_arg(char *arg, ulong *len)
{
	char *ep;
	char round_up_len; /* indicates if the "+length" form used */
	ulong len_arg;

	round_up_len = 0;
	if (*arg == '+') {
		round_up_len = 1;
		++arg;
	}

	len_arg = simple_strtoul(arg, &ep, 16);
	if (ep == arg || *ep != '\0')
		return -1;

	if (round_up_len && flash->sector_size > 0)
		*len = ROUND(len_arg, flash->sector_size);
	else
		*len = len_arg;

	return 1;
}

/**
 * This function takes a byte length and a delta unit of time to compute the
 * approximate bytes per second
 *
 * @param len		amount of bytes currently processed
 * @param start_ms	start time of processing in ms
 * @return bytes per second if OK, 0 on error
 */
static ulong bytes_per_second(unsigned int len, ulong start_ms)
{
	/* less accurate but avoids overflow */
	if (len >= ((unsigned int) -1) / 1024)
		return len / (max(get_timer(start_ms) / 1024, 1));
	else
		return 1024 * len / max(get_timer(start_ms), 1);
}

static int do_spi_flash_probe(int argc, char * const argv[])
{
	unsigned int bus = CONFIG_SF_DEFAULT_BUS;
	unsigned int cs = CONFIG_SF_DEFAULT_CS;
	unsigned int speed = CONFIG_SF_DEFAULT_SPEED;
	unsigned int mode = CONFIG_SF_DEFAULT_MODE;
	char *endp;
	struct spi_flash *new;

	if (argc >= 2) {
		cs = simple_strtoul(argv[1], &endp, 0);
		if (*argv[1] == 0 || (*endp != 0 && *endp != ':'))
			return -1;
		if (*endp == ':') {
			if (endp[1] == 0)
				return -1;

			bus = cs;
			cs = simple_strtoul(endp + 1, &endp, 0);
			if (*endp != 0)
				return -1;
		}
	}

	if (argc >= 3) {
		speed = simple_strtoul(argv[2], &endp, 0);
		if (*argv[2] == 0 || *endp != 0)
			return -1;
	}
	if (argc >= 4) {
		mode = simple_strtoul(argv[3], &endp, 16);
		if (*argv[3] == 0 || *endp != 0)
			return -1;
	}

	new = spi_flash_probe(bus, cs, speed, mode);
	if (!new) {
		printf("Failed to initialize SPI flash at %u:%u\n", bus, cs);
		return 1;
	}

	if (flash)
		spi_flash_free(flash);
	flash = new;

	return 0;
}

/**
 * Write a block of data to SPI flash, first checking if it is different from
 * what is already there.
 *
 * If the data being written is the same, then *skipped is incremented by len.
 *
 * @param flash		flash context pointer
 * @param offset	flash offset to write
 * @param len		number of bytes to write
 * @param buf		buffer to write from
 * @param cmp_buf	read buffer to use to compare data
 * @param skipped	Count of skipped data (incremented by this function)
 * @return NULL if OK, else a string containing the stage which failed
 */
static const char *spi_flash_update_block(struct spi_flash *flash, u32 offset,
		size_t len, const char *buf, char *cmp_buf, size_t *skipped)
{
	debug("offset=%#x, sector_size=%#x, len=%#zx\n",
	      offset, flash->sector_size, len);
	if (spi_flash_read(flash, offset, len, cmp_buf))
		return "read";
	if (memcmp(cmp_buf, buf, len) == 0) {
		debug("Skip region %x size %zx: no change\n",
		      offset, len);
		*skipped += len;
		return NULL;
	}
	/* Erase the entire sector */
	if (spi_flash_erase(flash, offset, flash->sector_size))
		return "erase";
	if (spi_flash_write(flash, offset, len, buf))
		return "write";
	return NULL;
}

/**
 * Update an area of SPI flash by erasing and writing any blocks which need
 * to change. Existing blocks with the correct data are left unchanged.
 *
 * @param flash		flash context pointer
 * @param offset	flash offset to write
 * @param len		number of bytes to write
 * @param buf		buffer to write from
 * @return 0 if ok, 1 on error
 */
static int spi_flash_update(struct spi_flash *flash, u32 offset,
		size_t len, const char *buf)
{
	const char *err_oper = NULL;
	char *cmp_buf;
	const char *end = buf + len;
	size_t todo;		/* number of bytes to do in this pass */
	size_t skipped = 0;	/* statistics */
	const ulong start_time = get_timer(0);
	size_t scale = 1;
	const char *start_buf = buf;
	ulong delta;

	if (end - buf >= 200)
		scale = (end - buf) / 100;
	cmp_buf = malloc(flash->sector_size);
	if (cmp_buf) {
		ulong last_update = get_timer(0);

		for (; buf < end && !err_oper; buf += todo, offset += todo) {
			todo = min(end - buf, flash->sector_size);
			if (get_timer(last_update) > 100) {
				printf("   \rUpdating, %zu%% %lu B/s",
				       100 - (end - buf) / scale,
					bytes_per_second(buf - start_buf,
							 start_time));
				last_update = get_timer(0);
			}
			err_oper = spi_flash_update_block(flash, offset, todo,
					buf, cmp_buf, &skipped);
		}
	} else {
		err_oper = "malloc";
	}
	free(cmp_buf);
	putc('\r');
	if (err_oper) {
		printf("SPI flash failed in %s step\n", err_oper);
		return 1;
	}

	delta = get_timer(start_time);
	printf("%zu bytes written, %zu bytes skipped", len - skipped,
	       skipped);
	printf(" in %ld.%lds, speed %ld B/s\n",
	       delta / 1000, delta % 1000, bytes_per_second(len, start_time));

	return 0;
}

static int do_spi_flash_read_write(int argc, char * const argv[])
{
	unsigned long addr;
	unsigned long offset;
	unsigned long len;
	void *buf;
	char *endp;
	int ret = 1;

	if (argc < 4)
		return -1;

	addr = simple_strtoul(argv[1], &endp, 16);
	if (*argv[1] == 0 || *endp != 0)
		return -1;
	offset = simple_strtoul(argv[2], &endp, 16);
	if (*argv[2] == 0 || *endp != 0)
		return -1;
	len = simple_strtoul(argv[3], &endp, 16);
	if (*argv[3] == 0 || *endp != 0)
		return -1;

	/* Consistency checking */
	if (offset + len > flash->size) {
		printf("ERROR: attempting %s past flash size (%#x)\n",
		       argv[0], flash->size);
		return 1;
	}

	buf = map_physmem(addr, len, MAP_WRBACK);
	if (!buf) {
		puts("Failed to map physical memory\n");
		return 1;
	}

	if (strcmp(argv[0], "update") == 0) {
		ret = spi_flash_update(flash, offset, len, buf);
	} else if (strncmp(argv[0], "read", 4) == 0 ||
			strncmp(argv[0], "write", 5) == 0) {
		int read;

		read = strncmp(argv[0], "read", 4) == 0;
		if (read)
			ret = spi_flash_read(flash, offset, len, buf);
		else
			ret = spi_flash_write(flash, offset, len, buf);

		printf("SF: %zu bytes @ %#x %s: %s\n", (size_t)len, (u32)offset,
		       read ? "Read" : "Written", ret ? "ERROR" : "OK");
	}

	unmap_physmem(buf, len);

	return ret == 0 ? 0 : 1;
}

static int do_spi_flash_erase(int argc, char * const argv[])
{
	unsigned long offset;
	unsigned long len;
	char *endp;
	int ret;

	if (argc < 3)
		return -1;

	offset = simple_strtoul(argv[1], &endp, 16);
	if (*argv[1] == 0 || *endp != 0)
		return -1;

	ret = sf_parse_len_arg(argv[2], &len);
	if (ret != 1)
		return -1;

	/* Consistency checking */
	if (offset + len > flash->size) {
		printf("ERROR: attempting %s past flash size (%#x)\n",
		       argv[0], flash->size);
		return 1;
	}

	ret = spi_flash_erase(flash, offset, len);
	printf("SF: %zu bytes @ %#x Erased: %s\n", (size_t)len, (u32)offset,
	       ret ? "ERROR" : "OK");

	return ret == 0 ? 0 : 1;
}

#ifdef CONFIG_CMD_SF_TEST
enum {
	STAGE_ERASE,
	STAGE_CHECK,
	STAGE_WRITE,
	STAGE_READ,

	STAGE_COUNT,
};

static char *stage_name[STAGE_COUNT] = {
	"erase",
	"check",
	"write",
	"read",
};

struct test_info {
	int stage;
	int bytes;
	unsigned base_ms;
	unsigned time_ms[STAGE_COUNT];
};

static void show_time(struct test_info *test, int stage)
{
	uint64_t speed;	/* KiB/s */
	int bps;	/* Bits per second */

	speed = (long long)test->bytes * 1000;
	do_div(speed, test->time_ms[stage] * 1024);
	bps = speed * 8;

	printf("%d %s: %d ticks, %d KiB/s %d.%03d Mbps\n", stage,
	       stage_name[stage], test->time_ms[stage],
	       (int)speed, bps / 1000, bps % 1000);
}

static void spi_test_next_stage(struct test_info *test)
{
	test->time_ms[test->stage] = get_timer(test->base_ms);
	show_time(test, test->stage);
	test->base_ms = get_timer(0);
	test->stage++;
}

/**
 * Run a test on the SPI flash
 *
 * @param flash		SPI flash to use
 * @param buf		Source buffer for data to write
 * @param len		Size of data to read/write
 * @param offset	Offset within flash to check
 * @param vbuf		Verification buffer
 * @return 0 if ok, -1 on error
 */
static int spi_flash_test(struct spi_flash *flash, uint8_t *buf, ulong len,
			   ulong offset, uint8_t *vbuf)
{
	struct test_info test;
	int i;

	printf("SPI flash test:\n");
	memset(&test, '\0', sizeof(test));
	test.base_ms = get_timer(0);
	test.bytes = len;
	if (spi_flash_erase(flash, offset, len)) {
		printf("Erase failed\n");
		return -1;
	}
	spi_test_next_stage(&test);

	if (spi_flash_read(flash, offset, len, vbuf)) {
		printf("Check read failed\n");
		return -1;
	}
	for (i = 0; i < len; i++) {
		if (vbuf[i] != 0xff) {
			printf("Check failed at %d\n", i);
			print_buffer(i, vbuf + i, 1, min(len - i, 0x40), 0);
			return -1;
		}
	}
	spi_test_next_stage(&test);

	if (spi_flash_write(flash, offset, len, buf)) {
		printf("Write failed\n");
		return -1;
	}
	memset(vbuf, '\0', len);
	spi_test_next_stage(&test);

	if (spi_flash_read(flash, offset, len, vbuf)) {
		printf("Read failed\n");
		return -1;
	}
	spi_test_next_stage(&test);

	for (i = 0; i < len; i++) {
		if (buf[i] != vbuf[i]) {
			printf("Verify failed at %d, good data:\n", i);
			print_buffer(i, buf + i, 1, min(len - i, 0x40), 0);
			printf("Bad data:\n");
			print_buffer(i, vbuf + i, 1, min(len - i, 0x40), 0);
			return -1;
		}
	}
	printf("Test passed\n");
	for (i = 0; i < STAGE_COUNT; i++)
		show_time(&test, i);

	return 0;
}

static int do_spi_flash_test(int argc, char * const argv[])
{
	unsigned long offset;
	unsigned long len;
	uint8_t *buf = (uint8_t *)CONFIG_SYS_TEXT_BASE;
	char *endp;
	uint8_t *vbuf;
	int ret;

	offset = simple_strtoul(argv[1], &endp, 16);
	if (*argv[1] == 0 || *endp != 0)
		return -1;
	len = simple_strtoul(argv[2], &endp, 16);
	if (*argv[2] == 0 || *endp != 0)
		return -1;

	vbuf = malloc(len);
	if (!vbuf) {
		printf("Cannot allocate memory\n");
		return 1;
	}
	buf = malloc(len);
	if (!buf) {
		free(vbuf);
		printf("Cannot allocate memory\n");
		return 1;
	}

	memcpy(buf, (char *)CONFIG_SYS_TEXT_BASE, len);
	ret = spi_flash_test(flash, buf, len, offset, vbuf);
	free(vbuf);
	free(buf);
	if (ret) {
		printf("Test failed\n");
		return 1;
	}

	return 0;
}
#endif /* CONFIG_CMD_SF_TEST */

static int do_spi_flash(cmd_tbl_t *cmdtp, int flag, int argc,
			char * const argv[])
{
	const char *cmd;
	int ret;

	/* need at least two arguments */
	if (argc < 2)
		goto usage;

	cmd = argv[1];
	--argc;
	++argv;

	if (strcmp(cmd, "probe") == 0) {
		ret = do_spi_flash_probe(argc, argv);
		goto done;
	}

	/* The remaining commands require a selected device */
	if (!flash) {
		puts("No SPI flash selected. Please run `sf probe'\n");
		return 1;
	}

	if (strcmp(cmd, "read") == 0 || strcmp(cmd, "write") == 0 ||
	    strcmp(cmd, "update") == 0)
		ret = do_spi_flash_read_write(argc, argv);
	else if (strcmp(cmd, "erase") == 0)
		ret = do_spi_flash_erase(argc, argv);
#ifdef CONFIG_CMD_SF_TEST
	else if (!strcmp(cmd, "test"))
		ret = do_spi_flash_test(argc, argv);
#endif
	else
		ret = -1;

done:
	if (ret != -1)
		return ret;

usage:
	return CMD_RET_USAGE;
}

#ifdef CONFIG_CMD_SF_TEST
#define SF_TEST_HELP "\nsf test offset len		" \
		"- run a very basic destructive test"
#else
#define SF_TEST_HELP
#endif

U_BOOT_CMD(
	sf,	5,	1,	do_spi_flash,
	"SPI flash sub-system",
	"probe [[bus:]cs] [hz] [mode]	- init flash device on given SPI bus\n"
	"				  and chip select\n"
	"sf read addr offset len	- read `len' bytes starting at\n"
	"				  `offset' to memory at `addr'\n"
	"sf write addr offset len	- write `len' bytes from memory\n"
	"				  at `addr' to flash at `offset'\n"
	"sf erase offset [+]len		- erase `len' bytes from `offset'\n"
	"				  `+len' round up `len' to block size\n"
	"sf update addr offset len	- erase and write `len' bytes from memory\n"
	"				  at `addr' to flash at `offset'"
	SF_TEST_HELP
);
Commit	Line	Data
b6368467 HS	1	/*
	2	* Command for accessing SPI flash.
	3	*
	4	* Copyright (C) 2008 Atmel Corporation
4166ee58	5	* Licensed under the GPL-2 or later.
b6368467	6	*/
4166ee58	7
b6368467	8	#include <common.h>
381c6e2c	9	#include <div64.h>
8d1af942	10	#include <malloc.h>
b6368467 HS	11	#include <spi_flash.h>
	12
	13	#include <asm/io.h>
	14
	15	#ifndef CONFIG_SF_DEFAULT_SPEED
	16	# define CONFIG_SF_DEFAULT_SPEED 1000000
	17	#endif
	18	#ifndef CONFIG_SF_DEFAULT_MODE
	19	# define CONFIG_SF_DEFAULT_MODE SPI_MODE_3
	20	#endif
c1173bd0 EN	21	#ifndef CONFIG_SF_DEFAULT_CS
	22	# define CONFIG_SF_DEFAULT_CS 0
	23	#endif
	24	#ifndef CONFIG_SF_DEFAULT_BUS
	25	# define CONFIG_SF_DEFAULT_BUS 0
	26	#endif
b6368467 HS	27
	28	static struct spi_flash *flash;
	29
334eb4b0 RR	30
	31	/*
	32	* This function computes the length argument for the erase command.
	33	* The length on which the command is to operate can be given in two forms:
	34	* 1. <cmd> offset len - operate on <'offset', 'len')
	35	* 2. <cmd> offset +len - operate on <'offset', 'round_up(len)')
	36	* If the second form is used and the length doesn't fall on the
	37	* sector boundary, than it will be adjusted to the next sector boundary.
	38	* If it isn't in the flash, the function will fail (return -1).
	39	* Input:
	40	* arg: length specification (i.e. both command arguments)
	41	* Output:
	42	* len: computed length for operation
	43	* Return:
	44	* 1: success
	45	* -1: failure (bad format, bad address).
	46	*/
	47	static int sf_parse_len_arg(char arg, ulong len)
	48	{
	49	char *ep;
	50	char round_up_len; /* indicates if the "+length" form used */
	51	ulong len_arg;
	52
	53	round_up_len = 0;
	54	if (*arg == '+') {
	55	round_up_len = 1;
	56	++arg;
	57	}
	58
	59	len_arg = simple_strtoul(arg, &ep, 16);
	60	if (ep == arg \|\| *ep != '\0')
	61	return -1;
	62
	63	if (round_up_len && flash->sector_size > 0)
155cfb5e	64	*len = ROUND(len_arg, flash->sector_size);
334eb4b0 RR	65	else
	66	*len = len_arg;
	67
	68	return 1;
	69	}
	70
a683c288 JM	71	/**
	72	* This function takes a byte length and a delta unit of time to compute the
	73	* approximate bytes per second
	74	*
	75	* @param len amount of bytes currently processed
	76	* @param start_ms start time of processing in ms
	77	* @return bytes per second if OK, 0 on error
	78	*/
	79	static ulong bytes_per_second(unsigned int len, ulong start_ms)
	80	{
	81	/* less accurate but avoids overflow */
	82	if (len >= ((unsigned int) -1) / 1024)
	83	return len / (max(get_timer(start_ms) / 1024, 1));
	84	else
	85	return 1024 * len / max(get_timer(start_ms), 1);
	86	}
	87
54841ab5	88	static int do_spi_flash_probe(int argc, char * const argv[])
b6368467	89	{
c1173bd0 EN	90	unsigned int bus = CONFIG_SF_DEFAULT_BUS;
c1173bd0 EN	91	unsigned int cs = CONFIG_SF_DEFAULT_CS;
b6368467 HS	92	unsigned int speed = CONFIG_SF_DEFAULT_SPEED;
	93	unsigned int mode = CONFIG_SF_DEFAULT_MODE;
	94	char *endp;
	95	struct spi_flash *new;
	96
c1173bd0 EN	97	if (argc >= 2) {
	98	cs = simple_strtoul(argv[1], &endp, 0);
	99	if (argv[1] == 0 \|\| (endp != 0 && *endp != ':'))
8a07de03	100	return -1;
c1173bd0 EN	101	if (*endp == ':') {
	102	if (endp[1] == 0)
	103	return -1;
	104
	105	bus = cs;
	106	cs = simple_strtoul(endp + 1, &endp, 0);
	107	if (*endp != 0)
	108	return -1;
	109	}
b6368467 HS	110	}
	111
	112	if (argc >= 3) {
	113	speed = simple_strtoul(argv[2], &endp, 0);
	114	if (argv[2] == 0 \|\| endp != 0)
8a07de03	115	return -1;
b6368467 HS	116	}
b6368467 HS	117	if (argc >= 4) {
6e8d58d3	118	mode = simple_strtoul(argv[3], &endp, 16);
b6368467	119	if (argv[3] == 0 \|\| endp != 0)
8a07de03	120	return -1;
b6368467 HS	121	}
	122
	123	new = spi_flash_probe(bus, cs, speed, mode);
	124	if (!new) {
	125	printf("Failed to initialize SPI flash at %u:%u\n", bus, cs);
	126	return 1;
	127	}
	128
	129	if (flash)
	130	spi_flash_free(flash);
	131	flash = new;
	132
b6368467	133	return 0;
b6368467 HS	134	}
b6368467 HS	135
8d1af942 SG	136	/**
	137	* Write a block of data to SPI flash, first checking if it is different from
	138	* what is already there.
	139	*
	140	* If the data being written is the same, then *skipped is incremented by len.
	141	*
	142	* @param flash flash context pointer
	143	* @param offset flash offset to write
	144	* @param len number of bytes to write
	145	* @param buf buffer to write from
	146	* @param cmp_buf read buffer to use to compare data
	147	* @param skipped Count of skipped data (incremented by this function)
	148	* @return NULL if OK, else a string containing the stage which failed
	149	*/
	150	static const char spi_flash_update_block(struct spi_flash flash, u32 offset,
	151	size_t len, const char buf, char cmp_buf, size_t *skipped)
	152	{
a97f6efd	153	debug("offset=%#x, sector_size=%#x, len=%#zx\n",
402ba1e3	154	offset, flash->sector_size, len);
8d1af942 SG	155	if (spi_flash_read(flash, offset, len, cmp_buf))
	156	return "read";
	157	if (memcmp(cmp_buf, buf, len) == 0) {
a97f6efd	158	debug("Skip region %x size %zx: no change\n",
402ba1e3	159	offset, len);
8d1af942 SG	160	*skipped += len;
	161	return NULL;
	162	}
34888506 GF	163	/* Erase the entire sector */
34888506 GF	164	if (spi_flash_erase(flash, offset, flash->sector_size))
8d1af942 SG	165	return "erase";
	166	if (spi_flash_write(flash, offset, len, buf))
	167	return "write";
	168	return NULL;
	169	}
	170
	171	/**
	172	* Update an area of SPI flash by erasing and writing any blocks which need
	173	* to change. Existing blocks with the correct data are left unchanged.
	174	*
	175	* @param flash flash context pointer
	176	* @param offset flash offset to write
	177	* @param len number of bytes to write
	178	* @param buf buffer to write from
	179	* @return 0 if ok, 1 on error
	180	*/
	181	static int spi_flash_update(struct spi_flash *flash, u32 offset,
	182	size_t len, const char *buf)
	183	{
	184	const char *err_oper = NULL;
	185	char *cmp_buf;
	186	const char *end = buf + len;
	187	size_t todo; /* number of bytes to do in this pass */
8e8a4bc2	188	size_t skipped = 0; /* statistics */
a683c288 JM	189	const ulong start_time = get_timer(0);
	190	size_t scale = 1;
	191	const char *start_buf = buf;
	192	ulong delta;
8d1af942	193
a683c288 JM	194	if (end - buf >= 200)
a683c288 JM	195	scale = (end - buf) / 100;
8d1af942 SG	196	cmp_buf = malloc(flash->sector_size);
8d1af942 SG	197	if (cmp_buf) {
a683c288 JM	198	ulong last_update = get_timer(0);
a683c288 JM	199
8e8a4bc2	200	for (; buf < end && !err_oper; buf += todo, offset += todo) {
8d1af942	201	todo = min(end - buf, flash->sector_size);
a683c288 JM	202	if (get_timer(last_update) > 100) {
a683c288 JM	203	printf(" \rUpdating, %zu%% %lu B/s",
402ba1e3	204	100 - (end - buf) / scale,
a683c288 JM	205	bytes_per_second(buf - start_buf,
	206	start_time));
	207	last_update = get_timer(0);
	208	}
8d1af942 SG	209	err_oper = spi_flash_update_block(flash, offset, todo,
	210	buf, cmp_buf, &skipped);
	211	}
	212	} else {
	213	err_oper = "malloc";
	214	}
	215	free(cmp_buf);
a683c288	216	putc('\r');
8d1af942 SG	217	if (err_oper) {
	218	printf("SPI flash failed in %s step\n", err_oper);
	219	return 1;
	220	}
a683c288 JM	221
	222	delta = get_timer(start_time);
	223	printf("%zu bytes written, %zu bytes skipped", len - skipped,
402ba1e3	224	skipped);
a683c288	225	printf(" in %ld.%lds, speed %ld B/s\n",
402ba1e3	226	delta / 1000, delta % 1000, bytes_per_second(len, start_time));
8e8a4bc2	227
8d1af942 SG	228	return 0;
	229	}
	230
54841ab5	231	static int do_spi_flash_read_write(int argc, char * const argv[])
b6368467 HS	232	{
	233	unsigned long addr;
	234	unsigned long offset;
	235	unsigned long len;
	236	void *buf;
	237	char *endp;
60b6614a	238	int ret = 1;
b6368467 HS	239
b6368467 HS	240	if (argc < 4)
8a07de03	241	return -1;
b6368467 HS	242
	243	addr = simple_strtoul(argv[1], &endp, 16);
	244	if (argv[1] == 0 \|\| endp != 0)
8a07de03	245	return -1;
b6368467 HS	246	offset = simple_strtoul(argv[2], &endp, 16);
b6368467 HS	247	if (argv[2] == 0 \|\| endp != 0)
8a07de03	248	return -1;
b6368467 HS	249	len = simple_strtoul(argv[3], &endp, 16);
b6368467 HS	250	if (argv[3] == 0 \|\| endp != 0)
8a07de03	251	return -1;
b6368467	252
86493994 GF	253	/* Consistency checking */
	254	if (offset + len > flash->size) {
	255	printf("ERROR: attempting %s past flash size (%#x)\n",
402ba1e3	256	argv[0], flash->size);
86493994 GF	257	return 1;
	258	}
	259
b6368467 HS	260	buf = map_physmem(addr, len, MAP_WRBACK);
	261	if (!buf) {
	262	puts("Failed to map physical memory\n");
	263	return 1;
	264	}
	265
402ba1e3	266	if (strcmp(argv[0], "update") == 0) {
8d1af942	267	ret = spi_flash_update(flash, offset, len, buf);
402ba1e3	268	} else if (strncmp(argv[0], "read", 4) == 0 \|\|
60b6614a JT	269	strncmp(argv[0], "write", 5) == 0) {
	270	int read;
	271
	272	read = strncmp(argv[0], "read", 4) == 0;
	273	if (read)
	274	ret = spi_flash_read(flash, offset, len, buf);
	275	else
	276	ret = spi_flash_write(flash, offset, len, buf);
	277
	278	printf("SF: %zu bytes @ %#x %s: %s\n", (size_t)len, (u32)offset,
402ba1e3	279	read ? "Read" : "Written", ret ? "ERROR" : "OK");
60b6614a	280	}
b6368467 HS	281
	282	unmap_physmem(buf, len);
	283
60b6614a	284	return ret == 0 ? 0 : 1;
b6368467 HS	285	}
b6368467 HS	286
54841ab5	287	static int do_spi_flash_erase(int argc, char * const argv[])
b6368467 HS	288	{
	289	unsigned long offset;
	290	unsigned long len;
	291	char *endp;
	292	int ret;
	293
	294	if (argc < 3)
8a07de03	295	return -1;
b6368467 HS	296
	297	offset = simple_strtoul(argv[1], &endp, 16);
	298	if (argv[1] == 0 \|\| endp != 0)
8a07de03	299	return -1;
334eb4b0 RR	300
	301	ret = sf_parse_len_arg(argv[2], &len);
	302	if (ret != 1)
8a07de03	303	return -1;
b6368467	304
86493994 GF	305	/* Consistency checking */
	306	if (offset + len > flash->size) {
	307	printf("ERROR: attempting %s past flash size (%#x)\n",
402ba1e3	308	argv[0], flash->size);
86493994 GF	309	return 1;
	310	}
	311
b6368467	312	ret = spi_flash_erase(flash, offset, len);
96bbf556	313	printf("SF: %zu bytes @ %#x Erased: %s\n", (size_t)len, (u32)offset,
402ba1e3	314	ret ? "ERROR" : "OK");
b6368467	315
96bbf556	316	return ret == 0 ? 0 : 1;
b6368467 HS	317	}
b6368467 HS	318
24007273 SG	319	#ifdef CONFIG_CMD_SF_TEST
	320	enum {
	321	STAGE_ERASE,
	322	STAGE_CHECK,
	323	STAGE_WRITE,
	324	STAGE_READ,
	325
	326	STAGE_COUNT,
	327	};
	328
	329	static char *stage_name[STAGE_COUNT] = {
	330	"erase",
	331	"check",
	332	"write",
	333	"read",
	334	};
	335
	336	struct test_info {
	337	int stage;
	338	int bytes;
	339	unsigned base_ms;
	340	unsigned time_ms[STAGE_COUNT];
	341	};
	342
	343	static void show_time(struct test_info *test, int stage)
	344	{
	345	uint64_t speed; /* KiB/s */
	346	int bps; /* Bits per second */
	347
	348	speed = (long long)test->bytes * 1000;
	349	do_div(speed, test->time_ms[stage] * 1024);
	350	bps = speed * 8;
	351
	352	printf("%d %s: %d ticks, %d KiB/s %d.%03d Mbps\n", stage,
	353	stage_name[stage], test->time_ms[stage],
	354	(int)speed, bps / 1000, bps % 1000);
	355	}
	356
	357	static void spi_test_next_stage(struct test_info *test)
	358	{
	359	test->time_ms[test->stage] = get_timer(test->base_ms);
	360	show_time(test, test->stage);
	361	test->base_ms = get_timer(0);
	362	test->stage++;
	363	}
	364
	365	/**
	366	* Run a test on the SPI flash
	367	*
	368	* @param flash SPI flash to use
	369	* @param buf Source buffer for data to write
	370	* @param len Size of data to read/write
	371	* @param offset Offset within flash to check
	372	* @param vbuf Verification buffer
	373	* @return 0 if ok, -1 on error
	374	*/
1e7133e9 SG	375	static int spi_flash_test(struct spi_flash flash, uint8_t buf, ulong len,
1e7133e9 SG	376	ulong offset, uint8_t *vbuf)
24007273 SG	377	{
	378	struct test_info test;
	379	int i;
	380
	381	printf("SPI flash test:\n");
	382	memset(&test, '\0', sizeof(test));
	383	test.base_ms = get_timer(0);
	384	test.bytes = len;
	385	if (spi_flash_erase(flash, offset, len)) {
	386	printf("Erase failed\n");
	387	return -1;
	388	}
	389	spi_test_next_stage(&test);
	390
	391	if (spi_flash_read(flash, offset, len, vbuf)) {
	392	printf("Check read failed\n");
	393	return -1;
	394	}
	395	for (i = 0; i < len; i++) {
	396	if (vbuf[i] != 0xff) {
	397	printf("Check failed at %d\n", i);
	398	print_buffer(i, vbuf + i, 1, min(len - i, 0x40), 0);
	399	return -1;
	400	}
	401	}
	402	spi_test_next_stage(&test);
	403
	404	if (spi_flash_write(flash, offset, len, buf)) {
	405	printf("Write failed\n");
	406	return -1;
	407	}
	408	memset(vbuf, '\0', len);
	409	spi_test_next_stage(&test);
	410
	411	if (spi_flash_read(flash, offset, len, vbuf)) {
	412	printf("Read failed\n");
	413	return -1;
	414	}
	415	spi_test_next_stage(&test);
	416
	417	for (i = 0; i < len; i++) {
	418	if (buf[i] != vbuf[i]) {
	419	printf("Verify failed at %d, good data:\n", i);
	420	print_buffer(i, buf + i, 1, min(len - i, 0x40), 0);
	421	printf("Bad data:\n");
	422	print_buffer(i, vbuf + i, 1, min(len - i, 0x40), 0);
	423	return -1;
	424	}
	425	}
	426	printf("Test passed\n");
	427	for (i = 0; i < STAGE_COUNT; i++)
	428	show_time(&test, i);
	429
	430	return 0;
	431	}
	432
	433	static int do_spi_flash_test(int argc, char * const argv[])
	434	{
	435	unsigned long offset;
	436	unsigned long len;
1e7133e9	437	uint8_t buf = (uint8_t )CONFIG_SYS_TEXT_BASE;
24007273	438	char *endp;
1e7133e9	439	uint8_t *vbuf;
24007273 SG	440	int ret;
	441
	442	offset = simple_strtoul(argv[1], &endp, 16);
	443	if (argv[1] == 0 \|\| endp != 0)
	444	return -1;
	445	len = simple_strtoul(argv[2], &endp, 16);
	446	if (argv[2] == 0 \|\| endp != 0)
	447	return -1;
	448
	449	vbuf = malloc(len);
	450	if (!vbuf) {
	451	printf("Cannot allocate memory\n");
	452	return 1;
	453	}
	454	buf = malloc(len);
	455	if (!buf) {
	456	free(vbuf);
	457	printf("Cannot allocate memory\n");
	458	return 1;
	459	}
	460
	461	memcpy(buf, (char *)CONFIG_SYS_TEXT_BASE, len);
	462	ret = spi_flash_test(flash, buf, len, offset, vbuf);
	463	free(vbuf);
	464	free(buf);
	465	if (ret) {
	466	printf("Test failed\n");
	467	return 1;
	468	}
	469
	470	return 0;
	471	}
	472	#endif /* CONFIG_CMD_SF_TEST */
	473
402ba1e3 JT	474	static int do_spi_flash(cmd_tbl_t *cmdtp, int flag, int argc,
402ba1e3 JT	475	char * const argv[])
b6368467 HS	476	{
b6368467 HS	477	const char *cmd;
8a07de03	478	int ret;
b6368467 HS	479
	480	/* need at least two arguments */
	481	if (argc < 2)
	482	goto usage;
	483
	484	cmd = argv[1];
8a07de03 MF	485	--argc;
8a07de03 MF	486	++argv;
b6368467	487
8a07de03 MF	488	if (strcmp(cmd, "probe") == 0) {
	489	ret = do_spi_flash_probe(argc, argv);
	490	goto done;
	491	}
b6368467 HS	492
	493	/* The remaining commands require a selected device */
	494	if (!flash) {
	495	puts("No SPI flash selected. Please run `sf probe'\n");
	496	return 1;
	497	}
	498
8d1af942 SG	499	if (strcmp(cmd, "read") == 0 \|\| strcmp(cmd, "write") == 0 \|\|
8d1af942 SG	500	strcmp(cmd, "update") == 0)
8a07de03 MF	501	ret = do_spi_flash_read_write(argc, argv);
	502	else if (strcmp(cmd, "erase") == 0)
	503	ret = do_spi_flash_erase(argc, argv);
24007273 SG	504	#ifdef CONFIG_CMD_SF_TEST
	505	else if (!strcmp(cmd, "test"))
	506	ret = do_spi_flash_test(argc, argv);
	507	#endif
8a07de03 MF	508	else
	509	ret = -1;
	510
	511	done:
	512	if (ret != -1)
	513	return ret;
b6368467 HS	514
b6368467 HS	515	usage:
4c12eeb8	516	return CMD_RET_USAGE;
b6368467 HS	517	}
b6368467 HS	518
24007273 SG	519	#ifdef CONFIG_CMD_SF_TEST
	520	#define SF_TEST_HELP "\nsf test offset len " \
	521	"- run a very basic destructive test"
	522	#else
	523	#define SF_TEST_HELP
	524	#endif
	525
b6368467 HS	526	U_BOOT_CMD(
b6368467 HS	527	sf, 5, 1, do_spi_flash,
2fb2604d	528	"SPI flash sub-system",
c1173bd0	529	"probe [[bus:]cs] [hz] [mode] - init flash device on given SPI bus\n"
b6368467	530	" and chip select\n"
402ba1e3	531	"sf read addr offset len - read `len' bytes starting at\n"
b6368467 HS	532	" `offset' to memory at `addr'\n"
	533	"sf write addr offset len - write `len' bytes from memory\n"
	534	" at `addr' to flash at `offset'\n"
334eb4b0	535	"sf erase offset [+]len - erase `len' bytes from `offset'\n"
8d1af942 SG	536	" `+len' round up `len' to block size\n"
	537	"sf update addr offset len - erase and write `len' bytes from memory\n"
	538	" at `addr' to flash at `offset'"
24007273	539	SF_TEST_HELP
a89c33db	540	);