2008-05-16 17:10:34 +08:00
|
|
|
/*
|
|
|
|
* Command for accessing SPI flash.
|
|
|
|
*
|
|
|
|
* Copyright (C) 2008 Atmel Corporation
|
2013-10-11 01:02:55 +08:00
|
|
|
*
|
|
|
|
* SPDX-License-Identifier: GPL-2.0+
|
2008-05-16 17:10:34 +08:00
|
|
|
*/
|
2009-10-10 05:12:44 +08:00
|
|
|
|
2008-05-16 17:10:34 +08:00
|
|
|
#include <common.h>
|
2013-04-08 06:13:32 +08:00
|
|
|
#include <div64.h>
|
2011-08-23 07:03:46 +08:00
|
|
|
#include <malloc.h>
|
2008-05-16 17:10:34 +08:00
|
|
|
#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
|
2012-02-01 01:52:07 +08:00
|
|
|
#ifndef CONFIG_SF_DEFAULT_CS
|
|
|
|
# define CONFIG_SF_DEFAULT_CS 0
|
|
|
|
#endif
|
|
|
|
#ifndef CONFIG_SF_DEFAULT_BUS
|
|
|
|
# define CONFIG_SF_DEFAULT_BUS 0
|
|
|
|
#endif
|
2008-05-16 17:10:34 +08:00
|
|
|
|
|
|
|
static struct spi_flash *flash;
|
|
|
|
|
2011-02-17 05:39:44 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* 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)
|
2011-09-02 21:45:28 +08:00
|
|
|
*len = ROUND(len_arg, flash->sector_size);
|
2011-02-17 05:39:44 +08:00
|
|
|
else
|
|
|
|
*len = len_arg;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2012-09-28 22:28:00 +08:00
|
|
|
/**
|
|
|
|
* 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);
|
|
|
|
}
|
|
|
|
|
2010-06-29 04:00:46 +08:00
|
|
|
static int do_spi_flash_probe(int argc, char * const argv[])
|
2008-05-16 17:10:34 +08:00
|
|
|
{
|
2012-02-01 01:52:07 +08:00
|
|
|
unsigned int bus = CONFIG_SF_DEFAULT_BUS;
|
|
|
|
unsigned int cs = CONFIG_SF_DEFAULT_CS;
|
2008-05-16 17:10:34 +08:00
|
|
|
unsigned int speed = CONFIG_SF_DEFAULT_SPEED;
|
|
|
|
unsigned int mode = CONFIG_SF_DEFAULT_MODE;
|
|
|
|
char *endp;
|
|
|
|
struct spi_flash *new;
|
|
|
|
|
2012-02-01 01:52:07 +08:00
|
|
|
if (argc >= 2) {
|
|
|
|
cs = simple_strtoul(argv[1], &endp, 0);
|
|
|
|
if (*argv[1] == 0 || (*endp != 0 && *endp != ':'))
|
2011-04-12 14:21:31 +08:00
|
|
|
return -1;
|
2012-02-01 01:52:07 +08:00
|
|
|
if (*endp == ':') {
|
|
|
|
if (endp[1] == 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
bus = cs;
|
|
|
|
cs = simple_strtoul(endp + 1, &endp, 0);
|
|
|
|
if (*endp != 0)
|
|
|
|
return -1;
|
|
|
|
}
|
2008-05-16 17:10:34 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (argc >= 3) {
|
|
|
|
speed = simple_strtoul(argv[2], &endp, 0);
|
|
|
|
if (*argv[2] == 0 || *endp != 0)
|
2011-04-12 14:21:31 +08:00
|
|
|
return -1;
|
2008-05-16 17:10:34 +08:00
|
|
|
}
|
|
|
|
if (argc >= 4) {
|
2009-06-30 22:30:19 +08:00
|
|
|
mode = simple_strtoul(argv[3], &endp, 16);
|
2008-05-16 17:10:34 +08:00
|
|
|
if (*argv[3] == 0 || *endp != 0)
|
2011-04-12 14:21:31 +08:00
|
|
|
return -1;
|
2008-05-16 17:10:34 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2011-08-23 07:03:46 +08:00
|
|
|
/**
|
|
|
|
* 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)
|
|
|
|
{
|
2011-12-15 16:56:53 +08:00
|
|
|
debug("offset=%#x, sector_size=%#x, len=%#zx\n",
|
2013-07-30 00:42:52 +08:00
|
|
|
offset, flash->sector_size, len);
|
2013-08-27 21:43:57 +08:00
|
|
|
/* Read the entire sector so to allow for rewriting */
|
|
|
|
if (spi_flash_read(flash, offset, flash->sector_size, cmp_buf))
|
2011-08-23 07:03:46 +08:00
|
|
|
return "read";
|
2013-08-27 21:43:57 +08:00
|
|
|
/* Compare only what is meaningful (len) */
|
2011-08-23 07:03:46 +08:00
|
|
|
if (memcmp(cmp_buf, buf, len) == 0) {
|
2011-12-15 16:56:53 +08:00
|
|
|
debug("Skip region %x size %zx: no change\n",
|
2013-07-30 00:42:52 +08:00
|
|
|
offset, len);
|
2011-08-23 07:03:46 +08:00
|
|
|
*skipped += len;
|
|
|
|
return NULL;
|
|
|
|
}
|
2013-07-04 02:33:57 +08:00
|
|
|
/* Erase the entire sector */
|
|
|
|
if (spi_flash_erase(flash, offset, flash->sector_size))
|
2011-08-23 07:03:46 +08:00
|
|
|
return "erase";
|
2013-08-27 21:43:57 +08:00
|
|
|
/* Write the initial part of the block from the source */
|
2011-08-23 07:03:46 +08:00
|
|
|
if (spi_flash_write(flash, offset, len, buf))
|
|
|
|
return "write";
|
2013-08-27 21:43:57 +08:00
|
|
|
/* If it's a partial sector, rewrite the existing part */
|
|
|
|
if (len != flash->sector_size) {
|
|
|
|
/* Rewrite the original data to the end of the sector */
|
|
|
|
if (spi_flash_write(flash, offset + len,
|
|
|
|
flash->sector_size - len, &cmp_buf[len]))
|
|
|
|
return "write";
|
|
|
|
}
|
|
|
|
|
2011-08-23 07:03:46 +08:00
|
|
|
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 */
|
2011-10-03 12:35:47 +08:00
|
|
|
size_t skipped = 0; /* statistics */
|
2012-09-28 22:28:00 +08:00
|
|
|
const ulong start_time = get_timer(0);
|
|
|
|
size_t scale = 1;
|
|
|
|
const char *start_buf = buf;
|
|
|
|
ulong delta;
|
2011-08-23 07:03:46 +08:00
|
|
|
|
2012-09-28 22:28:00 +08:00
|
|
|
if (end - buf >= 200)
|
|
|
|
scale = (end - buf) / 100;
|
2011-08-23 07:03:46 +08:00
|
|
|
cmp_buf = malloc(flash->sector_size);
|
|
|
|
if (cmp_buf) {
|
2012-09-28 22:28:00 +08:00
|
|
|
ulong last_update = get_timer(0);
|
|
|
|
|
2011-10-03 12:35:47 +08:00
|
|
|
for (; buf < end && !err_oper; buf += todo, offset += todo) {
|
2011-08-23 07:03:46 +08:00
|
|
|
todo = min(end - buf, flash->sector_size);
|
2012-09-28 22:28:00 +08:00
|
|
|
if (get_timer(last_update) > 100) {
|
|
|
|
printf(" \rUpdating, %zu%% %lu B/s",
|
2013-07-30 00:42:52 +08:00
|
|
|
100 - (end - buf) / scale,
|
2012-09-28 22:28:00 +08:00
|
|
|
bytes_per_second(buf - start_buf,
|
|
|
|
start_time));
|
|
|
|
last_update = get_timer(0);
|
|
|
|
}
|
2011-08-23 07:03:46 +08:00
|
|
|
err_oper = spi_flash_update_block(flash, offset, todo,
|
|
|
|
buf, cmp_buf, &skipped);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
err_oper = "malloc";
|
|
|
|
}
|
|
|
|
free(cmp_buf);
|
2012-09-28 22:28:00 +08:00
|
|
|
putc('\r');
|
2011-08-23 07:03:46 +08:00
|
|
|
if (err_oper) {
|
|
|
|
printf("SPI flash failed in %s step\n", err_oper);
|
|
|
|
return 1;
|
|
|
|
}
|
2012-09-28 22:28:00 +08:00
|
|
|
|
|
|
|
delta = get_timer(start_time);
|
|
|
|
printf("%zu bytes written, %zu bytes skipped", len - skipped,
|
2013-07-30 00:42:52 +08:00
|
|
|
skipped);
|
2012-09-28 22:28:00 +08:00
|
|
|
printf(" in %ld.%lds, speed %ld B/s\n",
|
2013-07-30 00:42:52 +08:00
|
|
|
delta / 1000, delta % 1000, bytes_per_second(len, start_time));
|
2011-10-03 12:35:47 +08:00
|
|
|
|
2011-08-23 07:03:46 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-06-29 04:00:46 +08:00
|
|
|
static int do_spi_flash_read_write(int argc, char * const argv[])
|
2008-05-16 17:10:34 +08:00
|
|
|
{
|
|
|
|
unsigned long addr;
|
|
|
|
unsigned long offset;
|
|
|
|
unsigned long len;
|
|
|
|
void *buf;
|
|
|
|
char *endp;
|
2013-05-26 17:22:52 +08:00
|
|
|
int ret = 1;
|
2008-05-16 17:10:34 +08:00
|
|
|
|
|
|
|
if (argc < 4)
|
2011-04-12 14:21:31 +08:00
|
|
|
return -1;
|
2008-05-16 17:10:34 +08:00
|
|
|
|
|
|
|
addr = simple_strtoul(argv[1], &endp, 16);
|
|
|
|
if (*argv[1] == 0 || *endp != 0)
|
2011-04-12 14:21:31 +08:00
|
|
|
return -1;
|
2008-05-16 17:10:34 +08:00
|
|
|
offset = simple_strtoul(argv[2], &endp, 16);
|
|
|
|
if (*argv[2] == 0 || *endp != 0)
|
2011-04-12 14:21:31 +08:00
|
|
|
return -1;
|
2008-05-16 17:10:34 +08:00
|
|
|
len = simple_strtoul(argv[3], &endp, 16);
|
|
|
|
if (*argv[3] == 0 || *endp != 0)
|
2011-04-12 14:21:31 +08:00
|
|
|
return -1;
|
2008-05-16 17:10:34 +08:00
|
|
|
|
2012-04-03 12:34:13 +08:00
|
|
|
/* Consistency checking */
|
|
|
|
if (offset + len > flash->size) {
|
|
|
|
printf("ERROR: attempting %s past flash size (%#x)\n",
|
2013-07-30 00:42:52 +08:00
|
|
|
argv[0], flash->size);
|
2012-04-03 12:34:13 +08:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2008-05-16 17:10:34 +08:00
|
|
|
buf = map_physmem(addr, len, MAP_WRBACK);
|
|
|
|
if (!buf) {
|
|
|
|
puts("Failed to map physical memory\n");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2013-07-30 00:42:52 +08:00
|
|
|
if (strcmp(argv[0], "update") == 0) {
|
2011-08-23 07:03:46 +08:00
|
|
|
ret = spi_flash_update(flash, offset, len, buf);
|
2013-07-30 00:42:52 +08:00
|
|
|
} else if (strncmp(argv[0], "read", 4) == 0 ||
|
2013-05-26 17:22:52 +08:00
|
|
|
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,
|
2013-07-30 00:42:52 +08:00
|
|
|
read ? "Read" : "Written", ret ? "ERROR" : "OK");
|
2013-05-26 17:22:52 +08:00
|
|
|
}
|
2008-05-16 17:10:34 +08:00
|
|
|
|
|
|
|
unmap_physmem(buf, len);
|
|
|
|
|
2013-05-26 17:22:52 +08:00
|
|
|
return ret == 0 ? 0 : 1;
|
2008-05-16 17:10:34 +08:00
|
|
|
}
|
|
|
|
|
2010-06-29 04:00:46 +08:00
|
|
|
static int do_spi_flash_erase(int argc, char * const argv[])
|
2008-05-16 17:10:34 +08:00
|
|
|
{
|
|
|
|
unsigned long offset;
|
|
|
|
unsigned long len;
|
|
|
|
char *endp;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (argc < 3)
|
2011-04-12 14:21:31 +08:00
|
|
|
return -1;
|
2008-05-16 17:10:34 +08:00
|
|
|
|
|
|
|
offset = simple_strtoul(argv[1], &endp, 16);
|
|
|
|
if (*argv[1] == 0 || *endp != 0)
|
2011-04-12 14:21:31 +08:00
|
|
|
return -1;
|
2011-02-17 05:39:44 +08:00
|
|
|
|
|
|
|
ret = sf_parse_len_arg(argv[2], &len);
|
|
|
|
if (ret != 1)
|
2011-04-12 14:21:31 +08:00
|
|
|
return -1;
|
2008-05-16 17:10:34 +08:00
|
|
|
|
2012-04-03 12:34:13 +08:00
|
|
|
/* Consistency checking */
|
|
|
|
if (offset + len > flash->size) {
|
|
|
|
printf("ERROR: attempting %s past flash size (%#x)\n",
|
2013-07-30 00:42:52 +08:00
|
|
|
argv[0], flash->size);
|
2012-04-03 12:34:13 +08:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2008-05-16 17:10:34 +08:00
|
|
|
ret = spi_flash_erase(flash, offset, len);
|
2013-05-26 04:05:21 +08:00
|
|
|
printf("SF: %zu bytes @ %#x Erased: %s\n", (size_t)len, (u32)offset,
|
2013-07-30 00:42:52 +08:00
|
|
|
ret ? "ERROR" : "OK");
|
2008-05-16 17:10:34 +08:00
|
|
|
|
2013-05-26 04:05:21 +08:00
|
|
|
return ret == 0 ? 0 : 1;
|
2008-05-16 17:10:34 +08:00
|
|
|
}
|
|
|
|
|
2012-10-08 21:16:02 +08:00
|
|
|
#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;
|
2013-11-11 01:26:51 +08:00
|
|
|
if (test->time_ms[stage])
|
|
|
|
do_div(speed, test->time_ms[stage] * 1024);
|
2012-10-08 21:16:02 +08:00
|
|
|
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
|
|
|
|
*/
|
2013-03-11 14:08:13 +08:00
|
|
|
static int spi_flash_test(struct spi_flash *flash, uint8_t *buf, ulong len,
|
|
|
|
ulong offset, uint8_t *vbuf)
|
2012-10-08 21:16:02 +08:00
|
|
|
{
|
|
|
|
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;
|
2013-11-11 01:26:51 +08:00
|
|
|
uint8_t *buf, *from;
|
2012-10-08 21:16:02 +08:00
|
|
|
char *endp;
|
2013-03-11 14:08:13 +08:00
|
|
|
uint8_t *vbuf;
|
2012-10-08 21:16:02 +08:00
|
|
|
int ret;
|
|
|
|
|
2013-11-11 01:26:51 +08:00
|
|
|
if (argc < 3)
|
|
|
|
return -1;
|
2012-10-08 21:16:02 +08:00
|
|
|
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) {
|
2013-11-11 01:26:51 +08:00
|
|
|
printf("Cannot allocate memory (%lu bytes)\n", len);
|
2012-10-08 21:16:02 +08:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
buf = malloc(len);
|
|
|
|
if (!buf) {
|
|
|
|
free(vbuf);
|
2013-11-11 01:26:51 +08:00
|
|
|
printf("Cannot allocate memory (%lu bytes)\n", len);
|
2012-10-08 21:16:02 +08:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2013-11-11 01:26:51 +08:00
|
|
|
from = map_sysmem(CONFIG_SYS_TEXT_BASE, 0);
|
|
|
|
memcpy(buf, from, len);
|
2012-10-08 21:16:02 +08:00
|
|
|
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 */
|
|
|
|
|
2013-07-30 00:42:52 +08:00
|
|
|
static int do_spi_flash(cmd_tbl_t *cmdtp, int flag, int argc,
|
|
|
|
char * const argv[])
|
2008-05-16 17:10:34 +08:00
|
|
|
{
|
|
|
|
const char *cmd;
|
2011-04-12 14:21:31 +08:00
|
|
|
int ret;
|
2008-05-16 17:10:34 +08:00
|
|
|
|
|
|
|
/* need at least two arguments */
|
|
|
|
if (argc < 2)
|
|
|
|
goto usage;
|
|
|
|
|
|
|
|
cmd = argv[1];
|
2011-04-12 14:21:31 +08:00
|
|
|
--argc;
|
|
|
|
++argv;
|
2008-05-16 17:10:34 +08:00
|
|
|
|
2011-04-12 14:21:31 +08:00
|
|
|
if (strcmp(cmd, "probe") == 0) {
|
|
|
|
ret = do_spi_flash_probe(argc, argv);
|
|
|
|
goto done;
|
|
|
|
}
|
2008-05-16 17:10:34 +08:00
|
|
|
|
|
|
|
/* The remaining commands require a selected device */
|
|
|
|
if (!flash) {
|
|
|
|
puts("No SPI flash selected. Please run `sf probe'\n");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2011-08-23 07:03:46 +08:00
|
|
|
if (strcmp(cmd, "read") == 0 || strcmp(cmd, "write") == 0 ||
|
|
|
|
strcmp(cmd, "update") == 0)
|
2011-04-12 14:21:31 +08:00
|
|
|
ret = do_spi_flash_read_write(argc, argv);
|
|
|
|
else if (strcmp(cmd, "erase") == 0)
|
|
|
|
ret = do_spi_flash_erase(argc, argv);
|
2012-10-08 21:16:02 +08:00
|
|
|
#ifdef CONFIG_CMD_SF_TEST
|
|
|
|
else if (!strcmp(cmd, "test"))
|
|
|
|
ret = do_spi_flash_test(argc, argv);
|
|
|
|
#endif
|
2011-04-12 14:21:31 +08:00
|
|
|
else
|
|
|
|
ret = -1;
|
|
|
|
|
|
|
|
done:
|
|
|
|
if (ret != -1)
|
|
|
|
return ret;
|
2008-05-16 17:10:34 +08:00
|
|
|
|
|
|
|
usage:
|
2011-12-10 16:44:01 +08:00
|
|
|
return CMD_RET_USAGE;
|
2008-05-16 17:10:34 +08:00
|
|
|
}
|
|
|
|
|
2012-10-08 21:16:02 +08:00
|
|
|
#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
|
|
|
|
|
2008-05-16 17:10:34 +08:00
|
|
|
U_BOOT_CMD(
|
|
|
|
sf, 5, 1, do_spi_flash,
|
2009-01-28 08:03:12 +08:00
|
|
|
"SPI flash sub-system",
|
2012-02-01 01:52:07 +08:00
|
|
|
"probe [[bus:]cs] [hz] [mode] - init flash device on given SPI bus\n"
|
2008-05-16 17:10:34 +08:00
|
|
|
" and chip select\n"
|
2013-07-30 00:42:52 +08:00
|
|
|
"sf read addr offset len - read `len' bytes starting at\n"
|
2008-05-16 17:10:34 +08:00
|
|
|
" `offset' to memory at `addr'\n"
|
|
|
|
"sf write addr offset len - write `len' bytes from memory\n"
|
|
|
|
" at `addr' to flash at `offset'\n"
|
2011-02-17 05:39:44 +08:00
|
|
|
"sf erase offset [+]len - erase `len' bytes from `offset'\n"
|
2011-08-23 07:03:46 +08:00
|
|
|
" `+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'"
|
2012-10-08 21:16:02 +08:00
|
|
|
SF_TEST_HELP
|
2009-05-24 23:06:54 +08:00
|
|
|
);
|