Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
swd: Convert API to asynchronous
[openocd.git] / src / target / adi_v5_cmsis_dap.c
diff --git a/src/target/adi_v5_cmsis_dap.c b/src/target/adi_v5_cmsis_dap.c
index 9028c9d5935768df0ddcb95d45ccefb4062a5377..9c13e5a9287ff3008b635046568524a2ebb05bf3 100644 (file)
--- a/src/target/adi_v5_cmsis_dap.c
+++ b/src/target/adi_v5_cmsis_dap.c
@@ -61,8 +61,9 @@ static int cmsis_dap_clear_sticky_errors(struct adiv5_dap *dap)
        const struct swd_driver *swd = jtag_interface->swd;
        assert(swd);
 
-       return swd->write_reg(swd_cmd(false,  false, DP_ABORT),
-                             STKCMPCLR | STKERRCLR | WDERRCLR | ORUNERRCLR);
+       swd->write_reg(dap, (CMSIS_CMD_DP | CMSIS_CMD_WRITE | CMSIS_CMD_A32(DP_ABORT)),
+                       STKCMPCLR | STKERRCLR | WDERRCLR | ORUNERRCLR);
+       return ERROR_OK;
 }
 
 static int cmsis_dap_queue_ap_abort(struct adiv5_dap *dap, uint8_t *ack)
@@ -72,21 +73,20 @@ static int cmsis_dap_queue_ap_abort(struct adiv5_dap *dap, uint8_t *ack)
        const struct swd_driver *swd = jtag_interface->swd;
        assert(swd);
 
-       return swd->write_reg(swd_cmd(false,  false, DP_ABORT),
-                             DAPABORT | STKCMPCLR | STKERRCLR | WDERRCLR | ORUNERRCLR);
+       swd->write_reg(dap, (CMSIS_CMD_DP | CMSIS_CMD_WRITE | CMSIS_CMD_A32(DP_ABORT)),
+                       DAPABORT | STKCMPCLR | STKERRCLR | WDERRCLR | ORUNERRCLR);
+       return ERROR_OK;
 }
 
 static int cmsis_dap_queue_dp_read(struct adiv5_dap *dap, unsigned reg, uint32_t *data)
 {
        LOG_DEBUG("reg = %d", reg);
 
-       int retval = jtag_interface->swd->read_reg(
-                       (CMSIS_CMD_DP | CMSIS_CMD_READ | CMSIS_CMD_A32(reg)), data);
-
-       if (retval != ERROR_OK)
-               cmsis_dap_clear_sticky_errors(dap);
+       const struct swd_driver *swd = jtag_interface->swd;
+       assert(swd);
 
-       return retval;
+       swd->read_reg(dap, (CMSIS_CMD_DP | CMSIS_CMD_READ | CMSIS_CMD_A32(reg)), data);
+       return ERROR_OK;
 }
 
 static int (cmsis_dap_queue_dp_write)(struct adiv5_dap *dap, unsigned reg, uint32_t data)
@@ -100,13 +100,11 @@ static int (cmsis_dap_queue_dp_write)(struct adiv5_dap *dap, unsigned reg, uint3
                data &= ~CORUNDETECT;
        }
 
-       int retval = jtag_interface->swd->write_reg(
-                       (CMSIS_CMD_DP | CMSIS_CMD_WRITE | CMSIS_CMD_A32(reg)), data);
-
-       if (retval != ERROR_OK)
-               cmsis_dap_clear_sticky_errors(dap);
+       const struct swd_driver *swd = jtag_interface->swd;
+       assert(swd);
 
-       return retval;
+       swd->write_reg(dap, (CMSIS_CMD_DP | CMSIS_CMD_WRITE | CMSIS_CMD_A32(reg)), data);
+       return ERROR_OK;
 }
 
 /** Select the AP register bank matching bits 7:4 of reg. */
@@ -120,58 +118,47 @@ static int cmsis_dap_ap_q_bankselect(struct adiv5_dap *dap, unsigned reg)
        dap->ap_bank_value = select_ap_bank;
        select_ap_bank |= dap->ap_current;
 
