flash/jtagspi: sending command and setting parameters without probing.

[openocd.git] / src / flash / nor / jtagspi.c

diff --git a/src/flash/nor/jtagspi.c b/src/flash/nor/jtagspi.c
index ba1160ad517f19f0542313e22efa3ef0fea5ff8e..866548a7e0148b44c71d5d5e0622145b37a6b6d3 100644 (file)
--- a/src/flash/nor/jtagspi.c
+++ b/src/flash/nor/jtagspi.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 /***************************************************************************
  *   Copyright (C) 2015 Robert Jordens <jordens@gmail.com>                 *
@@ -41,7 +41,11 @@ FLASH_BANK_COMMAND_HANDLER(jtagspi_flash_bank_command)
        bank->sectors = NULL;
        bank->driver_priv = info;
 
-       info->tap = NULL;
+       if (!bank->target->tap) {
+               LOG_ERROR("Target has no JTAG tap");
+               return ERROR_FAIL;
+       }
+       info->tap = bank->target->tap;
        info->probed = false;
        COMMAND_PARSE_NUMBER(u32, CMD_ARGV[6], info->ir);
 
@@ -161,7 +165,12 @@ COMMAND_HANDLER(jtagspi_handle_set)
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
-       retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
+       /* calling flash_command_get_bank without probing because handle_set is used
+          to set device parameters if not autodetected. So probing would fail
+          anyhow.
+       */
+       retval = CALL_COMMAND_HANDLER(flash_command_get_bank_probe_optional, 0,
+               &bank, false);
        if (ERROR_OK != retval)
                return retval;
        info = bank->driver_priv;
@@ -312,7 +321,13 @@ COMMAND_HANDLER(jtagspi_handle_cmd)
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
-       retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
+       /* calling flash_command_get_bank without probing because we like to be
+          able to send commands before auto-probing occurred. For example sending
+          "release from power down" is needed before probing when flash is in
+          power down mode.
+        */
+       retval = CALL_COMMAND_HANDLER(flash_command_get_bank_probe_optional, 0,
+                                                               &bank, false);
        if (ERROR_OK != retval)
                return retval;
 
@@ -329,7 +344,7 @@ COMMAND_HANDLER(jtagspi_handle_cmd)
 
        /* process command */
        ptr = &read_buffer[0];
-       jtagspi_cmd(bank, write_buffer[0], &write_buffer[1], num_write - 1, ptr, -num_read);
+       retval = jtagspi_cmd(bank, write_buffer[0], &write_buffer[1], num_write - 1, ptr, -num_read);
        if (retval != ERROR_OK)
                return retval;
 
@@ -381,12 +396,6 @@ static int jtagspi_probe(struct flash_bank *bank)
        }
        info->probed = false;
 
-       if (!bank->target->tap) {
-               LOG_ERROR("Target has no JTAG tap");
-               return ERROR_FAIL;
-       }
-       info->tap = bank->target->tap;
-
        jtagspi_cmd(bank, SPIFLASH_READ_ID, NULL, 0, in_buf, -3);
        /* the table in spi.c has the manufacturer byte (first) as the lsb */
        id = le_to_h_u24(in_buf);
@@ -518,7 +527,7 @@ static int jtagspi_bulk_erase(struct flash_bank *bank)
        if (retval != ERROR_OK)
                return retval;
 
-       jtagspi_cmd(bank, info->dev.chip_erase_cmd, NULL, 0, NULL, 0);
+       retval = jtagspi_cmd(bank, info->dev.chip_erase_cmd, NULL, 0, NULL, 0);
        if (retval != ERROR_OK)
                return retval;