X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnand.c;h=4094effcb15b3beb557a520b6f81241f9c697190;hp=81a04f7a6a90850128e03994689fa3c05e9e794b;hb=98723c4ecdbe06f90c66f3abec27b792c3b38e34;hpb=fb50efc6e712f413d109c3d77683d0358a557ed4 diff --git a/src/flash/nand.c b/src/flash/nand.c index 81a04f7a6a..4094effcb1 100644 --- a/src/flash/nand.c +++ b/src/flash/nand.c @@ -28,35 +28,25 @@ #include "time_support.h" #include "fileio.h" -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_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 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 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, 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, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_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 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; -extern nand_flash_controller_t s3c2412_nand_controller; -extern nand_flash_controller_t s3c2440_nand_controller; -extern nand_flash_controller_t s3c2443_nand_controller; -extern nand_flash_controller_t imx31_nand_flash_controller; - -/* extern nand_flash_controller_t boundary_scan_nand_controller; */ - -static nand_flash_controller_t *nand_flash_controllers[] = +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, @@ -71,7 +61,7 @@ static nand_flash_controller_t *nand_flash_controllers[] = }; /* configured NAND devices and NAND Flash command handler */ -static nand_device_t *nand_devices = NULL; +static struct nand_device *nand_devices = NULL; static command_t *nand_cmd; /* Chip ID list @@ -84,7 +74,7 @@ static command_t *nand_cmd; * 256 256 Byte page size * 512 512 Byte page size */ -static nand_info_t nand_flash_ids[] = +static struct nand_info nand_flash_ids[] = { /* start "museum" IDs */ {"NAND 1MiB 5V 8-bit", 0x6e, 256, 1, 0x1000, 0}, @@ -164,7 +154,7 @@ static nand_info_t nand_flash_ids[] = /* Manufacturer ID list */ -static nand_manufacturer_t nand_manuf_ids[] = +static struct nand_manufacturer nand_manuf_ids[] = { {0x0, "unknown"}, {NAND_MFR_TOSHIBA, "Toshiba"}, @@ -183,7 +173,7 @@ static nand_manufacturer_t nand_manuf_ids[] = */ #if 0 -static nand_ecclayout_t nand_oob_8 = { +static struct nand_ecclayout nand_oob_8 = { .eccbytes = 3, .eccpos = {0, 1, 2}, .oobfree = { @@ -194,7 +184,7 @@ static nand_ecclayout_t nand_oob_8 = { }; #endif -static nand_ecclayout_t nand_oob_16 = { +static struct nand_ecclayout nand_oob_16 = { .eccbytes = 6, .eccpos = {0, 1, 2, 3, 6, 7}, .oobfree = { @@ -202,7 +192,7 @@ static nand_ecclayout_t nand_oob_16 = { . length = 8}} }; -static nand_ecclayout_t nand_oob_64 = { +static struct nand_ecclayout nand_oob_64 = { .eccbytes = 24, .eccpos = { 40, 41, 42, 43, 44, 45, 46, 47, @@ -215,7 +205,7 @@ static nand_ecclayout_t nand_oob_64 = { /* nand device [controller options] */ -static int handle_nand_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(handle_nand_device_command) { int i; int retval; @@ -228,7 +218,7 @@ static int handle_nand_device_command(struct command_context_s *cmd_ctx, char *c for (i = 0; nand_flash_controllers[i]; i++) { - nand_device_t *p, *c; + struct nand_device *p, *c; if (strcmp(args[0], nand_flash_controllers[i]->name) == 0) { @@ -239,7 +229,7 @@ static int handle_nand_device_command(struct command_context_s *cmd_ctx, char *c return retval; } - c = malloc(sizeof(nand_device_t)); + c = malloc(sizeof(struct nand_device)); c->controller = nand_flash_controllers[i]; c->controller_priv = NULL; @@ -251,7 +241,8 @@ static int handle_nand_device_command(struct command_context_s *cmd_ctx, char *c c->use_raw = 0; c->next = NULL; - if ((retval = nand_flash_controllers[i]->nand_device_command(cmd_ctx, cmd, args, argc, c)) != 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); @@ -288,7 +279,7 @@ static int handle_nand_device_command(struct command_context_s *cmd_ctx, char *c return ERROR_OK; } -int nand_register_commands(struct command_context_s *cmd_ctx) +int nand_register_commands(struct command_context *cmd_ctx) { nand_cmd = register_command(cmd_ctx, NULL, "nand", NULL, COMMAND_ANY, "NAND specific commands"); @@ -297,36 +288,9 @@ int nand_register_commands(struct command_context_s *cmd_ctx) return ERROR_OK; } -int nand_init(struct command_context_s *cmd_ctx) -{ - if (nand_devices) - { - 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 "); - 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 [ ]"); - 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, "dump", handle_nand_dump_command, COMMAND_EXEC, - "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 | 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']"); - } - - return ERROR_OK; -} - -nand_device_t *get_nand_device_by_num(int num) +struct nand_device *get_nand_device_by_num(int num) { - nand_device_t *p; + struct nand_device *p; int i = 0; for (p = nand_devices; p; p = p->next) @@ -340,90 +304,90 @@ nand_device_t *get_nand_device_by_num(int num) return NULL; } -int nand_command_get_device_by_num(struct command_context_s *cmd_ctx, - char *str, nand_device_t **device) +int nand_command_get_device_by_num(struct command_context *cmd_ctx, + const char *str, struct nand_device **nand) { unsigned num; COMMAND_PARSE_NUMBER(uint, str, num); - *device = get_nand_device_by_num(num); - if (!*device) { + *nand = get_nand_device_by_num(num); + if (!*nand) { command_print(cmd_ctx, "NAND flash device '#%s' is out of bounds", str); return ERROR_INVALID_ARGUMENTS; } return ERROR_OK; } -static int nand_build_bbt(struct nand_device_s *device, int first, int last) +static int nand_build_bbt(struct nand_device *nand, int first, int last) { uint32_t page = 0x0; int i; uint8_t oob[6]; - if ((first < 0) || (first >= device->num_blocks)) + if ((first < 0) || (first >= nand->num_blocks)) first = 0; - if ((last >= device->num_blocks) || (last == -1)) - last = device->num_blocks - 1; + if ((last >= nand->num_blocks) || (last == -1)) + last = nand->num_blocks - 1; for (i = first; i < last; i++) { - nand_read_page(device, page, NULL, 0, oob, 6); + nand_read_page(nand, page, NULL, 0, oob, 6); - if (((device->device->options & NAND_BUSWIDTH_16) && ((oob[0] & oob[1]) != 0xff)) - || (((device->page_size == 512) && (oob[5] != 0xff)) || - ((device->page_size == 2048) && (oob[0] != 0xff)))) + if (((nand->device->options & NAND_BUSWIDTH_16) && ((oob[0] & oob[1]) != 0xff)) + || (((nand->page_size == 512) && (oob[5] != 0xff)) || + ((nand->page_size == 2048) && (oob[0] != 0xff)))) { LOG_WARNING("bad block: %i", i); - device->blocks[i].is_bad = 1; + nand->blocks[i].is_bad = 1; } else { - device->blocks[i].is_bad = 0; + nand->blocks[i].is_bad = 0; } - page += (device->erase_size / device->page_size); + page += (nand->erase_size / nand->page_size); } return ERROR_OK; } -int nand_read_status(struct nand_device_s *device, uint8_t *status) +int nand_read_status(struct nand_device *nand, uint8_t *status) { - if (!device->device) + if (!nand->device) return ERROR_NAND_DEVICE_NOT_PROBED; /* Send read status command */ - device->controller->command(device, NAND_CMD_STATUS); + nand->controller->command(nand, NAND_CMD_STATUS); alive_sleep(1); /* read status */ - if (device->device->options & NAND_BUSWIDTH_16) + if (nand->device->options & NAND_BUSWIDTH_16) { uint16_t data; - device->controller->read_data(device, &data); + nand->controller->read_data(nand, &data); *status = data & 0xff; } else { - device->controller->read_data(device, status); + nand->controller->read_data(nand, status); } return ERROR_OK; } -static int nand_poll_ready(struct nand_device_s *device, int timeout) +static int nand_poll_ready(struct nand_device *nand, int timeout) { uint8_t status; - device->controller->command(device, NAND_CMD_STATUS); + nand->controller->command(nand, NAND_CMD_STATUS); do { - if (device->device->options & NAND_BUSWIDTH_16) { + if (nand->device->options & NAND_BUSWIDTH_16) { uint16_t data; - device->controller->read_data(device, &data); + nand->controller->read_data(nand, &data); status = data & 0xff; } else { - device->controller->read_data(device, &status); + nand->controller->read_data(nand, &status); } if (status & NAND_STATUS_READY) break; @@ -433,7 +397,7 @@ static int nand_poll_ready(struct nand_device_s *device, int timeout) return (status & NAND_STATUS_READY) != 0; } -int nand_probe(struct nand_device_s *device) +int nand_probe(struct nand_device *nand) { uint8_t manufacturer_id, device_id; uint8_t id_buff[6]; @@ -441,17 +405,17 @@ int nand_probe(struct nand_device_s *device) int i; /* clear device data */ - device->device = NULL; - device->manufacturer = NULL; + nand->device = NULL; + nand->manufacturer = NULL; /* clear device parameters */ - device->bus_width = 0; - device->address_cycles = 0; - device->page_size = 0; - device->erase_size = 0; + nand->bus_width = 0; + nand->address_cycles = 0; + nand->page_size = 0; + nand->erase_size = 0; /* initialize controller (device parameters are zero, use controller default) */ - if ((retval = device->controller->init(device) != ERROR_OK)) + if ((retval = nand->controller->init(nand) != ERROR_OK)) { switch (retval) { @@ -467,23 +431,23 @@ int nand_probe(struct nand_device_s *device) } } - device->controller->command(device, NAND_CMD_RESET); - device->controller->reset(device); + nand->controller->command(nand, NAND_CMD_RESET); + nand->controller->reset(nand); - device->controller->command(device, NAND_CMD_READID); - device->controller->address(device, 0x0); + nand->controller->command(nand, NAND_CMD_READID); + nand->controller->address(nand, 0x0); - if (device->bus_width == 8) + if (nand->bus_width == 8) { - device->controller->read_data(device, &manufacturer_id); - device->controller->read_data(device, &device_id); + nand->controller->read_data(nand, &manufacturer_id); + nand->controller->read_data(nand, &device_id); } else { uint16_t data_buf; - device->controller->read_data(device, &data_buf); + nand->controller->read_data(nand, &data_buf); manufacturer_id = data_buf & 0xff; - device->controller->read_data(device, &data_buf); + nand->controller->read_data(nand, &data_buf); device_id = data_buf & 0xff; } @@ -491,7 +455,7 @@ int nand_probe(struct nand_device_s *device) { if (nand_flash_ids[i].id == device_id) { - device->device = &nand_flash_ids[i]; + nand->device = &nand_flash_ids[i]; break; } } @@ -500,127 +464,127 @@ int nand_probe(struct nand_device_s *device) { if (nand_manuf_ids[i].id == manufacturer_id) { - device->manufacturer = &nand_manuf_ids[i]; + nand->manufacturer = &nand_manuf_ids[i]; break; } } - if (!device->manufacturer) + if (!nand->manufacturer) { - device->manufacturer = &nand_manuf_ids[0]; - device->manufacturer->id = manufacturer_id; + nand->manufacturer = &nand_manuf_ids[0]; + nand->manufacturer->id = manufacturer_id; } - if (!device->device) + if (!nand->device) { LOG_ERROR("unknown NAND flash device found, manufacturer id: 0x%2.2x device id: 0x%2.2x", manufacturer_id, device_id); return ERROR_NAND_OPERATION_FAILED; } - LOG_DEBUG("found %s (%s)", device->device->name, device->manufacturer->name); + LOG_DEBUG("found %s (%s)", nand->device->name, nand->manufacturer->name); /* initialize device parameters */ /* bus width */ - if (device->device->options & NAND_BUSWIDTH_16) - device->bus_width = 16; + if (nand->device->options & NAND_BUSWIDTH_16) + nand->bus_width = 16; else - device->bus_width = 8; + nand->bus_width = 8; /* Do we need extended device probe information? */ - if (device->device->page_size == 0 || - device->device->erase_size == 0) + if (nand->device->page_size == 0 || + nand->device->erase_size == 0) { - if (device->bus_width == 8) + if (nand->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); + nand->controller->read_data(nand, id_buff + 3); + nand->controller->read_data(nand, id_buff + 4); + nand->controller->read_data(nand, id_buff + 5); } else { uint16_t data_buf; - device->controller->read_data(device, &data_buf); + nand->controller->read_data(nand, &data_buf); id_buff[3] = data_buf; - device->controller->read_data(device, &data_buf); + nand->controller->read_data(nand, &data_buf); id_buff[4] = data_buf; - device->controller->read_data(device, &data_buf); + nand->controller->read_data(nand, &data_buf); id_buff[5] = data_buf >> 8; } } /* page size */ - if (device->device->page_size == 0) + if (nand->device->page_size == 0) { - device->page_size = 1 << (10 + (id_buff[4] & 3)); + nand->page_size = 1 << (10 + (id_buff[4] & 3)); } - else if (device->device->page_size == 256) + else if (nand->device->page_size == 256) { LOG_ERROR("NAND flashes with 256 byte pagesize are not supported"); return ERROR_NAND_OPERATION_FAILED; } else { - device->page_size = device->device->page_size; + nand->page_size = nand->device->page_size; } /* number of address cycles */ - if (device->page_size <= 512) + if (nand->page_size <= 512) { /* small page devices */ - if (device->device->chip_size <= 32) - device->address_cycles = 3; - else if (device->device->chip_size <= 8*1024) - device->address_cycles = 4; + if (nand->device->chip_size <= 32) + nand->address_cycles = 3; + else if (nand->device->chip_size <= 8*1024) + nand->address_cycles = 4; else { LOG_ERROR("BUG: small page NAND device with more than 8 GiB encountered"); - device->address_cycles = 5; + nand->address_cycles = 5; } } else { /* large page devices */ - if (device->device->chip_size <= 128) - device->address_cycles = 4; - else if (device->device->chip_size <= 32*1024) - device->address_cycles = 5; + if (nand->device->chip_size <= 128) + nand->address_cycles = 4; + else if (nand->device->chip_size <= 32*1024) + nand->address_cycles = 5; else { LOG_ERROR("BUG: large page NAND device with more than 32 GiB encountered"); - device->address_cycles = 6; + nand->address_cycles = 6; } } /* erase size */ - if (device->device->erase_size == 0) + if (nand->device->erase_size == 0) { switch ((id_buff[4] >> 4) & 3) { case 0: - device->erase_size = 64 << 10; + nand->erase_size = 64 << 10; break; case 1: - device->erase_size = 128 << 10; + nand->erase_size = 128 << 10; break; case 2: - device->erase_size = 256 << 10; + nand->erase_size = 256 << 10; break; case 3: - device->erase_size =512 << 10; + nand->erase_size =512 << 10; break; } } else { - device->erase_size = device->device->erase_size; + nand->erase_size = nand->device->erase_size; } /* initialize controller, but leave parameters at the controllers default */ - if ((retval = device->controller->init(device) != ERROR_OK)) + if ((retval = nand->controller->init(nand) != ERROR_OK)) { switch (retval) { @@ -629,7 +593,7 @@ int nand_probe(struct nand_device_s *device) return ERROR_NAND_OPERATION_FAILED; case ERROR_NAND_OPERATION_NOT_SUPPORTED: LOG_ERROR("controller doesn't support requested parameters (buswidth: %i, address cycles: %i, page size: %i)", - device->bus_width, device->address_cycles, device->page_size); + nand->bus_width, nand->address_cycles, nand->page_size); return ERROR_NAND_OPERATION_FAILED; default: LOG_ERROR("BUG: unknown controller initialization failure"); @@ -637,39 +601,39 @@ int nand_probe(struct nand_device_s *device) } } - device->num_blocks = (device->device->chip_size * 1024) / (device->erase_size / 1024); - device->blocks = malloc(sizeof(nand_block_t) * device->num_blocks); + nand->num_blocks = (nand->device->chip_size * 1024) / (nand->erase_size / 1024); + nand->blocks = malloc(sizeof(struct nand_block) * nand->num_blocks); - for (i = 0; i < device->num_blocks; i++) + for (i = 0; i < nand->num_blocks; i++) { - device->blocks[i].size = device->erase_size; - device->blocks[i].offset = i * device->erase_size; - device->blocks[i].is_erased = -1; - device->blocks[i].is_bad = -1; + nand->blocks[i].size = nand->erase_size; + nand->blocks[i].offset = i * nand->erase_size; + nand->blocks[i].is_erased = -1; + nand->blocks[i].is_bad = -1; } return ERROR_OK; } -static int nand_erase(struct nand_device_s *device, int first_block, int last_block) +static int nand_erase(struct nand_device *nand, int first_block, int last_block) { int i; uint32_t page; uint8_t status; int retval; - if (!device->device) + if (!nand->device) return ERROR_NAND_DEVICE_NOT_PROBED; - if ((first_block < 0) || (last_block > device->num_blocks)) + if ((first_block < 0) || (last_block > nand->num_blocks)) return ERROR_INVALID_ARGUMENTS; /* make sure we know if a block is bad before erasing it */ for (i = first_block; i <= last_block; i++) { - if (device->blocks[i].is_bad == -1) + if (nand->blocks[i].is_bad == -1) { - nand_build_bbt(device, i, last_block); + nand_build_bbt(nand, i, last_block); break; } } @@ -677,48 +641,48 @@ static int nand_erase(struct nand_device_s *device, int first_block, int last_bl for (i = first_block; i <= last_block; i++) { /* Send erase setup command */ - device->controller->command(device, NAND_CMD_ERASE1); + nand->controller->command(nand, NAND_CMD_ERASE1); - page = i * (device->erase_size / device->page_size); + page = i * (nand->erase_size / nand->page_size); /* Send page address */ - if (device->page_size <= 512) + if (nand->page_size <= 512) { /* row */ - device->controller->address(device, page & 0xff); - device->controller->address(device, (page >> 8) & 0xff); + nand->controller->address(nand, page & 0xff); + nand->controller->address(nand, (page >> 8) & 0xff); /* 3rd cycle only on devices with more than 32 MiB */ - if (device->address_cycles >= 4) - device->controller->address(device, (page >> 16) & 0xff); + if (nand->address_cycles >= 4) + nand->controller->address(nand, (page >> 16) & 0xff); /* 4th cycle only on devices with more than 8 GiB */ - if (device->address_cycles >= 5) - device->controller->address(device, (page >> 24) & 0xff); + if (nand->address_cycles >= 5) + nand->controller->address(nand, (page >> 24) & 0xff); } else { /* row */ - device->controller->address(device, page & 0xff); - device->controller->address(device, (page >> 8) & 0xff); + nand->controller->address(nand, page & 0xff); + nand->controller->address(nand, (page >> 8) & 0xff); /* 3rd cycle only on devices with more than 128 MiB */ - if (device->address_cycles >= 5) - device->controller->address(device, (page >> 16) & 0xff); + if (nand->address_cycles >= 5) + nand->controller->address(nand, (page >> 16) & 0xff); } /* Send erase confirm command */ - device->controller->command(device, NAND_CMD_ERASE2); + nand->controller->command(nand, NAND_CMD_ERASE2); - retval = device->controller->nand_ready ? - device->controller->nand_ready(device, 1000) : - nand_poll_ready(device, 1000); + retval = nand->controller->nand_ready ? + nand->controller->nand_ready(nand, 1000) : + nand_poll_ready(nand, 1000); if (!retval) { LOG_ERROR("timeout waiting for NAND flash block erase to complete"); return ERROR_NAND_OPERATION_TIMEOUT; } - if ((retval = nand_read_status(device, &status)) != ERROR_OK) + if ((retval = nand_read_status(nand, &status)) != ERROR_OK) { LOG_ERROR("couldn't read status"); return ERROR_NAND_OPERATION_FAILED; @@ -727,43 +691,43 @@ static int nand_erase(struct nand_device_s *device, int first_block, int last_bl if (status & 0x1) { LOG_ERROR("didn't erase %sblock %d; status: 0x%2.2x", - (device->blocks[i].is_bad == 1) + (nand->blocks[i].is_bad == 1) ? "bad " : "", i, status); /* continue; other blocks might still be erasable */ } - device->blocks[i].is_erased = 1; + nand->blocks[i].is_erased = 1; } return ERROR_OK; } #if 0 -static int nand_read_plain(struct nand_device_s *device, uint32_t address, uint8_t *data, uint32_t data_size) +static int nand_read_plain(struct nand_device *nand, uint32_t address, uint8_t *data, uint32_t data_size) { uint8_t *page; - if (!device->device) + if (!nand->device) return ERROR_NAND_DEVICE_NOT_PROBED; - if (address % device->page_size) + if (address % nand->page_size) { LOG_ERROR("reads need to be page aligned"); return ERROR_NAND_OPERATION_FAILED; } - page = malloc(device->page_size); + page = malloc(nand->page_size); while (data_size > 0) { - uint32_t thisrun_size = (data_size > device->page_size) ? device->page_size : data_size; + uint32_t thisrun_size = (data_size > nand->page_size) ? nand->page_size : data_size; uint32_t page_address; - page_address = address / device->page_size; + page_address = address / nand->page_size; - nand_read_page(device, page_address, page, device->page_size, NULL, 0); + nand_read_page(nand, page_address, page, nand->page_size, NULL, 0); memcpy(data, page, thisrun_size); @@ -777,32 +741,32 @@ static int nand_read_plain(struct nand_device_s *device, uint32_t address, uint8 return ERROR_OK; } -static int nand_write_plain(struct nand_device_s *device, uint32_t address, uint8_t *data, uint32_t data_size) +static int nand_write_plain(struct nand_device *nand, uint32_t address, uint8_t *data, uint32_t data_size) { uint8_t *page; - if (!device->device) + if (!nand->device) return ERROR_NAND_DEVICE_NOT_PROBED; - if (address % device->page_size) + if (address % nand->page_size) { LOG_ERROR("writes need to be page aligned"); return ERROR_NAND_OPERATION_FAILED; } - page = malloc(device->page_size); + page = malloc(nand->page_size); while (data_size > 0) { - uint32_t thisrun_size = (data_size > device->page_size) ? device->page_size : data_size; + uint32_t thisrun_size = (data_size > nand->page_size) ? nand->page_size : data_size; uint32_t page_address; - memset(page, 0xff, device->page_size); + memset(page, 0xff, nand->page_size); memcpy(page, data, thisrun_size); - page_address = address / device->page_size; + page_address = address / nand->page_size; - nand_write_page(device, page_address, page, device->page_size, NULL, 0); + nand_write_page(nand, page_address, page, nand->page_size, NULL, 0); address += thisrun_size; data += thisrun_size; @@ -815,92 +779,92 @@ static int nand_write_plain(struct nand_device_s *device, uint32_t address, uint } #endif -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) +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) { uint32_t block; - if (!device->device) + if (!nand->device) return ERROR_NAND_DEVICE_NOT_PROBED; - block = page / (device->erase_size / device->page_size); - if (device->blocks[block].is_erased == 1) - device->blocks[block].is_erased = 0; + block = page / (nand->erase_size / nand->page_size); + if (nand->blocks[block].is_erased == 1) + nand->blocks[block].is_erased = 0; - if (device->use_raw || device->controller->write_page == NULL) - return nand_write_page_raw(device, page, data, data_size, oob, oob_size); + if (nand->use_raw || nand->controller->write_page == NULL) + return nand_write_page_raw(nand, page, data, data_size, oob, oob_size); else - return device->controller->write_page(device, page, data, data_size, oob, oob_size); + return nand->controller->write_page(nand, page, data, data_size, oob, 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) +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) { - if (!device->device) + if (!nand->device) return ERROR_NAND_DEVICE_NOT_PROBED; - if (device->use_raw || device->controller->read_page == NULL) - return nand_read_page_raw(device, page, data, data_size, oob, oob_size); + if (nand->use_raw || nand->controller->read_page == NULL) + return nand_read_page_raw(nand, page, data, data_size, oob, oob_size); else - return device->controller->read_page(device, page, data, data_size, oob, oob_size); + return nand->controller->read_page(nand, page, data, data_size, oob, 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) +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; - if (!device->device) + if (!nand->device) return ERROR_NAND_DEVICE_NOT_PROBED; - if (device->page_size <= 512) + if (nand->page_size <= 512) { /* small page device */ if (data) - device->controller->command(device, NAND_CMD_READ0); + nand->controller->command(nand, NAND_CMD_READ0); else - device->controller->command(device, NAND_CMD_READOOB); + nand->controller->command(nand, NAND_CMD_READOOB); /* column (always 0, we start at the beginning of a page/OOB area) */ - device->controller->address(device, 0x0); + nand->controller->address(nand, 0x0); /* row */ - device->controller->address(device, page & 0xff); - device->controller->address(device, (page >> 8) & 0xff); + nand->controller->address(nand, page & 0xff); + nand->controller->address(nand, (page >> 8) & 0xff); /* 4th cycle only on devices with more than 32 MiB */ - if (device->address_cycles >= 4) - device->controller->address(device, (page >> 16) & 0xff); + if (nand->address_cycles >= 4) + nand->controller->address(nand, (page >> 16) & 0xff); /* 5th cycle only on devices with more than 8 GiB */ - if (device->address_cycles >= 5) - device->controller->address(device, (page >> 24) & 0xff); + if (nand->address_cycles >= 5) + nand->controller->address(nand, (page >> 24) & 0xff); } else { /* large page device */ - device->controller->command(device, NAND_CMD_READ0); + 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) */ - device->controller->address(device, 0x0); + nand->controller->address(nand, 0x0); if (data) - device->controller->address(device, 0x0); + nand->controller->address(nand, 0x0); else - device->controller->address(device, 0x8); + nand->controller->address(nand, 0x8); /* row */ - device->controller->address(device, page & 0xff); - device->controller->address(device, (page >> 8) & 0xff); + nand->controller->address(nand, page & 0xff); + nand->controller->address(nand, (page >> 8) & 0xff); /* 5th cycle only on devices with more than 128 MiB */ - if (device->address_cycles >= 5) - device->controller->address(device, (page >> 16) & 0xff); + if (nand->address_cycles >= 5) + nand->controller->address(nand, (page >> 16) & 0xff); /* large page devices need a start command */ - device->controller->command(device, NAND_CMD_READSTART); + nand->controller->command(nand, NAND_CMD_READSTART); } - if (device->controller->nand_ready) { - if (!device->controller->nand_ready(device, 100)) + if (nand->controller->nand_ready) { + if (!nand->controller->nand_ready(nand, 100)) return ERROR_NAND_OPERATION_TIMEOUT; } else { alive_sleep(1); @@ -908,21 +872,21 @@ int nand_read_page_raw(struct nand_device_s *device, uint32_t page, uint8_t *dat if (data) { - if (device->controller->read_block_data != NULL) - (device->controller->read_block_data)(device, data, data_size); + if (nand->controller->read_block_data != NULL) + (nand->controller->read_block_data)(nand, data, data_size); else { for (i = 0; i < data_size;) { - if (device->device->options & NAND_BUSWIDTH_16) + if (nand->device->options & NAND_BUSWIDTH_16) { - device->controller->read_data(device, data); + nand->controller->read_data(nand, data); data += 2; i += 2; } else { - device->controller->read_data(device, data); + nand->controller->read_data(nand, data); data += 1; i += 1; } @@ -932,21 +896,21 @@ int nand_read_page_raw(struct nand_device_s *device, uint32_t page, uint8_t *dat if (oob) { - if (device->controller->read_block_data != NULL) - (device->controller->read_block_data)(device, oob, oob_size); + if (nand->controller->read_block_data != NULL) + (nand->controller->read_block_data)(nand, oob, oob_size); else { for (i = 0; i < oob_size;) { - if (device->device->options & NAND_BUSWIDTH_16) + if (nand->device->options & NAND_BUSWIDTH_16) { - device->controller->read_data(device, oob); + nand->controller->read_data(nand, oob); oob += 2; i += 2; } else { - device->controller->read_data(device, oob); + nand->controller->read_data(nand, oob); oob += 1; i += 1; } @@ -957,72 +921,72 @@ int nand_read_page_raw(struct nand_device_s *device, uint32_t page, uint8_t *dat return ERROR_OK; } -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) +int nand_write_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; uint8_t status; - if (!device->device) + if (!nand->device) return ERROR_NAND_DEVICE_NOT_PROBED; - device->controller->command(device, NAND_CMD_SEQIN); + nand->controller->command(nand, NAND_CMD_SEQIN); - if (device->page_size <= 512) + if (nand->page_size <= 512) { /* column (always 0, we start at the beginning of a page/OOB area) */ - device->controller->address(device, 0x0); + nand->controller->address(nand, 0x0); /* row */ - device->controller->address(device, page & 0xff); - device->controller->address(device, (page >> 8) & 0xff); + nand->controller->address(nand, page & 0xff); + nand->controller->address(nand, (page >> 8) & 0xff); /* 4th cycle only on devices with more than 32 MiB */ - if (device->address_cycles >= 4) - device->controller->address(device, (page >> 16) & 0xff); + if (nand->address_cycles >= 4) + nand->controller->address(nand, (page >> 16) & 0xff); /* 5th cycle only on devices with more than 8 GiB */ - if (device->address_cycles >= 5) - device->controller->address(device, (page >> 24) & 0xff); + 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) */ - device->controller->address(device, 0x0); + nand->controller->address(nand, 0x0); if (data) - device->controller->address(device, 0x0); + nand->controller->address(nand, 0x0); else - device->controller->address(device, 0x8); + nand->controller->address(nand, 0x8); /* row */ - device->controller->address(device, page & 0xff); - device->controller->address(device, (page >> 8) & 0xff); + nand->controller->address(nand, page & 0xff); + nand->controller->address(nand, (page >> 8) & 0xff); /* 5th cycle only on devices with more than 128 MiB */ - if (device->address_cycles >= 5) - device->controller->address(device, (page >> 16) & 0xff); + if (nand->address_cycles >= 5) + nand->controller->address(nand, (page >> 16) & 0xff); } if (data) { - if (device->controller->write_block_data != NULL) - (device->controller->write_block_data)(device, data, data_size); + if (nand->controller->write_block_data != NULL) + (nand->controller->write_block_data)(nand, data, data_size); else { for (i = 0; i < data_size;) { - if (device->device->options & NAND_BUSWIDTH_16) + if (nand->device->options & NAND_BUSWIDTH_16) { uint16_t data_buf = le_to_h_u16(data); - device->controller->write_data(device, data_buf); + nand->controller->write_data(nand, data_buf); data += 2; i += 2; } else { - device->controller->write_data(device, *data); + nand->controller->write_data(nand, *data); data += 1; i += 1; } @@ -1032,22 +996,22 @@ int nand_write_page_raw(struct nand_device_s *device, uint32_t page, uint8_t *da if (oob) { - if (device->controller->write_block_data != NULL) - (device->controller->write_block_data)(device, oob, oob_size); + if (nand->controller->write_block_data != NULL) + (nand->controller->write_block_data)(nand, oob, oob_size); else { for (i = 0; i < oob_size;) { - if (device->device->options & NAND_BUSWIDTH_16) + if (nand->device->options & NAND_BUSWIDTH_16) { uint16_t oob_buf = le_to_h_u16(data); - device->controller->write_data(device, oob_buf); + nand->controller->write_data(nand, oob_buf); oob += 2; i += 2; } else { - device->controller->write_data(device, *oob); + nand->controller->write_data(nand, *oob); oob += 1; i += 1; } @@ -1055,15 +1019,15 @@ int nand_write_page_raw(struct nand_device_s *device, uint32_t page, uint8_t *da } } - device->controller->command(device, NAND_CMD_PAGEPROG); + nand->controller->command(nand, NAND_CMD_PAGEPROG); - retval = device->controller->nand_ready ? - device->controller->nand_ready(device, 100) : - nand_poll_ready(device, 100); + retval = nand->controller->nand_ready ? + nand->controller->nand_ready(nand, 100) : + nand_poll_ready(nand, 100); if (!retval) return ERROR_NAND_OPERATION_TIMEOUT; - if ((retval = nand_read_status(device, &status)) != ERROR_OK) + if ((retval = nand_read_status(nand, &status)) != ERROR_OK) { LOG_ERROR("couldn't read status"); return ERROR_NAND_OPERATION_FAILED; @@ -1078,9 +1042,9 @@ int nand_write_page_raw(struct nand_device_s *device, uint32_t page, uint8_t *da return ERROR_OK; } -int handle_nand_list_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(handle_nand_list_command) { - nand_device_t *p; + struct nand_device *p; int i; if (!nand_devices) @@ -1105,14 +1069,14 @@ int handle_nand_list_command(struct command_context_s *cmd_ctx, char *cmd, char return ERROR_OK; } -static int handle_nand_info_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(handle_nand_info_command) { int i = 0; int j = 0; int first = -1; int last = -1; - nand_device_t *p; + struct nand_device *p; int retval = nand_command_get_device_by_num(cmd_ctx, args[0], &p); if (ERROR_OK != retval) return retval; @@ -1180,14 +1144,14 @@ static int handle_nand_info_command(struct command_context_s *cmd_ctx, char *cmd return ERROR_OK; } -static int handle_nand_probe_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(handle_nand_probe_command) { if (argc != 1) { return ERROR_COMMAND_SYNTAX_ERROR; } - nand_device_t *p; + struct nand_device *p; int retval = nand_command_get_device_by_num(cmd_ctx, args[0], &p); if (ERROR_OK != retval) return retval; @@ -1208,7 +1172,7 @@ static int handle_nand_probe_command(struct command_context_s *cmd_ctx, char *cm return ERROR_OK; } -static int handle_nand_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(handle_nand_erase_command) { if (argc != 1 && argc != 3) { @@ -1216,7 +1180,7 @@ static int handle_nand_erase_command(struct command_context_s *cmd_ctx, char *cm } - nand_device_t *p; + struct nand_device *p; int retval = nand_command_get_device_by_num(cmd_ctx, args[0], &p); if (ERROR_OK != retval) return retval; @@ -1264,7 +1228,7 @@ static int handle_nand_erase_command(struct command_context_s *cmd_ctx, char *cm return ERROR_OK; } -int handle_nand_check_bad_blocks_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(handle_nand_check_bad_blocks_command) { int first = -1; int last = -1; @@ -1275,7 +1239,7 @@ int handle_nand_check_bad_blocks_command(struct command_context_s *cmd_ctx, char } - nand_device_t *p; + struct nand_device *p; int retval = nand_command_get_device_by_num(cmd_ctx, args[0], &p); if (ERROR_OK != retval) return retval; @@ -1321,24 +1285,22 @@ int handle_nand_check_bad_blocks_command(struct command_context_s *cmd_ctx, char return ERROR_OK; } -static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +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; - fileio_t fileio; + struct fileio fileio; - duration_t duration; - char *duration_text; if (argc < 3) { return ERROR_COMMAND_SYNTAX_ERROR; } - nand_device_t *p; + struct nand_device *p; int retval = nand_command_get_device_by_num(cmd_ctx, args[0], &p); if (ERROR_OK != retval) return retval; @@ -1353,8 +1315,7 @@ static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cm if (argc > 3) { - int i; - for (i = 3; i < argc; i++) + for (unsigned i = 3; i < argc; i++) { if (!strcmp(args[i], "oob_raw")) oob_format |= NAND_OOB_RAW; @@ -1372,7 +1333,8 @@ static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cm } } - duration_start_measure(&duration); + struct duration bench; + duration_start(&bench); if (fileio_open(&fileio, args[1], FILEIO_READ, FILEIO_BINARY) != ERROR_OK) { @@ -1478,23 +1440,25 @@ static int handle_nand_write_command(struct command_context_s *cmd_ctx, char *cm free(page); 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.8" PRIx32 " in %s", - args[1], args[0], offset, duration_text); - free(duration_text); - duration_text = NULL; + if (duration_measure(&bench) == 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)); + } return ERROR_OK; } -static int handle_nand_dump_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(handle_nand_dump_command) { if (argc < 4) { return ERROR_COMMAND_SYNTAX_ERROR; } - nand_device_t *p; + struct nand_device *p; int retval = nand_command_get_device_by_num(cmd_ctx, args[0], &p); if (ERROR_OK != retval) return retval; @@ -1505,9 +1469,7 @@ static int handle_nand_dump_command(struct command_context_s *cmd_ctx, char *cmd return ERROR_OK; } - fileio_t fileio; - duration_t duration; - char *duration_text; + struct fileio fileio; uint8_t *page = NULL; uint32_t page_size = 0; @@ -1522,8 +1484,7 @@ static int handle_nand_dump_command(struct command_context_s *cmd_ctx, char *cmd if (argc > 4) { - int i; - for (i = 4; i < argc; i++) + for (unsigned i = 4; i < argc; i++) { if (!strcmp(args[i], "oob_raw")) oob_format |= NAND_OOB_RAW; @@ -1560,7 +1521,8 @@ static int handle_nand_dump_command(struct command_context_s *cmd_ctx, char *cmd return ERROR_OK; } - duration_start_measure(&duration); + struct duration bench; + duration_start(&bench); while (size > 0) { @@ -1596,22 +1558,24 @@ static int handle_nand_dump_command(struct command_context_s *cmd_ctx, char *cmd oob = NULL; fileio_close(&fileio); - duration_stop_measure(&duration, &duration_text); - command_print(cmd_ctx, "dumped %lld byte in %s", fileio.size, duration_text); - free(duration_text); - duration_text = NULL; + if (duration_measure(&bench) == 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)); + } return ERROR_OK; } -static int handle_nand_raw_access_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(handle_nand_raw_access_command) { if ((argc < 1) || (argc > 2)) { return ERROR_COMMAND_SYNTAX_ERROR; } - nand_device_t *p; + struct nand_device *p; int retval = nand_command_get_device_by_num(cmd_ctx, args[0], &p); if (ERROR_OK != retval) return retval; @@ -1637,3 +1601,40 @@ static int handle_nand_raw_access_command(struct command_context_s *cmd_ctx, cha return ERROR_OK; } + +int nand_init(struct command_context *cmd_ctx) +{ + if (!nand_devices) + return ERROR_OK; + + 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 "); + 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 [ ]"); + 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, "dump", + handle_nand_dump_command, COMMAND_EXEC, + "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 | 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']"); + + return ERROR_OK; +}