Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
cfi: unsupported code paths now report and return error
[openocd.git] / src / flash / nand / mx2.c
diff --git a/src/flash/nand/mx2.c b/src/flash/nand/mx2.c
index 147546d7483d53bf25e304e53b9d8f5f61c21dff..6c3c5508f2e20b1efd7fb40b3e51172aca8a85dd 100644 (file)
--- a/src/flash/nand/mx2.c
+++ b/src/flash/nand/mx2.c
@@ -73,7 +73,6 @@ static int do_data_output(struct nand_device *nand);
 
 static int imx27_command(struct nand_device *nand, uint8_t command);
 static int imx27_address(struct nand_device *nand, uint8_t address);
-static int imx27_controller_ready(struct nand_device *nand, int tout);
 
 NAND_DEVICE_COMMAND_HANDLER(imx27_nand_device_command)
 {
@@ -87,11 +86,6 @@ NAND_DEVICE_COMMAND_HANDLER(imx27_nand_device_command)
        }
 
        nand->controller_priv = mx2_nf_info;
-       mx2_nf_info->target = get_target(CMD_ARGV[1]);
-       if (mx2_nf_info->target == NULL) {
-               LOG_ERROR("target '%s' not defined", CMD_ARGV[1]);
-               return ERROR_FAIL;
-       }
        if (CMD_ARGC < 3) {
                LOG_ERROR("use \"nand device imx27 target noecc|hwecc\"");
                return ERROR_FAIL;
@@ -109,9 +103,9 @@ NAND_DEVICE_COMMAND_HANDLER(imx27_nand_device_command)
        mx2_nf_info->optype = MX2_NF_DATAOUT_PAGE;
        mx2_nf_info->fin = MX2_NF_FIN_NONE;
        mx2_nf_info->flags.target_little_endian =
-       (mx2_nf_info->target->endianness == TARGET_LITTLE_ENDIAN);
+       (nand->target->endianness == TARGET_LITTLE_ENDIAN);
        /*
-        * testing host endianess
+        * testing host endianness
         */
        x = 1;
        if (*(char *) &x == 1)
@@ -124,7 +118,7 @@ NAND_DEVICE_COMMAND_HANDLER(imx27_nand_device_command)
 static int imx27_init(struct nand_device *nand)
 {
        struct mx2_nf_controller *mx2_nf_info = nand->controller_priv;
-       struct target *target = mx2_nf_info->target;
+       struct target *target = nand->target;
 
        int validate_target_result;
        uint16_t buffsize_register_content;
@@ -194,8 +188,7 @@ static int imx27_init(struct nand_device *nand)
 
 static int imx27_read_data(struct nand_device *nand, void *data)
 {
-       struct mx2_nf_controller *mx2_nf_info = nand->controller_priv;
-       struct target *target = mx2_nf_info->target;
+       struct target *target = nand->target;
        int validate_target_result;
        int try_data_output_from_nand_chip;
        /*
@@ -229,11 +222,6 @@ static int imx27_write_data(struct nand_device *nand, uint16_t data)
        return ERROR_NAND_OPERATION_FAILED;
 }
 
-static int imx27_nand_ready(struct nand_device *nand, int timeout)
-{
-       return imx27_controller_ready(nand, timeout);
-}
-
 static int imx27_reset(struct nand_device *nand)
 {
        /*
@@ -250,7 +238,7 @@ static int imx27_reset(struct nand_device *nand)
 static int imx27_command(struct nand_device *nand, uint8_t command)
 {
        struct mx2_nf_controller *mx2_nf_info = nand->controller_priv;
-       struct target *target = mx2_nf_info->target;
+       struct target *target = nand->target;
        int validate_target_result;
        int poll_result;
        /*
@@ -319,8 +307,7 @@ static int imx27_command(struct nand_device *nand, uint8_t command)
 
 static int imx27_address(struct nand_device *nand, uint8_t address)
 {
-       struct mx2_nf_controller *mx2_nf_info = nand->controller_priv;
-       struct target *target = mx2_nf_info->target;
+       struct target *target = nand->target;
        int validate_target_result;
        int poll_result;
        /*
@@ -342,11 +329,10 @@ static int imx27_address(struct nand_device *nand, uint8_t address)
        return ERROR_OK;
 }
 
-static int imx27_controller_ready(struct nand_device *nand, int tout)
+static int imx27_nand_ready(struct nand_device *nand, int tout)
 {
        uint16_t poll_complete_status;
-       struct mx2_nf_controller *mx2_nf_info = nand->controller_priv;
-       struct target *target = mx2_nf_info->target;
+       struct target *target = nand->target;
        int validate_target_result;
 
        /*
@@ -372,7 +358,7 @@ static int imx27_write_page(struct nand_device *nand, uint32_t page,
                             uint32_t oob_size)
 {
        struct mx2_nf_controller *mx2_nf_info = nand->controller_priv;
-       struct target *target = mx2_nf_info->target;
+       struct target *target = nand->target;
        int retval;
        uint16_t nand_status_content;
        uint16_t swap1, swap2, new_swap1;
@@ -495,7 +481,7 @@ static int imx27_read_page(struct nand_device *nand, uint32_t page,
                            uint32_t oob_size)
 {
        struct mx2_nf_controller *mx2_nf_info = nand->controller_priv;
-       struct target *target = mx2_nf_info->target;
+       struct target *target = nand->target;
        int retval;
        uint16_t swap1, swap2, new_swap1;
        if (data_size % 2) {
@@ -515,15 +501,20 @@ static int imx27_read_page(struct nand_device *nand, uint32_t page,
                return retval;
        }
        /* Reset address_cycles before imx27_command ?? */
-       retval = ERROR_OK;
-       retval |= imx27_command(nand, NAND_CMD_READ0);
-
-       retval |= imx27_address(nand, 0); //col
-       retval |= imx27_address(nand, 0); //col
-       retval |= imx27_address(nand, page & 0xff); //page address
-       retval |= imx27_address(nand, (page >> 8) & 0xff); //page address
-       retval |= imx27_address(nand, (page >> 16) & 0xff); //page address
-       retval |= imx27_command(nand, NAND_CMD_READSTART);
+       retval = imx27_command(nand, NAND_CMD_READ0);
+       if (retval != ERROR_OK) return retval;
+       retval = imx27_address(nand, 0); //col
+       if (retval != ERROR_OK) return retval;
+       retval = imx27_address(nand, 0); //col
+       if (retval != ERROR_OK) return retval;
+       retval = imx27_address(nand, page & 0xff); //page address
+       if (retval != ERROR_OK) return retval;
+       retval = imx27_address(nand, (page >> 8) & 0xff); //page address
+       if (retval != ERROR_OK) return retval;
+       retval = imx27_address(nand, (page >> 16) & 0xff); //page address
+       if (retval != ERROR_OK) return retval;
+       retval = imx27_command(nand, NAND_CMD_READSTART);
+       if (retval != ERROR_OK) return retval;
 
        target_write_u16(target, MX2_NF_BUFADDR, 0);
        mx2_nf_info->fin = MX2_NF_FIN_DATAOUT;
@@ -581,7 +572,7 @@ static int imx27_read_page(struct nand_device *nand, uint32_t page,
 static int initialize_nf_controller(struct nand_device *nand)
 {
        struct mx2_nf_controller *mx2_nf_info = nand->controller_priv;
-       struct target *target = mx2_nf_info->target;
+       struct target *target = nand->target;
        uint16_t work_mode;
        uint16_t temp;
        /*
@@ -695,7 +686,7 @@ static int poll_for_complete_op(struct target * target, const char *text)
 static int validate_target_state(struct nand_device *nand)
 {
        struct mx2_nf_controller *mx2_nf_info = nand->controller_priv;
-       struct target *target = mx2_nf_info->target;
+       struct target *target = nand->target;
 
        if (target->state != TARGET_HALTED) {
                LOG_ERROR(target_not_halted_err_msg);
@@ -715,7 +706,7 @@ static int validate_target_state(struct nand_device *nand)
 static int do_data_output(struct nand_device *nand)
 {
        struct mx2_nf_controller *mx2_nf_info = nand->controller_priv;
-       struct target *target = mx2_nf_info->target;
+       struct target *target = nand->target;
        int poll_result;
        uint16_t ecc_status;
        switch(mx2_nf_info->fin) {
@@ -771,6 +762,5 @@ struct nand_flash_controller imx27_nand_flash_controller = {
        .read_data              = &imx27_read_data,
        .write_page             = &imx27_write_page,
        .read_page              = &imx27_read_page,
-       .controller_ready       = &imx27_controller_ready,
        .nand_ready             = &imx27_nand_ready,
 };
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)