Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
flash: nor: jtagspi: fix jtagspi_read_status() warning
[openocd.git] / src / flash / nor / jtagspi.c
diff --git a/src/flash/nor/jtagspi.c b/src/flash/nor/jtagspi.c
index 6ca5c3c25e2bf747ef7ece6a938a42fcbe3ee0e2..a73812d88a856b8783c1be83ffbbb95c024f688e 100644 (file)
--- a/src/flash/nor/jtagspi.c
+++ b/src/flash/nor/jtagspi.c
@@ -11,6 +11,8 @@
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
  *   GNU General Public License for more details.                          *
  *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -30,14 +32,13 @@ struct jtagspi_flash_bank {
        const struct flash_device *dev;
        int probed;
        uint32_t ir;
-       uint32_t dr_len;
 };
 
 FLASH_BANK_COMMAND_HANDLER(jtagspi_flash_bank_command)
 {
        struct jtagspi_flash_bank *info;
 
-       if (CMD_ARGC < 8)
+       if (CMD_ARGC < 7)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        info = malloc(sizeof(struct jtagspi_flash_bank));
@@ -50,7 +51,6 @@ FLASH_BANK_COMMAND_HANDLER(jtagspi_flash_bank_command)
        info->tap = NULL;
        info->probed = 0;
        COMMAND_PARSE_NUMBER(u32, CMD_ARGV[6], info->ir);
-       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[7], info->dr_len);
 
        return ERROR_OK;
 }
@@ -61,9 +61,6 @@ static void jtagspi_set_ir(struct flash_bank *bank)
        struct scan_field field;
        uint8_t buf[4];
 
-       if (buf_get_u32(info->tap->cur_instr, 0, info->tap->ir_length) == info->ir)
-               return;
-
        LOG_DEBUG("loading jtagspi ir");
        buf_set_u32(buf, 0, info->tap->ir_length, info->ir);
        field.num_bits = info->tap->ir_length;
