#endif
#include "nand.h"
-#include "time_support.h"
-#include "fileio.h"
+#include "common.h"
+#include <helper/time_support.h>
+#include <helper/fileio.h>
static int nand_read_page(struct nand_device *nand, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size);
//static int nand_read_plain(struct nand_device *nand, uint32_t address, uint8_t *data, uint32_t data_size);
static int nand_write_page(struct nand_device *nand, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size);
-/* NAND flash controller
- */
-extern struct nand_flash_controller davinci_nand_controller;
-extern struct nand_flash_controller lpc3180_nand_controller;
-extern struct nand_flash_controller orion_nand_controller;
-extern struct nand_flash_controller s3c2410_nand_controller;
-extern struct nand_flash_controller s3c2412_nand_controller;
-extern struct nand_flash_controller s3c2440_nand_controller;
-extern struct nand_flash_controller s3c2443_nand_controller;
-extern struct nand_flash_controller imx31_nand_flash_controller;
-
-/* extern struct nand_flash_controller boundary_scan_nand_controller; */
-
-static struct nand_flash_controller *nand_flash_controllers[] =
-{
- &davinci_nand_controller,
- &lpc3180_nand_controller,
- &orion_nand_controller,
- &s3c2410_nand_controller,
- &s3c2412_nand_controller,
- &s3c2440_nand_controller,
- &s3c2443_nand_controller,
- &imx31_nand_flash_controller,
-/* &boundary_scan_nand_controller, */
- NULL
-};
-
/* configured NAND devices and NAND Flash command handler */
static struct nand_device *nand_devices = NULL;
-static struct command *nand_cmd;
/* Chip ID list
*
.length = 38}}
};
-/* nand device <nand_controller> [controller options]
- */
-COMMAND_HANDLER(handle_nand_device_command)
+int nand_list_walker(struct nand_flash_controller *c, void *x)
{
- int i;
- int retval;
+ struct command_context *cmd_ctx = (struct command_context *)x;
+ command_print(cmd_ctx, " %s", c->name);
+ return ERROR_OK;
+}
+COMMAND_HANDLER(handle_nand_list_drivers)
+{
+ command_print(CMD_CTX, "Available NAND flash controller drivers:");
+ return nand_driver_walk(&nand_list_walker, CMD_CTX);
+}
- if (argc < 1)
+static COMMAND_HELPER(create_nand_device, const char *bank_name,
+ struct nand_flash_controller *controller)
+{
+ if (NULL != controller->commands)
{
- LOG_WARNING("incomplete flash device nand configuration");
- return ERROR_FLASH_BANK_INVALID;
+ int retval = register_commands(CMD_CTX, NULL,
+ controller->commands);
+ if (ERROR_OK != retval)
+ return retval;
}
+ struct nand_device *c = malloc(sizeof(struct nand_device));
- for (i = 0; nand_flash_controllers[i]; i++)
- {
- struct nand_device *p, *c;
-
- if (strcmp(args[0], nand_flash_controllers[i]->name) == 0)
- {
- /* register flash specific commands */
- if ((retval = nand_flash_controllers[i]->register_commands(cmd_ctx)) != ERROR_OK)
- {
- LOG_ERROR("couldn't register '%s' commands", args[0]);
- return retval;
- }
-
- c = malloc(sizeof(struct nand_device));
+ c->name = strdup(bank_name);
+ c->controller = controller;
+ c->controller_priv = NULL;
+ c->manufacturer = NULL;
+ c->device = NULL;
+ c->bus_width = 0;
+ c->address_cycles = 0;
+ c->page_size = 0;
+ c->use_raw = 0;
+ c->next = NULL;
- c->controller = nand_flash_controllers[i];
- c->controller_priv = NULL;
- c->manufacturer = NULL;
- c->device = NULL;
- c->bus_width = 0;
- c->address_cycles = 0;
- c->page_size = 0;
- c->use_raw = 0;
- c->next = NULL;
+ int retval = CALL_COMMAND_HANDLER(controller->nand_device_command, c);
+ if (ERROR_OK != retval)
+ {
+ LOG_ERROR("'%s' driver rejected nand flash", controller->name);
+ free(c);
+ return ERROR_OK;
+ }
- retval = CALL_COMMAND_HANDLER(nand_flash_controllers[i]->nand_device_command, c);
- if (ERROR_OK != retval)
- {
- LOG_ERROR("'%s' driver rejected nand flash", c->controller->name);
- free(c);
- return ERROR_OK;
- }
+ if (nand_devices) {
+ struct nand_device *p = nand_devices;
+ while (p && p->next) p = p->next;
+ p->next = c;
+ } else
+ nand_devices = c;
- /* put NAND device in linked list */
- if (nand_devices)
- {
- /* find last flash device */
- for (p = nand_devices; p && p->next; p = p->next);
- if (p)
- p->next = c;
- }
- else
- {
- nand_devices = c;
- }
+ return ERROR_OK;
+}
- return ERROR_OK;
- }
+COMMAND_HANDLER(handle_nand_device_command)
+{
+ if (CMD_ARGC < 1)
+ {
+ LOG_ERROR("incomplete nand device configuration");
+ return ERROR_FLASH_BANK_INVALID;
}
- /* no valid NAND controller was found (i.e. the configuration option,
- * didn't match one of the compiled-in controllers)
- */
- LOG_ERROR("No valid NAND flash controller found (%s)", args[0]);
- LOG_ERROR("compiled-in NAND flash controllers:");
- for (i = 0; nand_flash_controllers[i]; i++)
+ // save name and increment (for compatibility) with drivers
+ const char *bank_name = *CMD_ARGV++;
+ CMD_ARGC--;
+
+ const char *driver_name = CMD_ARGV[0];
+ struct nand_flash_controller *controller;
+ controller = nand_driver_find_by_name(CMD_ARGV[0]);
+ if (NULL == controller)
{
- LOG_ERROR("%i: %s", i, nand_flash_controllers[i]->name);
+ LOG_ERROR("No valid NAND flash driver found (%s)", driver_name);
+ return CALL_COMMAND_HANDLER(handle_nand_list_drivers);
}
-
- return ERROR_OK;
+ return CALL_COMMAND_HANDLER(create_nand_device, bank_name, controller);
}
+
+COMMAND_HANDLER(handle_nand_init_command);
+
+static const struct command_registration nand_config_command_handlers[] = {
+ {
+ .name = "device",
+ .handler = &handle_nand_device_command,
+ .mode = COMMAND_CONFIG,
+ .help = "defines a new NAND bank",
+ },
+ {
+ .name = "drivers",
+ .handler = &handle_nand_list_drivers,
+ .mode = COMMAND_ANY,
+ .help = "lists available NAND drivers",
+ },
+ {
+ .name = "init",
+ .mode = COMMAND_CONFIG,
+ .handler = &handle_nand_init_command,
+ .help = "initialize NAND devices",
+ },
+ COMMAND_REGISTRATION_DONE
+};
+static const struct command_registration nand_command_handlers[] = {
+ {
+ .name = "nand",
+ .mode = COMMAND_ANY,
+ .help = "NAND flash command group",
+ .chain = nand_config_command_handlers,
+ },
+ COMMAND_REGISTRATION_DONE
+};
+
int nand_register_commands(struct command_context *cmd_ctx)
{
- nand_cmd = register_command(cmd_ctx, NULL, "nand", NULL, COMMAND_ANY, "NAND specific commands");
+ return register_commands(cmd_ctx, NULL, nand_command_handlers);
+}
- register_command(cmd_ctx, nand_cmd, "device", handle_nand_device_command, COMMAND_CONFIG, NULL);
+struct nand_device *get_nand_device_by_name(const char *name)
+{
+ unsigned requested = get_flash_name_index(name);
+ unsigned found = 0;
- return ERROR_OK;
+ struct nand_device *nand;
+ for (nand = nand_devices; NULL != nand; nand = nand->next)
+ {
+ if (strcmp(nand->name, name) == 0)
+ return nand;
+ if (!flash_driver_name_matches(nand->controller->name, name))
+ continue;
+ if (++found < requested)
+ continue;
+ return nand;
+ }
+ return NULL;
}
struct nand_device *get_nand_device_by_num(int num)
return NULL;
}
-int nand_command_get_device_by_num(struct command_context *cmd_ctx,
- const char *str, struct nand_device **nand)
+COMMAND_HELPER(nand_command_get_device, unsigned name_index,
+ struct nand_device **nand)
{
+ const char *str = CMD_ARGV[name_index];
+ *nand = get_nand_device_by_name(str);
+ if (*nand)
+ return ERROR_OK;
+
unsigned num;
COMMAND_PARSE_NUMBER(uint, str, num);
*nand = get_nand_device_by_num(num);
if (!*nand) {
- command_print(cmd_ctx, "NAND flash device '#%s' is out of bounds", str);
+ command_print(CMD_CTX, "NAND flash device '%s' not found", str);
return ERROR_INVALID_ARGUMENTS;
}
return ERROR_OK;
return nand->controller->read_page(nand, page, data, data_size, oob, oob_size);
}
-int nand_read_page_raw(struct nand_device *nand, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size)
+int nand_page_command(struct nand_device *nand, uint32_t page,
+ uint8_t cmd, bool oob_only)
{
- uint32_t i;
-
if (!nand->device)
return ERROR_NAND_DEVICE_NOT_PROBED;
- if (nand->page_size <= 512)
- {
+ if (oob_only && NAND_CMD_READ0 == cmd && nand->page_size <= 512)
+ cmd = NAND_CMD_READOOB;
+
+ nand->controller->command(nand, cmd);
+
+ if (nand->page_size <= 512) {
/* small page device */
- if (data)
- nand->controller->command(nand, NAND_CMD_READ0);
- else
- nand->controller->command(nand, NAND_CMD_READOOB);
/* column (always 0, we start at the beginning of a page/OOB area) */
nand->controller->address(nand, 0x0);
/* 5th cycle only on devices with more than 8 GiB */
if (nand->address_cycles >= 5)
nand->controller->address(nand, (page >> 24) & 0xff);
- }
- else
- {
+ } else {
/* large page device */
- nand->controller->command(nand, NAND_CMD_READ0);
/* column (0 when we start at the beginning of a page,
* or 2048 for the beginning of OOB area)
*/
nand->controller->address(nand, 0x0);
- if (data)
- nand->controller->address(nand, 0x0);
- else
+ if (oob_only)
nand->controller->address(nand, 0x8);
+ else
+ nand->controller->address(nand, 0x0);
/* row */
nand->controller->address(nand, page & 0xff);
if (nand->address_cycles >= 5)
nand->controller->address(nand, (page >> 16) & 0xff);
- /* large page devices need a start command */
- nand->controller->command(nand, NAND_CMD_READSTART);
+ /* large page devices need a start command if reading */
+ if (NAND_CMD_READ0 == cmd)
+ nand->controller->command(nand, NAND_CMD_READSTART);
}
if (nand->controller->nand_ready) {
alive_sleep(1);
}
+ return ERROR_OK;
+}
+
+int nand_read_page_raw(struct nand_device *nand, uint32_t page,
+ uint8_t *data, uint32_t data_size,
+ uint8_t *oob, uint32_t oob_size)
+{
+ uint32_t i;
+ int retval;
+
+ retval = nand_page_command(nand, page, NAND_CMD_READ0, !data);
+ if (ERROR_OK != retval)
+ return retval;
+
if (data)
{
if (nand->controller->read_block_data != NULL)
int retval;
uint8_t status;
- if (!nand->device)
- return ERROR_NAND_DEVICE_NOT_PROBED;
-
- nand->controller->command(nand, NAND_CMD_SEQIN);
-
- if (nand->page_size <= 512)
- {
- /* column (always 0, we start at the beginning of a page/OOB area) */
- nand->controller->address(nand, 0x0);
-
- /* row */
- nand->controller->address(nand, page & 0xff);
- nand->controller->address(nand, (page >> 8) & 0xff);
-
- /* 4th cycle only on devices with more than 32 MiB */
- if (nand->address_cycles >= 4)
- nand->controller->address(nand, (page >> 16) & 0xff);
-
- /* 5th cycle only on devices with more than 8 GiB */
- if (nand->address_cycles >= 5)
- nand->controller->address(nand, (page >> 24) & 0xff);
- }
- else
- {
- /* column (0 when we start at the beginning of a page,
- * or 2048 for the beginning of OOB area)
- */
- nand->controller->address(nand, 0x0);
- if (data)
- nand->controller->address(nand, 0x0);
- else
- nand->controller->address(nand, 0x8);
-
- /* row */
- nand->controller->address(nand, page & 0xff);
- nand->controller->address(nand, (page >> 8) & 0xff);
-
- /* 5th cycle only on devices with more than 128 MiB */
- if (nand->address_cycles >= 5)
- nand->controller->address(nand, (page >> 16) & 0xff);
- }
+ retval = nand_page_command(nand, page, NAND_CMD_SEQIN, !data);
+ if (ERROR_OK != retval)
+ return retval;
if (data)
{
if (!nand_devices)
{
- command_print(cmd_ctx, "no NAND flash devices configured");
+ command_print(CMD_CTX, "no NAND flash devices configured");
return ERROR_OK;
}
for (p = nand_devices, i = 0; p; p = p->next, i++)
{
if (p->device)
- command_print(cmd_ctx, "#%i: %s (%s) "
+ command_print(CMD_CTX, "#%i: %s (%s) "
"pagesize: %i, buswidth: %i,\n\t"
"blocksize: %i, blocks: %i",
i, p->device->name, p->manufacturer->name,
p->page_size, p->bus_width,
p->erase_size, p->num_blocks);
else
- command_print(cmd_ctx, "#%i: not probed", i);
+ command_print(CMD_CTX, "#%i: not probed", i);
}
return ERROR_OK;
int first = -1;
int last = -1;
- struct nand_device *p;
- int retval = nand_command_get_device_by_num(cmd_ctx, args[0], &p);
- if (ERROR_OK != retval)
- return retval;
-
- switch (argc) {
+ switch (CMD_ARGC) {
default:
return ERROR_COMMAND_SYNTAX_ERROR;
case 1:
last = INT32_MAX;
break;
case 2:
- COMMAND_PARSE_NUMBER(int, args[1], i);
+ COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], i);
first = last = i;
i = 0;
break;
case 3:
- COMMAND_PARSE_NUMBER(int, args[1], first);
- COMMAND_PARSE_NUMBER(int, args[2], last);
+ COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], first);
+ COMMAND_PARSE_NUMBER(int, CMD_ARGV[2], last);
break;
}
+ struct nand_device *p;
+ int retval = CALL_COMMAND_HANDLER(nand_command_get_device, 0, &p);
+ if (ERROR_OK != retval)
+ return retval;
+
if (NULL == p->device)
{
- command_print(cmd_ctx, "#%s: not probed", args[0]);
+ command_print(CMD_CTX, "#%s: not probed", CMD_ARGV[0]);
return ERROR_OK;
}
if (last >= p->num_blocks)
last = p->num_blocks - 1;
- command_print(cmd_ctx, "#%i: %s (%s) pagesize: %i, buswidth: %i, erasesize: %i",
+ command_print(CMD_CTX, "#%i: %s (%s) pagesize: %i, buswidth: %i, erasesize: %i",
i++, p->device->name, p->manufacturer->name, p->page_size, p->bus_width, p->erase_size);
for (j = first; j <= last; j++)
else
bad_state = " (block condition unknown)";
- command_print(cmd_ctx,
+ command_print(CMD_CTX,
"\t#%i: 0x%8.8" PRIx32 " (%" PRId32 "kB) %s%s",
j,
p->blocks[j].offset,
COMMAND_HANDLER(handle_nand_probe_command)
{
- if (argc != 1)
+ if (CMD_ARGC != 1)
{
return ERROR_COMMAND_SYNTAX_ERROR;
}
struct nand_device *p;
- int retval = nand_command_get_device_by_num(cmd_ctx, args[0], &p);
+ int retval = CALL_COMMAND_HANDLER(nand_command_get_device, 0, &p);
if (ERROR_OK != retval)
return retval;
if ((retval = nand_probe(p)) == ERROR_OK)
{
- command_print(cmd_ctx, "NAND flash device '%s' found", p->device->name);
+ command_print(CMD_CTX, "NAND flash device '%s' found", p->device->name);
}
else if (retval == ERROR_NAND_OPERATION_FAILED)
{
- command_print(cmd_ctx, "probing failed for NAND flash device");
+ command_print(CMD_CTX, "probing failed for NAND flash device");
}
else
{
- command_print(cmd_ctx, "unknown error when probing NAND flash device");
+ command_print(CMD_CTX, "unknown error when probing NAND flash device");
}
return ERROR_OK;
COMMAND_HANDLER(handle_nand_erase_command)
{
- if (argc != 1 && argc != 3)
+ if (CMD_ARGC != 1 && CMD_ARGC != 3)
{
return ERROR_COMMAND_SYNTAX_ERROR;
}
struct nand_device *p;
- int retval = nand_command_get_device_by_num(cmd_ctx, args[0], &p);
+ int retval = CALL_COMMAND_HANDLER(nand_command_get_device, 0, &p);
if (ERROR_OK != retval)
return retval;
unsigned long length;
/* erase specified part of the chip; or else everything */
- if (argc == 3) {
+ if (CMD_ARGC == 3) {
unsigned long size = p->erase_size * p->num_blocks;
- COMMAND_PARSE_NUMBER(ulong, args[1], offset);
+ COMMAND_PARSE_NUMBER(ulong, CMD_ARGV[1], offset);
if ((offset % p->erase_size) != 0 || offset >= size)
return ERROR_INVALID_ARGUMENTS;
- COMMAND_PARSE_NUMBER(ulong, args[2], length);
+ COMMAND_PARSE_NUMBER(ulong, CMD_ARGV[2], length);
if ((length == 0) || (length % p->erase_size) != 0
|| (length + offset) > size)
return ERROR_INVALID_ARGUMENTS;
retval = nand_erase(p, offset, offset + length - 1);
if (retval == ERROR_OK)
{
- command_print(cmd_ctx, "erased blocks %lu to %lu "
+ command_print(CMD_CTX, "erased blocks %lu to %lu "
"on NAND flash device #%s '%s'",
offset, offset + length,
- args[0], p->device->name);
+ CMD_ARGV[0], p->device->name);
}
else if (retval == ERROR_NAND_OPERATION_FAILED)
{
- command_print(cmd_ctx, "erase failed");
+ command_print(CMD_CTX, "erase failed");
}
else
{
- command_print(cmd_ctx, "unknown error when erasing NAND flash device");
+ command_print(CMD_CTX, "unknown error when erasing NAND flash device");
}
return ERROR_OK;
int first = -1;
int last = -1;
- if ((argc < 1) || (argc > 3) || (argc == 2))
+ if ((CMD_ARGC < 1) || (CMD_ARGC > 3) || (CMD_ARGC == 2))
{
return ERROR_COMMAND_SYNTAX_ERROR;
}
struct nand_device *p;
- int retval = nand_command_get_device_by_num(cmd_ctx, args[0], &p);
+ int retval = CALL_COMMAND_HANDLER(nand_command_get_device, 0, &p);
if (ERROR_OK != retval)
return retval;
- if (argc == 3)
+ if (CMD_ARGC == 3)
{
unsigned long offset;
unsigned long length;
- COMMAND_PARSE_NUMBER(ulong, args[1], offset);
+ COMMAND_PARSE_NUMBER(ulong, CMD_ARGV[1], offset);
if (offset % p->erase_size)
return ERROR_INVALID_ARGUMENTS;
offset /= p->erase_size;
- COMMAND_PARSE_NUMBER(ulong, args[2], length);
+ COMMAND_PARSE_NUMBER(ulong, CMD_ARGV[2], length);
if (length % p->erase_size)
return ERROR_INVALID_ARGUMENTS;
retval = nand_build_bbt(p, first, last);
if (retval == ERROR_OK)
{
- command_print(cmd_ctx, "checked NAND flash device for bad blocks, "
+ command_print(CMD_CTX, "checked NAND flash device for bad blocks, "
"use \"nand info\" command to list blocks");
}
else if (retval == ERROR_NAND_OPERATION_FAILED)
{
- command_print(cmd_ctx, "error when checking for bad blocks on "
+ command_print(CMD_CTX, "error when checking for bad blocks on "
"NAND flash device");
}
else
{
- command_print(cmd_ctx, "unknown error when checking for bad "
+ command_print(CMD_CTX, "unknown error when checking for bad "
"blocks on NAND flash device");
}
}
return ERROR_OK;
}
-int nand_fileio_finish(struct nand_fileio_state *state)
+static int nand_fileio_finish(struct nand_fileio_state *state)
{
nand_fileio_cleanup(state);
return duration_measure(&state->bench);
}
-COMMAND_HELPER(nand_fileio_parse_args, struct nand_fileio_state *state,
+static COMMAND_HELPER(nand_fileio_parse_args, struct nand_fileio_state *state,
struct nand_device **dev, enum fileio_access filemode,
bool need_size, bool sw_ecc)
{
nand_fileio_init(state);
unsigned minargs = need_size ? 4 : 3;
- if (argc < minargs)
+ if (CMD_ARGC < minargs)
return ERROR_COMMAND_SYNTAX_ERROR;
struct nand_device *nand;
- int retval = nand_command_get_device_by_num(cmd_ctx, args[0], &nand);
+ int retval = CALL_COMMAND_HANDLER(nand_command_get_device, 0, &nand);
if (ERROR_OK != retval)
return retval;
if (NULL == nand->device)
{
- command_print(cmd_ctx, "#%s: not probed", args[0]);
+ command_print(CMD_CTX, "#%s: not probed", CMD_ARGV[0]);
return ERROR_OK;
}
- COMMAND_PARSE_NUMBER(u32, args[2], state->address);
+ COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], state->address);
if (need_size)
{
- COMMAND_PARSE_NUMBER(u32, args[2], state->size);
+ COMMAND_PARSE_NUMBER(u32, CMD_ARGV[3], state->size);
if (state->size % nand->page_size)
{
- command_print(cmd_ctx, "only page-aligned sizes are supported");
+ command_print(CMD_CTX, "only page-aligned sizes are supported");
return ERROR_COMMAND_SYNTAX_ERROR;
}
}
- if (argc > minargs)
+ if (CMD_ARGC > minargs)
{
- for (unsigned i = minargs; i < argc; i++)
+ for (unsigned i = minargs; i < CMD_ARGC; i++)
{
- if (!strcmp(args[i], "oob_raw"))
+ if (!strcmp(CMD_ARGV[i], "oob_raw"))
state->oob_format |= NAND_OOB_RAW;
- else if (!strcmp(args[i], "oob_only"))
+ else if (!strcmp(CMD_ARGV[i], "oob_only"))
state->oob_format |= NAND_OOB_RAW | NAND_OOB_ONLY;
- else if (sw_ecc && !strcmp(args[i], "oob_softecc"))
+ else if (sw_ecc && !strcmp(CMD_ARGV[i], "oob_softecc"))
state->oob_format |= NAND_OOB_SW_ECC;
- else if (sw_ecc && !strcmp(args[i], "oob_softecc_kw"))
+ else if (sw_ecc && !strcmp(CMD_ARGV[i], "oob_softecc_kw"))
state->oob_format |= NAND_OOB_SW_ECC_KW;
else
{
- command_print(cmd_ctx, "unknown option: %s", args[i]);
+ command_print(CMD_CTX, "unknown option: %s", CMD_ARGV[i]);
return ERROR_COMMAND_SYNTAX_ERROR;
}
}
}
- retval = nand_fileio_start(cmd_ctx, nand, args[1], filemode, state);
+ retval = nand_fileio_start(CMD_CTX, nand, CMD_ARGV[1], filemode, state);
if (ERROR_OK != retval)
return retval;
* @returns If no error occurred, returns number of bytes consumed;
* otherwise, returns a negative error code.)
*/
-int nand_fileio_read(struct nand_device *nand,
+static int nand_fileio_read(struct nand_device *nand,
struct nand_fileio_state *s)
{
- uint32_t total_read = 0;
- uint32_t one_read;
+ size_t total_read = 0;
+ size_t one_read;
if (NULL != s->page)
{
COMMAND_HANDLER(handle_nand_write_command)
{
- uint32_t offset;
- uint32_t binary_size;
- uint32_t buf_cnt;
- enum oob_formats oob_format = NAND_OOB_NONE;
-
- struct fileio fileio;
-
-
- if (argc < 3)
- {
- return ERROR_COMMAND_SYNTAX_ERROR;
- }
-
- struct nand_device *p;
- int retval = nand_command_get_device_by_num(cmd_ctx, args[0], &p);
+ struct nand_device *nand = NULL;
+ struct nand_fileio_state s;
+ int retval = CALL_COMMAND_HANDLER(nand_fileio_parse_args,
+ &s, &nand, FILEIO_READ, false, true);
if (ERROR_OK != retval)
return retval;
- uint8_t *page = NULL;
- uint32_t page_size = 0;
- uint8_t *oob = NULL;
- uint32_t oob_size = 0;
- const int *eccpos = NULL;
-
- COMMAND_PARSE_NUMBER(u32, args[2], offset);
-
- if (argc > 3)
+ uint32_t total_bytes = s.size;
+ while (s.size > 0)
{
- for (unsigned i = 3; i < argc; i++)
+ int bytes_read = nand_fileio_read(nand, &s);
+ if (bytes_read <= 0)
{
- if (!strcmp(args[i], "oob_raw"))
- oob_format |= NAND_OOB_RAW;
- else if (!strcmp(args[i], "oob_only"))
- oob_format |= NAND_OOB_RAW | NAND_OOB_ONLY;
- else if (!strcmp(args[i], "oob_softecc"))
- oob_format |= NAND_OOB_SW_ECC;
- else if (!strcmp(args[i], "oob_softecc_kw"))
- oob_format |= NAND_OOB_SW_ECC_KW;
- else
- {
- command_print(cmd_ctx, "unknown option: %s", args[i]);
- return ERROR_COMMAND_SYNTAX_ERROR;
- }
+ command_print(CMD_CTX, "error while reading file");
+ return nand_fileio_cleanup(&s);
}
- }
+ s.size -= bytes_read;
- struct duration bench;
- duration_start(&bench);
-
- if (fileio_open(&fileio, args[1], FILEIO_READ, FILEIO_BINARY) != ERROR_OK)
- {
- return ERROR_OK;
+ retval = nand_write_page(nand, s.address / nand->page_size,
+ s.page, s.page_size, s.oob, s.oob_size);
+ if (ERROR_OK != retval)
+ {
+ command_print(CMD_CTX, "failed writing file %s "
+ "to NAND flash %s at offset 0x%8.8" PRIx32,
+ CMD_ARGV[1], CMD_ARGV[0], s.address);
+ return nand_fileio_cleanup(&s);
+ }
+ s.address += s.page_size;
}
- buf_cnt = binary_size = fileio.size;
-
- if (!(oob_format & NAND_OOB_ONLY))
+ if (nand_fileio_finish(&s))
{
- page_size = p->page_size;
- page = malloc(p->page_size);
+ command_print(CMD_CTX, "wrote file %s to NAND flash %s up to "
+ "offset 0x%8.8" PRIx32 " in %fs (%0.3f kb/s)",
+ CMD_ARGV[1], CMD_ARGV[0], s.address, duration_elapsed(&s.bench),
+ duration_kbps(&s.bench, total_bytes));
}
+ return ERROR_OK;
+}
- if (oob_format & (NAND_OOB_RAW | NAND_OOB_SW_ECC | NAND_OOB_SW_ECC_KW))
- {
- if (p->page_size == 512) {
- oob_size = 16;
- eccpos = nand_oob_16.eccpos;
- } else if (p->page_size == 2048) {
- oob_size = 64;
- eccpos = nand_oob_64.eccpos;
- }
- oob = malloc(oob_size);
- }
+COMMAND_HANDLER(handle_nand_verify_command)
+{
+ struct nand_device *nand = NULL;
+ struct nand_fileio_state file;
+ int retval = CALL_COMMAND_HANDLER(nand_fileio_parse_args,
+ &file, &nand, FILEIO_READ, false, true);
+ if (ERROR_OK != retval)
+ return retval;
- if (offset % p->page_size)
- {
- command_print(cmd_ctx, "only page size aligned offsets and sizes are supported");
- fileio_close(&fileio);
- free(oob);
- free(page);
- return ERROR_OK;
- }
+ struct nand_fileio_state dev;
+ nand_fileio_init(&dev);
+ dev.address = file.address;
+ dev.size = file.size;
+ dev.oob_format = file.oob_format;
+ retval = nand_fileio_start(CMD_CTX, nand, NULL, FILEIO_NONE, &dev);
+ if (ERROR_OK != retval)
+ return retval;
- while (buf_cnt > 0)
+ while (file.size > 0)
{
- uint32_t size_read;
-
- if (NULL != page)
+ int retval = nand_read_page(nand, dev.address / dev.page_size,
+ dev.page, dev.page_size, dev.oob, dev.oob_size);
+ if (ERROR_OK != retval)
{
- fileio_read(&fileio, page_size, page, &size_read);
- buf_cnt -= size_read;
- if (size_read < page_size)
- {
- memset(page + size_read, 0xff, page_size - size_read);
- }
+ command_print(CMD_CTX, "reading NAND flash page failed");
+ nand_fileio_cleanup(&dev);
+ return nand_fileio_cleanup(&file);
}
- if (oob_format & NAND_OOB_SW_ECC)
- {
- uint32_t i, j;
- uint8_t ecc[3];
- memset(oob, 0xff, oob_size);
- for (i = 0, j = 0; i < page_size; i += 256) {
- nand_calculate_ecc(p, page + i, ecc);
- oob[eccpos[j++]] = ecc[0];
- oob[eccpos[j++]] = ecc[1];
- oob[eccpos[j++]] = ecc[2];
- }
- } else if (oob_format & NAND_OOB_SW_ECC_KW)
+ int bytes_read = nand_fileio_read(nand, &file);
+ if (bytes_read <= 0)
{
- /*
- * In this case eccpos is not used as
- * the ECC data is always stored contigously
- * at the end of the OOB area. It consists
- * of 10 bytes per 512-byte data block.
- */
- uint32_t i;
- uint8_t *ecc = oob + oob_size - page_size/512 * 10;
- memset(oob, 0xff, oob_size);
- for (i = 0; i < page_size; i += 512) {
- nand_calculate_ecc_kw(p, page + i, ecc);
- ecc += 10;
- }
- }
- else if (NULL != oob)
- {
- fileio_read(&fileio, oob_size, oob, &size_read);
- buf_cnt -= size_read;
- if (size_read < oob_size)
- {
- memset(oob + size_read, 0xff, oob_size - size_read);
- }
+ command_print(CMD_CTX, "error while reading file");
+ nand_fileio_cleanup(&dev);
+ return nand_fileio_cleanup(&file);
}
- if (nand_write_page(p, offset / p->page_size, page, page_size, oob, oob_size) != ERROR_OK)
+ if ((dev.page && memcmp(dev.page, file.page, dev.page_size)) ||
+ (dev.oob && memcmp(dev.oob, file.oob, dev.oob_size)) )
{
- command_print(cmd_ctx, "failed writing file %s to NAND flash %s at offset 0x%8.8" PRIx32 "",
- args[1], args[0], offset);
-
- fileio_close(&fileio);
- free(oob);
- free(page);
-
- return ERROR_OK;
+ command_print(CMD_CTX, "NAND flash contents differ "
+ "at 0x%8.8" PRIx32, dev.address);
+ nand_fileio_cleanup(&dev);
+ return nand_fileio_cleanup(&file);
}
- offset += page_size;
+
+ file.size -= bytes_read;
+ dev.address += nand->page_size;
}
- fileio_close(&fileio);
- free(oob);
- free(page);
- oob = NULL;
- page = NULL;
- if (duration_measure(&bench) == ERROR_OK)
+ if (nand_fileio_finish(&file) == ERROR_OK)
{
- command_print(cmd_ctx, "wrote file %s to NAND flash %s "
- "up to offset 0x%8.8" PRIx32 " in %fs (%0.3f kb/s)",
- args[1], args[0], offset, duration_elapsed(&bench),
- duration_kbps(&bench, fileio.size));
+ command_print(CMD_CTX, "verified file %s in NAND flash %s "
+ "up to offset 0x%8.8" PRIx32 " in %fs (%0.3f kb/s)",
+ CMD_ARGV[1], CMD_ARGV[0], dev.address, duration_elapsed(&file.bench),
+ duration_kbps(&file.bench, dev.size));
}
- return ERROR_OK;
+ return nand_fileio_cleanup(&dev);
}
COMMAND_HANDLER(handle_nand_dump_command)
{
- if (argc < 4)
- {
- return ERROR_COMMAND_SYNTAX_ERROR;
- }
-
- struct nand_device *p;
- int retval = nand_command_get_device_by_num(cmd_ctx, args[0], &p);
+ struct nand_device *nand = NULL;
+ struct nand_fileio_state s;
+ int retval = CALL_COMMAND_HANDLER(nand_fileio_parse_args,
+ &s, &nand, FILEIO_WRITE, true, false);
if (ERROR_OK != retval)
return retval;
- if (NULL == p->device)
- {
- command_print(cmd_ctx, "#%s: not probed", args[0]);
- return ERROR_OK;
- }
-
- struct fileio fileio;
-
- uint8_t *page = NULL;
- uint32_t page_size = 0;
- uint8_t *oob = NULL;
- uint32_t oob_size = 0;
- uint32_t address;
- COMMAND_PARSE_NUMBER(u32, args[2], address);
- uint32_t size;
- COMMAND_PARSE_NUMBER(u32, args[3], size);
- uint32_t bytes_done = 0;
- enum oob_formats oob_format = NAND_OOB_NONE;
-
- if (argc > 4)
- {
- for (unsigned i = 4; i < argc; i++)
- {
- if (!strcmp(args[i], "oob_raw"))
- oob_format |= NAND_OOB_RAW;
- else if (!strcmp(args[i], "oob_only"))
- oob_format |= NAND_OOB_RAW | NAND_OOB_ONLY;
- else
- command_print(cmd_ctx, "unknown option: '%s'", args[i]);
- }
- }
-
- if ((address % p->page_size) || (size % p->page_size))
- {
- command_print(cmd_ctx, "only page size aligned addresses and sizes are supported");
- return ERROR_OK;
- }
-
- if (!(oob_format & NAND_OOB_ONLY))
- {
- page_size = p->page_size;
- page = malloc(p->page_size);
- }
-
- if (oob_format & NAND_OOB_RAW)
+ while (s.size > 0)
{
- if (p->page_size == 512)
- oob_size = 16;
- else if (p->page_size == 2048)
- oob_size = 64;
- oob = malloc(oob_size);
- }
-
- if (fileio_open(&fileio, args[1], FILEIO_WRITE, FILEIO_BINARY) != ERROR_OK)
- {
- return ERROR_OK;
- }
-
- struct duration bench;
- duration_start(&bench);
-
- while (size > 0)
- {
- uint32_t size_written;
- if ((retval = nand_read_page(p, address / p->page_size, page, page_size, oob, oob_size)) != ERROR_OK)
+ size_t size_written;
+ int retval = nand_read_page(nand, s.address / nand->page_size,
+ s.page, s.page_size, s.oob, s.oob_size);
+ if (ERROR_OK != retval)
{
- command_print(cmd_ctx, "reading NAND flash page failed");
- free(page);
- free(oob);
- fileio_close(&fileio);
- return ERROR_OK;
+ command_print(CMD_CTX, "reading NAND flash page failed");
+ return nand_fileio_cleanup(&s);
}
- if (NULL != page)
- {
- fileio_write(&fileio, page_size, page, &size_written);
- bytes_done += page_size;
- }
+ if (NULL != s.page)
+ fileio_write(&s.fileio, s.page_size, s.page, &size_written);
- if (NULL != oob)
- {
- fileio_write(&fileio, oob_size, oob, &size_written);
- bytes_done += oob_size;
- }
+ if (NULL != s.oob)
+ fileio_write(&s.fileio, s.oob_size, s.oob, &size_written);
- size -= p->page_size;
- address += p->page_size;
+ s.size -= nand->page_size;
+ s.address += nand->page_size;
}
- free(page);
- page = NULL;
- free(oob);
- oob = NULL;
- fileio_close(&fileio);
-
- if (duration_measure(&bench) == ERROR_OK)
+ if (nand_fileio_finish(&s) == ERROR_OK)
{
- command_print(cmd_ctx, "dumped %lld byte in %fs (%0.3f kb/s)",
- fileio.size, duration_elapsed(&bench),
- duration_kbps(&bench, fileio.size));
+ command_print(CMD_CTX, "dumped %zu bytes in %fs (%0.3f kb/s)",
+ s.fileio.size, duration_elapsed(&s.bench),
+ duration_kbps(&s.bench, s.fileio.size));
}
-
return ERROR_OK;
}
COMMAND_HANDLER(handle_nand_raw_access_command)
{
- if ((argc < 1) || (argc > 2))
+ if ((CMD_ARGC < 1) || (CMD_ARGC > 2))
{
return ERROR_COMMAND_SYNTAX_ERROR;
}
struct nand_device *p;
- int retval = nand_command_get_device_by_num(cmd_ctx, args[0], &p);
+ int retval = CALL_COMMAND_HANDLER(nand_command_get_device, 0, &p);
if (ERROR_OK != retval)
return retval;
if (NULL == p->device)
{
- command_print(cmd_ctx, "#%s: not probed", args[0]);
+ command_print(CMD_CTX, "#%s: not probed", CMD_ARGV[0]);
return ERROR_OK;
}
- if (argc == 2)
- {
- if (strcmp("enable", args[1]) == 0)
- p->use_raw = 1;
- else if (strcmp("disable", args[1]) == 0)
- p->use_raw = 0;
- else
- return ERROR_COMMAND_SYNTAX_ERROR;
- }
+ if (CMD_ARGC == 2)
+ COMMAND_PARSE_ENABLE(CMD_ARGV[1], p->use_raw);
const char *msg = p->use_raw ? "enabled" : "disabled";
- command_print(cmd_ctx, "raw access is %s", msg);
+ command_print(CMD_CTX, "raw access is %s", msg);
return ERROR_OK;
}
+static const struct command_registration nand_exec_command_handlers[] = {
+ {
+ .name = "list",
+ .handler = &handle_nand_list_command,
+ .mode = COMMAND_EXEC,
+ .help = "list configured NAND flash devices",
+ },
+ {
+ .name = "info",
+ .handler = &handle_nand_info_command,
+ .mode = COMMAND_EXEC,
+ .usage = "<bank>",
+ .help = "print info about a NAND flash device",
+ },
+ {
+ .name = "probe",
+ .handler = &handle_nand_probe_command,
+ .mode = COMMAND_EXEC,
+ .usage = "<bank>",
+ .help = "identify NAND flash device <num>",
+
+ },
+ {
+ .name = "check_bad_blocks",
+ .handler = &handle_nand_check_bad_blocks_command,
+ .mode = COMMAND_EXEC,
+ .usage = "<bank> [<offset> <length>]",
+ .help = "check NAND flash device <num> for bad blocks",
+ },
+ {
+ .name = "erase",
+ .handler = &handle_nand_erase_command,
+ .mode = COMMAND_EXEC,
+ .usage = "<bank> [<offset> <length>]",
+ .help = "erase blocks on NAND flash device",
+ },
+ {
+ .name = "dump",
+ .handler = &handle_nand_dump_command,
+ .mode = COMMAND_EXEC,
+ .usage = "<bank> <filename> <offset> <length> "
+ "[oob_raw | oob_only]",
+ .help = "dump from NAND flash device",
+ },
+ {
+ .name = "verify",
+ .handler = &handle_nand_verify_command,
+ .mode = COMMAND_EXEC,
+ .usage = "<bank> <filename> <offset> "
+ "[oob_raw | oob_only | oob_softecc | oob_softecc_kw]",
+ .help = "verify NAND flash device",
+ },
+ {
+ .name = "write",
+ .handler = &handle_nand_write_command,
+ .mode = COMMAND_EXEC,
+ .usage = "<bank> <filename> <offset> "
+ "[oob_raw | oob_only | oob_softecc | oob_softecc_kw]",
+ .help = "write to NAND flash device",
+ },
+ {
+ .name = "raw_access",
+ .handler = &handle_nand_raw_access_command,
+ .mode = COMMAND_EXEC,
+ .usage = "<num> ['enable'|'disable']",
+ .help = "raw access to NAND flash device",
+ },
+ COMMAND_REGISTRATION_DONE
+};
+
int nand_init(struct command_context *cmd_ctx)
{
if (!nand_devices)
return ERROR_OK;
+ struct command *parent = command_find_in_context(cmd_ctx, "nand");
+ return register_commands(cmd_ctx, parent, nand_exec_command_handlers);
+}
- register_command(cmd_ctx, nand_cmd, "list",
- handle_nand_list_command, COMMAND_EXEC,
- "list configured NAND flash devices");
- register_command(cmd_ctx, nand_cmd, "info",
- handle_nand_info_command, COMMAND_EXEC,
- "print info about NAND flash device <num>");
- register_command(cmd_ctx, nand_cmd, "probe",
- handle_nand_probe_command, COMMAND_EXEC,
- "identify NAND flash device <num>");
-
- register_command(cmd_ctx, nand_cmd, "check_bad_blocks",
- handle_nand_check_bad_blocks_command, COMMAND_EXEC,
- "check NAND flash device <num> for bad blocks [<offset> <length>]");
- register_command(cmd_ctx, nand_cmd, "erase",
- handle_nand_erase_command, COMMAND_EXEC,
- "erase blocks on NAND flash device <num> [<offset> <length>]");
- register_command(cmd_ctx, nand_cmd, "dump",
- handle_nand_dump_command, COMMAND_EXEC,
- "dump from NAND flash device <num> <filename> "
- "<offset> <length> [oob_raw | oob_only]");
- register_command(cmd_ctx, nand_cmd, "write",
- handle_nand_write_command, COMMAND_EXEC,
- "write to NAND flash device <num> <filename> <offset> "
- "[oob_raw | oob_only | oob_softecc | oob_softecc_kw]");
-
- register_command(cmd_ctx, nand_cmd, "raw_access",
- handle_nand_raw_access_command, COMMAND_EXEC,
- "raw access to NAND flash device <num> ['enable'|'disable']");
+COMMAND_HANDLER(handle_nand_init_command)
+{
+ if (CMD_ARGC != 0)
+ return ERROR_COMMAND_SYNTAX_ERROR;
- return ERROR_OK;
+ static bool nand_initialized = false;
+ if (nand_initialized)
+ {
+ LOG_INFO("'nand init' has already been called");
+ return ERROR_OK;
+ }
+ nand_initialized = true;
+
+ LOG_DEBUG("Initializing NAND devices...");
+ return nand_init(CMD_CTX);
}
Code Review / openocd.git / blobdiff