X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnand.c;h=5920ae33d5243101e62bf197eff9e1c3ef2da2a2;hp=6ca008c7f0cf94fdc533262edf8264a63ab769ff;hb=dc575dc5bf8cb597a0e9a47794744ae6b1928087;hpb=570631454df083f2af26e453939424a14a9684f1 diff --git a/src/flash/nand.c b/src/flash/nand.c index 6ca008c7f0..5920ae33d5 100644 --- a/src/flash/nand.c +++ b/src/flash/nand.c @@ -28,27 +28,24 @@ #include "time_support.h" #include "fileio.h" -#include - - static int handle_nand_list_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); static int handle_nand_probe_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); static int handle_nand_check_bad_blocks_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); static int handle_nand_info_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -static int handle_nand_copy_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); static int handle_nand_dump_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); static int handle_nand_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); static int handle_nand_raw_access_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -static int nand_read_page(struct nand_device_s *device, u32 page, u8 *data, u32 data_size, u8 *oob, u32 oob_size); -//static int nand_read_plain(struct nand_device_s *device, u32 address, u8 *data, u32 data_size); +static int nand_read_page(struct nand_device_s *device, 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_s *device, uint32_t address, uint8_t *data, uint32_t data_size); -static int nand_write_page(struct nand_device_s *device, u32 page, u8 *data, u32 data_size, u8 *oob, u32 oob_size); +static int nand_write_page(struct nand_device_s *device, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size); /* NAND flash controller */ +extern nand_flash_controller_t davinci_nand_controller; extern nand_flash_controller_t lpc3180_nand_controller; extern nand_flash_controller_t orion_nand_controller; extern nand_flash_controller_t s3c2410_nand_controller; @@ -60,6 +57,7 @@ extern nand_flash_controller_t s3c2443_nand_controller; static nand_flash_controller_t *nand_flash_controllers[] = { + &davinci_nand_controller, &lpc3180_nand_controller, &orion_nand_controller, &s3c2410_nand_controller, @@ -308,15 +306,14 @@ int nand_init(struct command_context_s *cmd_ctx) register_command(cmd_ctx, nand_cmd, "probe", handle_nand_probe_command, COMMAND_EXEC, "identify NAND flash device "); register_command(cmd_ctx, nand_cmd, "check_bad_blocks", handle_nand_check_bad_blocks_command, COMMAND_EXEC, - "check NAND flash device for bad blocks [ ]"); + "check NAND flash device for bad blocks [ ]"); register_command(cmd_ctx, nand_cmd, "erase", handle_nand_erase_command, COMMAND_EXEC, - "erase blocks on NAND flash device "); - register_command(cmd_ctx, nand_cmd, "copy", handle_nand_copy_command, COMMAND_EXEC, - "copy from NAND flash device "); + "erase blocks on NAND flash device "); register_command(cmd_ctx, nand_cmd, "dump", handle_nand_dump_command, COMMAND_EXEC, - "dump from NAND flash device [options]"); + "dump from NAND flash device " + " [oob_raw | oob_only]"); register_command(cmd_ctx, nand_cmd, "write", handle_nand_write_command, COMMAND_EXEC, - "write to NAND flash device [oob_raw|oob_only|oob_softecc]"); + "write to NAND flash device [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 ['enable'|'disable']"); } @@ -342,9 +339,9 @@ nand_device_t *get_nand_device_by_num(int num) static int nand_build_bbt(struct nand_device_s *device, int first, int last) { - u32 page = 0x0; + uint32_t page = 0x0; int i; - u8 oob[6]; + uint8_t oob[6]; if ((first < 0) || (first >= device->num_blocks)) first = 0; @@ -360,7 +357,7 @@ static int nand_build_bbt(struct nand_device_s *device, int first, int last) || (((device->page_size == 512) && (oob[5] != 0xff)) || ((device->page_size == 2048) && (oob[0] != 0xff)))) { - LOG_WARNING("invalid block: %i", i); + LOG_WARNING("bad block: %i", i); device->blocks[i].is_bad = 1; } else @@ -374,7 +371,7 @@ static int nand_build_bbt(struct nand_device_s *device, int first, int last) return ERROR_OK; } -int nand_read_status(struct nand_device_s *device, u8 *status) +int nand_read_status(struct nand_device_s *device, uint8_t *status) { if (!device->device) return ERROR_NAND_DEVICE_NOT_PROBED; @@ -387,7 +384,7 @@ int nand_read_status(struct nand_device_s *device, u8 *status) /* read status */ if (device->device->options & NAND_BUSWIDTH_16) { - u16 data; + uint16_t data; device->controller->read_data(device, &data); *status = data & 0xff; } @@ -401,12 +398,12 @@ int nand_read_status(struct nand_device_s *device, u8 *status) static int nand_poll_ready(struct nand_device_s *device, int timeout) { - u8 status; + uint8_t status; device->controller->command(device, NAND_CMD_STATUS); do { if (device->device->options & NAND_BUSWIDTH_16) { - u16 data; + uint16_t data; device->controller->read_data(device, &data); status = data & 0xff; } else { @@ -422,8 +419,8 @@ static int nand_poll_ready(struct nand_device_s *device, int timeout) int nand_probe(struct nand_device_s *device) { - u8 manufacturer_id, device_id; - u8 id_buff[6]; + uint8_t manufacturer_id, device_id; + uint8_t id_buff[6]; int retval; int i; @@ -467,7 +464,7 @@ int nand_probe(struct nand_device_s *device) } else { - u16 data_buf; + uint16_t data_buf; device->controller->read_data(device, &data_buf); manufacturer_id = data_buf & 0xff; device->controller->read_data(device, &data_buf); @@ -521,13 +518,13 @@ int nand_probe(struct nand_device_s *device) { if (device->bus_width == 8) { - device->controller->read_data(device, id_buff+3); - device->controller->read_data(device, id_buff+4); - device->controller->read_data(device, id_buff+5); + device->controller->read_data(device, id_buff + 3); + device->controller->read_data(device, id_buff + 4); + device->controller->read_data(device, id_buff + 5); } else { - u16 data_buf; + uint16_t data_buf; device->controller->read_data(device, &data_buf); id_buff[3] = data_buf; @@ -641,8 +638,8 @@ int nand_probe(struct nand_device_s *device) int nand_erase(struct nand_device_s *device, int first_block, int last_block) { int i; - u32 page; - u8 status; + uint32_t page; + uint8_t status; int retval; if (!device->device) @@ -724,9 +721,9 @@ int nand_erase(struct nand_device_s *device, int first_block, int last_block) } #if 0 -static int nand_read_plain(struct nand_device_s *device, u32 address, u8 *data, u32 data_size) +static int nand_read_plain(struct nand_device_s *device, uint32_t address, uint8_t *data, uint32_t data_size) { - u8 *page; + uint8_t *page; if (!device->device) return ERROR_NAND_DEVICE_NOT_PROBED; @@ -739,10 +736,10 @@ static int nand_read_plain(struct nand_device_s *device, u32 address, u8 *data, page = malloc(device->page_size); - while (data_size > 0 ) + while (data_size > 0) { - u32 thisrun_size = (data_size > device->page_size) ? device->page_size : data_size; - u32 page_address; + uint32_t thisrun_size = (data_size > device->page_size) ? device->page_size : data_size; + uint32_t page_address; page_address = address / device->page_size; @@ -761,9 +758,9 @@ static int nand_read_plain(struct nand_device_s *device, u32 address, u8 *data, return ERROR_OK; } -static int nand_write_plain(struct nand_device_s *device, u32 address, u8 *data, u32 data_size) +static int nand_write_plain(struct nand_device_s *device, uint32_t address, uint8_t *data, uint32_t data_size) { - u8 *page; + uint8_t *page; if (!device->device) return ERROR_NAND_DEVICE_NOT_PROBED; @@ -776,10 +773,10 @@ static int nand_write_plain(struct nand_device_s *device, u32 address, u8 *data, page = malloc(device->page_size); - while (data_size > 0 ) + while (data_size > 0) { - u32 thisrun_size = (data_size > device->page_size) ? device->page_size : data_size; - u32 page_address; + uint32_t thisrun_size = (data_size > device->page_size) ? device->page_size : data_size; + uint32_t page_address; memset(page, 0xff, device->page_size); memcpy(page, data, thisrun_size); @@ -799,9 +796,9 @@ static int nand_write_plain(struct nand_device_s *device, u32 address, u8 *data, } #endif -int nand_write_page(struct nand_device_s *device, u32 page, u8 *data, u32 data_size, u8 *oob, u32 oob_size) +int nand_write_page(struct nand_device_s *device, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size) { - u32 block; + uint32_t block; if (!device->device) return ERROR_NAND_DEVICE_NOT_PROBED; @@ -816,7 +813,7 @@ int nand_write_page(struct nand_device_s *device, u32 page, u8 *data, u32 data_s return device->controller->write_page(device, page, data, data_size, oob, oob_size); } -static int nand_read_page(struct nand_device_s *device, u32 page, u8 *data, u32 data_size, u8 *oob, u32 oob_size) +static int nand_read_page(struct nand_device_s *device, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size) { if (!device->device) return ERROR_NAND_DEVICE_NOT_PROBED; @@ -827,9 +824,9 @@ static int nand_read_page(struct nand_device_s *device, u32 page, u8 *data, u32 return device->controller->read_page(device, page, data, data_size, oob, oob_size); } -int nand_read_page_raw(struct nand_device_s *device, u32 page, u8 *data, u32 data_size, u8 *oob, u32 oob_size) +int nand_read_page_raw(struct nand_device_s *device, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size) { - u32 i; + uint32_t i; if (!device->device) return ERROR_NAND_DEVICE_NOT_PROBED; @@ -941,11 +938,11 @@ int nand_read_page_raw(struct nand_device_s *device, u32 page, u8 *data, u32 dat return ERROR_OK; } -int nand_write_page_raw(struct nand_device_s *device, u32 page, u8 *data, u32 data_size, u8 *oob, u32 oob_size) +int nand_write_page_raw(struct nand_device_s *device, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size) { - u32 i; + uint32_t i; int retval; - u8 status; + uint8_t status; if (!device->device) return ERROR_NAND_DEVICE_NOT_PROBED; @@ -999,7 +996,7 @@ int nand_write_page_raw(struct nand_device_s *device, u32 page, u8 *data, u32 da { if (device->device->options & NAND_BUSWIDTH_16) { - u16 data_buf = le_to_h_u16(data); + uint16_t data_buf = le_to_h_u16(data); device->controller->write_data(device, data_buf); data += 2; i += 2; @@ -1024,7 +1021,7 @@ int nand_write_page_raw(struct nand_device_s *device, u32 page, u8 *data, u32 da { if (device->device->options & NAND_BUSWIDTH_16) { - u16 oob_buf = le_to_h_u16(data); + uint16_t oob_buf = le_to_h_u16(data); device->controller->write_data(device, oob_buf); oob += 2; i += 2; @@ -1093,20 +1090,20 @@ static int handle_nand_info_command(struct command_context_s *cmd_ctx, char *cmd int first = -1; int last = -1; - if ((argc < 1) || (argc > 3)) - { + switch (argc) { + default: return ERROR_COMMAND_SYNTAX_ERROR; - - } - - if (argc == 2) - { + case 1: + first = 0; + last = INT32_MAX; + break; + case 2: first = last = strtoul(args[1], NULL, 0); - } - else if (argc == 3) - { + break; + case 3: first = strtoul(args[1], NULL, 0); last = strtoul(args[2], NULL, 0); + break; } p = get_nand_device_by_num(strtoul(args[0], NULL, 0)); @@ -1141,9 +1138,13 @@ static int handle_nand_info_command(struct command_context_s *cmd_ctx, char *cmd else bad_state = " (block condition unknown)"; - command_print(cmd_ctx, "\t#%i: 0x%8.8x (0x%xkB) %s%s", - j, p->blocks[j].offset, p->blocks[j].size / 1024, - erase_state, bad_state); + command_print(cmd_ctx, + "\t#%i: 0x%8.8" PRIx32 " (%" PRId32 "kB) %s%s", + j, + p->blocks[j].offset, + p->blocks[j].size / 1024, + erase_state, + bad_state); } } else @@ -1203,12 +1204,31 @@ static int handle_nand_erase_command(struct command_context_s *cmd_ctx, char *cm p = get_nand_device_by_num(strtoul(args[0], NULL, 0)); if (p) { - int first = strtoul(args[1], NULL, 0); - int last = strtoul(args[2], NULL, 0); + char *cp; + unsigned long offset; + unsigned long length; + + offset = strtoul(args[1], &cp, 0); + if (*cp || offset == ULONG_MAX || offset % p->erase_size) + { + return ERROR_INVALID_ARGUMENTS; + } + offset /= p->erase_size; - if ((retval = nand_erase(p, first, last)) == ERROR_OK) + length = strtoul(args[2], &cp, 0); + if (*cp || length == ULONG_MAX || length % p->erase_size) { - command_print(cmd_ctx, "successfully erased blocks %i to %i on NAND flash device '%s'", first, last, p->device->name); + return ERROR_INVALID_ARGUMENTS; + } + length -= 1; + length /= p->erase_size; + + retval = nand_erase(p, offset, offset + length); + if (retval == ERROR_OK) + { + command_print(cmd_ctx, "successfully erased blocks " + "%lu to %lu on NAND flash device '%s'", + offset, offset + length, p->device->name); } else if (retval == ERROR_NAND_OPERATION_FAILED) { @@ -1240,54 +1260,53 @@ int handle_nand_check_bad_blocks_command(struct command_context_s *cmd_ctx, char } - if (argc == 3) - { - first = strtoul(args[1], NULL, 0); - last = strtoul(args[2], NULL, 0); + p = get_nand_device_by_num(strtoul(args[0], NULL, 0)); + if (!p) { + command_print(cmd_ctx, "NAND flash device '#%s' is out of bounds", + args[0]); + return ERROR_INVALID_ARGUMENTS; } - p = get_nand_device_by_num(strtoul(args[0], NULL, 0)); - if (p) + if (argc == 3) { - if ((retval = nand_build_bbt(p, first, last)) == ERROR_OK) - { - 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) + char *cp; + unsigned long offset; + unsigned long length; + + offset = strtoul(args[1], &cp, 0); + if (*cp || offset == ULONG_MAX || offset % p->erase_size) { - command_print(cmd_ctx, "error when checking for bad blocks on NAND flash device"); + return ERROR_INVALID_ARGUMENTS; } - else + offset /= p->erase_size; + + length = strtoul(args[2], &cp, 0); + if (*cp || length == ULONG_MAX || length % p->erase_size) { - command_print(cmd_ctx, "unknown error when checking for bad blocks on NAND flash device"); + return ERROR_INVALID_ARGUMENTS; } - } - else - { - command_print(cmd_ctx, "NAND flash device '#%s' is out of bounds", args[0]); - } - - return ERROR_OK; -} + length -= 1; + length /= p->erase_size; -static int handle_nand_copy_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) -{ - nand_device_t *p; + first = offset; + last = offset + length; + } - if (argc != 4) + retval = nand_build_bbt(p, first, last); + if (retval == ERROR_OK) { - return ERROR_COMMAND_SYNTAX_ERROR; - + command_print(cmd_ctx, "checked NAND flash device for bad blocks, " + "use \"nand info\" command to list blocks"); } - - p = get_nand_device_by_num(strtoul(args[0], NULL, 0)); - if (p) + else if (retval == ERROR_NAND_OPERATION_FAILED) { - + command_print(cmd_ctx, "error when checking for bad blocks on " + "NAND flash device"); } else { - command_print(cmd_ctx, "NAND flash device '#%s' is out of bounds", args[0]); + command_print(cmd_ctx, "unknown error when checking for bad " + "blocks on NAND flash device"); } return ERROR_OK; @@ -1295,9 +1314,9 @@ static int handle_nand_copy_command(struct command_context_s *cmd_ctx, char *cmd static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { - u32 offset; - u32 binary_size; - u32 buf_cnt; + uint32_t offset; + uint32_t binary_size; + uint32_t buf_cnt; enum oob_formats oob_format = NAND_OOB_NONE; fileio_t fileio; @@ -1316,10 +1335,10 @@ static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cm p = get_nand_device_by_num(strtoul(args[0], NULL, 0)); if (p) { - u8 *page = NULL; - u32 page_size = 0; - u8 *oob = NULL; - u32 oob_size = 0; + uint8_t *page = NULL; + uint32_t page_size = 0; + uint8_t *oob = NULL; + uint32_t oob_size = 0; const int *eccpos = NULL; offset = strtoul(args[2], NULL, 0); @@ -1383,7 +1402,7 @@ static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cm while (buf_cnt > 0) { - u32 size_read; + uint32_t size_read; if (NULL != page) { @@ -1397,11 +1416,11 @@ static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cm if (oob_format & NAND_OOB_SW_ECC) { - u32 i, j; - u8 ecc[3]; + 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); + nand_calculate_ecc(p, page + i, ecc); oob[eccpos[j++]] = ecc[0]; oob[eccpos[j++]] = ecc[1]; oob[eccpos[j++]] = ecc[2]; @@ -1414,11 +1433,11 @@ static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cm * at the end of the OOB area. It consists * of 10 bytes per 512-byte data block. */ - u32 i; - u8 *ecc = oob + oob_size - page_size/512 * 10; + 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); + nand_calculate_ecc_kw(p, page + i, ecc); ecc += 10; } } @@ -1434,7 +1453,7 @@ static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cm if (nand_write_page(p, offset / p->page_size, page, page_size, oob, oob_size) != ERROR_OK) { - command_print(cmd_ctx, "failed writing file %s to NAND flash %s at offset 0x%8.8x", + 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); @@ -1452,7 +1471,7 @@ static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cm oob = NULL; page = NULL; duration_stop_measure(&duration, &duration_text); - command_print(cmd_ctx, "wrote file %s to NAND flash %s up to offset 0x%8.8x in %s", + command_print(cmd_ctx, "wrote file %s to NAND flash %s up to offset 0x%8.8" PRIx32 " in %s", args[1], args[0], offset, duration_text); free(duration_text); duration_text = NULL; @@ -1484,13 +1503,13 @@ static int handle_nand_dump_command(struct command_context_s *cmd_ctx, char *cmd char *duration_text; int retval; - u8 *page = NULL; - u32 page_size = 0; - u8 *oob = NULL; - u32 oob_size = 0; - u32 address = strtoul(args[2], NULL, 0); - u32 size = strtoul(args[3], NULL, 0); - u32 bytes_done = 0; + uint8_t *page = NULL; + uint32_t page_size = 0; + uint8_t *oob = NULL; + uint32_t oob_size = 0; + uint32_t address = strtoul(args[2], NULL, 0); + uint32_t size = strtoul(args[3], NULL, 0); + uint32_t bytes_done = 0; enum oob_formats oob_format = NAND_OOB_NONE; if (argc > 4) @@ -1537,7 +1556,7 @@ static int handle_nand_dump_command(struct command_context_s *cmd_ctx, char *cmd while (size > 0) { - u32 size_written; + uint32_t size_written; if ((retval = nand_read_page(p, address / p->page_size, page, page_size, oob, oob_size)) != ERROR_OK) { command_print(cmd_ctx, "reading NAND flash page failed");