@@ -82,28 +79,53 @@ static int jtagspi_cmd(struct flash_bank *bank, uint8_t cmd,
                uint32_t *addr, uint8_t *data, int len)
 {
        struct jtagspi_flash_bank *info = bank->driver_priv;
-       struct scan_field fields[3];
-       uint8_t cmd_buf[4];
+       struct scan_field fields[6];
+       uint8_t marker = 1;
+       uint8_t xfer_bits_buf[4];
+       uint8_t addr_buf[3];
        uint8_t *data_buf;
+       uint32_t xfer_bits;
        int is_read, lenb, n;
 
        /* LOG_DEBUG("cmd=0x%02x len=%i", cmd, len); */
 
+       is_read = (len < 0);
+       if (is_read)
+               len = -len;
+
        n = 0;
+
+       fields[n].num_bits = 1;
+       fields[n].out_value = &marker;
+       fields[n].in_value = NULL;
+       n++;
+
+       xfer_bits = 8 + len - 1;
+       /* cmd + read/write - 1 due to the counter implementation */
+       if (addr)
+               xfer_bits += 24;
+       h_u32_to_be(xfer_bits_buf, xfer_bits);
+       flip_u8(xfer_bits_buf, xfer_bits_buf, 4);
+       fields[n].num_bits = 32;
+       fields[n].out_value = xfer_bits_buf;
+       fields[n].in_value = NULL;
+       n++;
+
+       cmd = flip_u32(cmd, 8);
        fields[n].num_bits = 8;
-       cmd_buf[0] = cmd;
-       if (addr) {
-               h_u24_to_be(cmd_buf + 1, *addr);
-               fields[n].num_bits += 24;
-       }
-       flip_u8(cmd_buf, cmd_buf, 4);
-       fields[n].out_value = cmd_buf;
+       fields[n].out_value = &cmd;
        fields[n].in_value = NULL;
        n++;
 
-       is_read = (len < 0);
-       if (is_read)
-               len = -len;
+       if (addr) {
+               h_u24_to_be(addr_buf, *addr);
+               flip_u8(addr_buf, addr_buf, 3);
+               fields[n].num_bits = 24;
+               fields[n].out_value = addr_buf;
+               fields[n].in_value = NULL;
+               n++;
+       }
+
        lenb = DIV_ROUND_UP(len, 8);
        data_buf = malloc(lenb);
        if (lenb > 0) {
@@ -112,10 +134,11 @@ static int jtagspi_cmd(struct flash_bank *bank, uint8_t cmd,
                        return ERROR_FAIL;
                }
                if (is_read) {
-                       fields[n].num_bits = info->dr_len;
+                       fields[n].num_bits = jtag_tap_count_enabled();
                        fields[n].out_value = NULL;
                        fields[n].in_value = NULL;
                        n++;
+
                        fields[n].out_value = NULL;
                        fields[n].in_value = data_buf;
                } else {
@@ -128,6 +151,7 @@ static int jtagspi_cmd(struct flash_bank *bank, uint8_t cmd,
        }
 
        jtagspi_set_ir(bank);
+       /* passing from an IR scan to SHIFT-DR clears BYPASS registers */
        jtag_add_dr_scan(info->tap, n, fields, TAP_IDLE);
        jtag_execute_queue();
 
@@ -200,22 +224,23 @@ static int jtagspi_probe(struct flash_bank *bank)
 static void jtagspi_read_status(struct flash_bank *bank, uint32_t *status)
 {
        uint8_t buf;
-       jtagspi_cmd(bank, SPIFLASH_READ_STATUS, NULL, &buf, -8);
-       *status = buf;
-       /* LOG_DEBUG("status=0x%08" PRIx32, *status); */
+       if (jtagspi_cmd(bank, SPIFLASH_READ_STATUS, NULL, &buf, -8) == ERROR_OK) {
+               *status = buf;
+               /* LOG_DEBUG("status=0x%08" PRIx32, *status); */
+       }
 }
 
 static int jtagspi_wait(struct flash_bank *bank, int timeout_ms)
 {
        uint32_t status;
-       long long t0 = timeval_ms();
-       long long dt;
+       int64_t t0 = timeval_ms();
+       int64_t dt;
 
        do {
                dt = timeval_ms() - t0;
                jtagspi_read_status(bank, &status);
                if ((status & SPIFLASH_BSY_BIT) == 0) {
-                       LOG_DEBUG("waited %lld ms", dt);
+                       LOG_DEBUG("waited %" PRId64 " ms", dt);
                        return ERROR_OK;
                }
                alive_sleep(1);
@@ -242,14 +267,14 @@ static int jtagspi_bulk_erase(struct flash_bank *bank)
 {
        struct jtagspi_flash_bank *info = bank->driver_priv;
        int retval;
-       long long t0 = timeval_ms();
+       int64_t t0 = timeval_ms();
 
        retval = jtagspi_write_enable(bank);
        if (retval != ERROR_OK)
                return retval;
        jtagspi_cmd(bank, info->dev->chip_erase_cmd, NULL, NULL, 0);
        retval = jtagspi_wait(bank, bank->num_sectors*JTAGSPI_MAX_TIMEOUT);
-       LOG_INFO("took %lld ms", timeval_ms() - t0);
+       LOG_INFO("took %" PRId64 " ms", timeval_ms() - t0);
        return retval;
 }
 
@@ -257,14 +282,14 @@ static int jtagspi_sector_erase(struct flash_bank *bank, int sector)
 {
        struct jtagspi_flash_bank *info = bank->driver_priv;
        int retval;
-       long long t0 = timeval_ms();
+       int64_t t0 = timeval_ms();
 
        retval = jtagspi_write_enable(bank);
        if (retval != ERROR_OK)
                return retval;
        jtagspi_cmd(bank, info->dev->erase_cmd, &bank->sectors[sector].offset, NULL, 0);
        retval = jtagspi_wait(bank, JTAGSPI_MAX_TIMEOUT);
-       LOG_INFO("sector %d took %lld ms", sector, timeval_ms() - t0);
+       LOG_INFO("sector %d took %" PRId64 " ms", sector, timeval_ms() - t0);
        return retval;
 }
 
@@ -272,7 +297,7 @@ static int jtagspi_erase(struct flash_bank *bank, int first, int last)
 {
        int sector;
        struct jtagspi_flash_bank *info = bank->driver_priv;
-       int retval;
+       int retval = ERROR_OK;
 
        LOG_DEBUG("erase from sector %d to sector %d", first, last);
 
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)