-       return cmsis_dap_queue_dp_write(dap, DP_SELECT, select_ap_bank);
+       cmsis_dap_queue_dp_write(dap, DP_SELECT, select_ap_bank);
+       return ERROR_OK;
 }
 
 static int (cmsis_dap_queue_ap_read)(struct adiv5_dap *dap, unsigned reg, uint32_t *data)
 {
-       int retval = cmsis_dap_ap_q_bankselect(dap, reg);
-       if (retval != ERROR_OK)
-               return retval;
+       cmsis_dap_ap_q_bankselect(dap, reg);
 
        LOG_DEBUG("reg = %d", reg);
 
-       retval = jtag_interface->swd->read_reg(
-                       (CMSIS_CMD_AP | CMSIS_CMD_READ | CMSIS_CMD_A32(reg)), data);
+       const struct swd_driver *swd = jtag_interface->swd;
+       assert(swd);
 
-       if (retval != ERROR_OK)
-               cmsis_dap_clear_sticky_errors(dap);
+       swd->read_reg(dap, (CMSIS_CMD_AP | CMSIS_CMD_READ | CMSIS_CMD_A32(reg)), data);
 
-       return retval;
+       return ERROR_OK;
 }
 
 static int (cmsis_dap_queue_ap_write)(struct adiv5_dap *dap, unsigned reg, uint32_t data)
 {
-
-
        /* TODO: CSW_DBGSWENABLE (bit31) causes issues for some targets
         * disable until we find out why */
        if (reg == AP_REG_CSW)
                data &= ~CSW_DBGSWENABLE;
 
-       int retval = cmsis_dap_ap_q_bankselect(dap, reg);
-       if (retval != ERROR_OK)
-               return retval;
+       cmsis_dap_ap_q_bankselect(dap, reg);
 
        LOG_DEBUG("reg = %d, data = 0x%08" PRIx32, reg, data);
 
-       retval = jtag_interface->swd->write_reg(
-                       (CMSIS_CMD_AP | CMSIS_CMD_WRITE | CMSIS_CMD_A32(reg)), data);
+       const struct swd_driver *swd = jtag_interface->swd;
+       assert(swd);
 
-       if (retval != ERROR_OK)
-               cmsis_dap_clear_sticky_errors(dap);
+       swd->write_reg(dap, (CMSIS_CMD_AP | CMSIS_CMD_WRITE | CMSIS_CMD_A32(reg)), data);
 
-       return retval;
+       return ERROR_OK;
 }
 
 /** Executes all queued DAP operations. */
 static int cmsis_dap_run(struct adiv5_dap *dap)
 {
        LOG_DEBUG(" ");
-       /* FIXME: for now the CMSIS-DAP interface hard-wires a zero-size queue. */
-       int ret;
-       uint32_t ctrlstat;
-
        /*
          Some debug dongles do more than asked for(e.g. EDBG from
          Atmel) behind the scene and issuing an AP write
@@ -182,23 +169,22 @@ static int cmsis_dap_run(struct adiv5_dap *dap)
          differently and not guarantee to be report those failures
          via status byte of the return USB packet from CMSIS-DAP, so
          we need to check CTRL/STAT and if that happens to clear it.
+         Note that once the CMSIS-DAP SWD implementation starts queueing
+         transfers this will cause loss of the transfers after the
+         failed one. At least a warning is printed.
        */
-       ret = cmsis_dap_queue_dp_read(dap, DP_CTRL_STAT, &ctrlstat);
-       if (ret != ERROR_OK) {
-               LOG_ERROR("Failed to read CTRL/STAT register");
-               return ret;
-       }
+       uint32_t ctrlstat;
+       cmsis_dap_queue_dp_read(dap, DP_CTRL_STAT, &ctrlstat);
 
-       if (ctrlstat & SSTICKYERR) {
-               LOG_WARNING("SSTICKYERR was set, clearing it");
-               ret = cmsis_dap_clear_sticky_errors(dap);
-               if (ret != ERROR_OK) {
-                       LOG_ERROR("Failed to clear sticky errors");
-                       return ret;
-               }
-       }
+       int retval = jtag_interface->swd->run(dap);
+
+       if (retval == ERROR_OK && (ctrlstat & SSTICKYERR))
+               LOG_WARNING("Adapter returned success despite SSTICKYERR being set.");
 
-       return ret;
+       if (retval != ERROR_OK || (ctrlstat & SSTICKYERR))
+               cmsis_dap_clear_sticky_errors(dap);
+
+       return retval;
 }
 
 const struct dap_ops cmsis_dap_ops = {
@@ -240,7 +226,7 @@ static const struct command_registration cmsis_dap_handlers[] = {
 
 static int cmsis_dap_select(struct command_context *ctx)
 {
-       LOG_DEBUG(" ");
+       LOG_DEBUG("CMSIS-ADI: cmsis_dap_select");
 
        int retval = register_commands(ctx, NULL, cmsis_dap_handlers);
 
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)