Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
NAND: fix off-by-one error in erase command argument range
[openocd.git] / src / flash / nand / core.c
diff --git a/src/flash/nand/core.c b/src/flash/nand/core.c
index 46f545469daef649b86dee61de409271754d5248..e76349165e2189bc6179c73e955a768daf5ef10b 100644 (file)
--- a/src/flash/nand/core.c
+++ b/src/flash/nand/core.c
@@ -24,8 +24,6 @@
 #include "config.h"
 #endif
 
-#include <flash/nand.h>
-#include <flash/common.h>
 #include "imp.h"
 
 /* configured NAND devices and NAND Flash command handler */
@@ -162,7 +160,14 @@ static struct nand_ecclayout nand_oob_8 = {
 };
 #endif
 
-struct nand_device *get_nand_device_by_name(const char *name)
+/**
+ * Returns the flash bank specified by @a name, which matches the
+ * driver name and a suffix (option) specify the driver-specific
+ * bank number. The suffix consists of the '.' and the driver-specific
+ * bank number: when two davinci banks are defined, then 'davinci.1' refers
+ * to the second (e.g. DM355EVM).
+ */
+static struct nand_device *get_nand_device_by_name(const char *name)
 {
        unsigned requested = get_flash_name_index(name);
        unsigned found = 0;
@@ -523,7 +528,7 @@ int nand_erase(struct nand_device *nand, int first_block, int last_block)
        if (!nand->device)
                return ERROR_NAND_DEVICE_NOT_PROBED;
 
-       if ((first_block < 0) || (last_block > nand->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 */
@@ -677,7 +682,9 @@ static int nand_write_plain(struct nand_device *nand, uint32_t address, uint8_t
 }
 #endif
 
-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)
+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;
 
@@ -770,11 +777,31 @@ int nand_page_command(struct nand_device *nand, uint32_t page,
        return ERROR_OK;
 }
 
+int nand_read_data_page(struct nand_device *nand, uint8_t *data, uint32_t size)
+{
+       int retval = ERROR_NAND_NO_BUFFER;
+
+       if (nand->controller->read_block_data != NULL)
+               retval = (nand->controller->read_block_data)(nand, data, size);
+
+       if (ERROR_NAND_NO_BUFFER == retval) {
+               uint32_t i;
+               int incr = (nand->device->options & NAND_BUSWIDTH_16) ? 2 : 1;
+
+               retval = ERROR_OK;
+               for (i = 0; retval == ERROR_OK && i < size; i += incr) {
+                       retval = nand->controller->read_data(nand, data);
+                       data += incr;
+               }
+       }
+
+       return retval;
+}
+
 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);
@@ -782,116 +809,49 @@ int nand_read_page_raw(struct nand_device *nand, uint32_t page,
                return retval;
 
        if (data)
-       {
-               if (nand->controller->read_block_data != NULL)
-                       (nand->controller->read_block_data)(nand, data, data_size);
-               else
-               {
-                       for (i = 0; i < data_size;)
-                       {
-                               if (nand->device->options & NAND_BUSWIDTH_16)
-                               {
-                                       nand->controller->read_data(nand, data);
-                                       data += 2;
-                                       i += 2;
-                               }
-                               else
-                               {
-                                       nand->controller->read_data(nand, data);
-                                       data += 1;
-                                       i += 1;
-                               }
-                       }
-               }
-       }
+               nand_read_data_page(nand, data, data_size);
 
        if (oob)
-       {
-               if (nand->controller->read_block_data != NULL)
-                       (nand->controller->read_block_data)(nand, oob, oob_size);
-               else
-               {
-                       for (i = 0; i < oob_size;)
-                       {
-                               if (nand->device->options & NAND_BUSWIDTH_16)
-                               {
-                                       nand->controller->read_data(nand, oob);
-                                       oob += 2;
-                                       i += 2;
-                               }
-                               else
-                               {
-                                       nand->controller->read_data(nand, oob);
-                                       oob += 1;
-                                       i += 1;
-                               }
-                       }
-               }
-       }
+               nand_read_data_page(nand, oob, oob_size);
 
        return ERROR_OK;
 }
 
-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)
+int nand_write_data_page(struct nand_device *nand, uint8_t *data, uint32_t size)
 {
-       uint32_t i;
-       int retval;
-       uint8_t status;
+       int retval = ERROR_NAND_NO_BUFFER;
 
-       retval = nand_page_command(nand, page, NAND_CMD_SEQIN, !data);
-       if (ERROR_OK != retval)
-               return retval;
+       if (nand->controller->write_block_data != NULL)
+               retval = (nand->controller->write_block_data)(nand, data, size);
 
-       if (data)
-       {
-               if (nand->controller->write_block_data != NULL)
-                       (nand->controller->write_block_data)(nand, data, data_size);
-               else
-               {
-                       for (i = 0; i < data_size;)
-                       {
-                               if (nand->device->options & NAND_BUSWIDTH_16)
-                               {
-                                       uint16_t data_buf = le_to_h_u16(data);
-                                       nand->controller->write_data(nand, data_buf);
-                                       data += 2;
-                                       i += 2;
-                               }
-                               else
-                               {
-                                       nand->controller->write_data(nand, *data);
-                                       data += 1;
-                                       i += 1;
-                               }
-                       }
-               }
-       }
+       if (ERROR_NAND_NO_BUFFER == retval) {
+               bool is16bit = nand->device->options & NAND_BUSWIDTH_16;
+               uint32_t incr = is16bit ? 2 : 1;
+               uint16_t write_data;
+               uint32_t i;
 
-       if (oob)
-       {
-               if (nand->controller->write_block_data != NULL)
-                       (nand->controller->write_block_data)(nand, oob, oob_size);
-               else
-               {
-                       for (i = 0; i < oob_size;)
-                       {
-                               if (nand->device->options & NAND_BUSWIDTH_16)
-                               {
-                                       uint16_t oob_buf = le_to_h_u16(data);
-                                       nand->controller->write_data(nand, oob_buf);
-                                       oob += 2;
-                                       i += 2;
-                               }
-                               else
-                               {
-                                       nand->controller->write_data(nand, *oob);
-                                       oob += 1;
-                                       i += 1;
-                               }
-                       }
+               for (i = 0; i < size; i += incr) {
+                       if (is16bit)
+                               write_data = le_to_h_u16(data);
+                       else
+                               write_data = *data;
+
+                       retval = nand->controller->write_data(nand, write_data);
+                       if (ERROR_OK != retval)
+                               break;
+
+                       data += incr;
                }
        }
 
+       return retval;
+}
+
+int nand_write_finish(struct nand_device *nand)
+{
+       int retval;
+       uint8_t status;
+
        nand->controller->command(nand, NAND_CMD_PAGEPROG);
 
        retval = nand->controller->nand_ready ?
@@ -900,18 +860,47 @@ int nand_write_page_raw(struct nand_device *nand, uint32_t page, uint8_t *data,
        if (!retval)
                return ERROR_NAND_OPERATION_TIMEOUT;
 
-       if ((retval = nand_read_status(nand, &status)) != ERROR_OK)
-       {
+       retval = nand_read_status(nand, &status);
+       if (ERROR_OK != retval) {
                LOG_ERROR("couldn't read status");
                return ERROR_NAND_OPERATION_FAILED;
        }
 
-       if (status & NAND_STATUS_FAIL)
-       {
-               LOG_ERROR("write operation didn't pass, status: 0x%2.2x", status);
+       if (status & NAND_STATUS_FAIL) {
+               LOG_ERROR("write operation didn't pass, status: 0x%2.2x",
+                               status);
                return ERROR_NAND_OPERATION_FAILED;
        }
 
        return ERROR_OK;
 }
 
+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)
+{
+       int retval;
+
+       retval = nand_page_command(nand, page, NAND_CMD_SEQIN, !data);
+       if (ERROR_OK != retval)
+               return retval;
+
+       if (data) {
+               retval = nand_write_data_page(nand, data, data_size);
+               if (ERROR_OK != retval) {
+                       LOG_ERROR("Unable to write data to NAND device");
+                       return retval;
+               }
+       }
+
+       if (oob) {
+               retval = nand_write_data_page(nand, oob, oob_size);
+               if (ERROR_OK != retval) {
+                       LOG_ERROR("Unable to write OOB data to NAND device");
+                       return retval;
+               }
+       }
+
+       return nand_write_finish(nand);
+}
+
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)