Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
adi_v5_cmsis_dap.c: Simplify debugging output
[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 95d1cea3087a904397f7e8354166e1dc433c581a..9028c9d5935768df0ddcb95d45ccefb4062a5377 100644 (file)
--- a/src/target/adi_v5_cmsis_dap.c
+++ b/src/target/adi_v5_cmsis_dap.c
@@ -54,35 +54,44 @@
 /* YUK! - but this is currently a global.... */
 extern struct jtag_interface *jtag_interface;
 
-static int (cmsis_dap_queue_ap_abort)(struct adiv5_dap *dap, uint8_t *ack)
+static int cmsis_dap_clear_sticky_errors(struct adiv5_dap *dap)
 {
-       LOG_DEBUG("CMSIS-ADI: cmsis_dap_queue_ap_abort");
+       LOG_DEBUG(" ");
 
-       /* FIXME: implement this properly cmsis-dap has DAP_WriteABORT()
-        * for now just hack @ everything */
-       return jtag_interface->swd->write_reg(
-                       (CMSIS_CMD_DP | CMSIS_CMD_WRITE | CMSIS_CMD_A32(DP_ABORT)), 0x1e);
+       const struct swd_driver *swd = jtag_interface->swd;
+       assert(swd);
+
+       return swd->write_reg(swd_cmd(false,  false, DP_ABORT),
+                             STKCMPCLR | STKERRCLR | WDERRCLR | ORUNERRCLR);
+}
+
+static int cmsis_dap_queue_ap_abort(struct adiv5_dap *dap, uint8_t *ack)
+{
+       LOG_DEBUG(" ");
+
+       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);
 }
 
 static int cmsis_dap_queue_dp_read(struct adiv5_dap *dap, unsigned reg, uint32_t *data)
 {
-       LOG_DEBUG("CMSIS-ADI: cmsis_dap_queue_dp_read %d", reg);
+       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) {
-               /* fault response */
-               uint8_t ack = retval & 0xff;
-               cmsis_dap_queue_ap_abort(dap, &ack);
-       }
+       if (retval != ERROR_OK)
+               cmsis_dap_clear_sticky_errors(dap);
 
        return retval;
 }
 
 static int (cmsis_dap_queue_dp_write)(struct adiv5_dap *dap, unsigned reg, uint32_t data)
 {
-       LOG_DEBUG("CMSIS-ADI: cmsis_dap_queue_dp_write %d 0x%08" PRIx32, reg, data);
+       LOG_DEBUG("reg = %d, data = 0x%08" PRIx32, reg, data);
 
        /* setting the ORUNDETECT bit causes issues for some targets,
         * disable until we find out why */
@@ -94,11 +103,8 @@ static int (cmsis_dap_queue_dp_write)(struct adiv5_dap *dap, unsigned reg, uint3
        int retval = jtag_interface->swd->write_reg(
                        (CMSIS_CMD_DP | CMSIS_CMD_WRITE | CMSIS_CMD_A32(reg)), data);
 
-       if (retval != ERROR_OK) {
-               /* fault response */
-               uint8_t ack = retval & 0xff;
-               cmsis_dap_queue_ap_abort(dap, &ack);
-       }
+       if (retval != ERROR_OK)
+               cmsis_dap_clear_sticky_errors(dap);
 
        return retval;
 }
@@ -123,16 +129,13 @@ static int (cmsis_dap_queue_ap_read)(struct adiv5_dap *dap, unsigned reg, uint32
        if (retval != ERROR_OK)
                return retval;
 
-       LOG_DEBUG("CMSIS-ADI: cmsis_dap_queue_ap_read %d", reg);
+       LOG_DEBUG("reg = %d", reg);
 
        retval = jtag_interface->swd->read_reg(
                        (CMSIS_CMD_AP | CMSIS_CMD_READ | CMSIS_CMD_A32(reg)), data);
 
-       if (retval != ERROR_OK) {
-               /* fault response */
-               uint8_t ack = retval & 0xff;
-               cmsis_dap_queue_ap_abort(dap, &ack);
-       }
+       if (retval != ERROR_OK)
+               cmsis_dap_clear_sticky_errors(dap);
 
        return retval;
 }
@@ -150,16 +153,13 @@ static int (cmsis_dap_queue_ap_write)(struct adiv5_dap *dap, unsigned reg, uint3
        if (retval != ERROR_OK)
                return retval;
 
-       LOG_DEBUG("CMSIS-ADI: cmsis_dap_queue_ap_write %d 0x%08" PRIx32, reg, data);
+       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);
 
-       if (retval != ERROR_OK) {
-               /* fault response */
-               uint8_t ack = retval & 0xff;
-               cmsis_dap_queue_ap_abort(dap, &ack);
-       }
+       if (retval != ERROR_OK)
+               cmsis_dap_clear_sticky_errors(dap);
 
        return retval;
 }
@@ -167,10 +167,38 @@ static int (cmsis_dap_queue_ap_write)(struct adiv5_dap *dap, unsigned reg, uint3
 /** Executes all queued DAP operations. */
 static int cmsis_dap_run(struct adiv5_dap *dap)
 {
-       LOG_DEBUG("CMSIS-ADI: cmsis_dap_run");
+       LOG_DEBUG(" ");
        /* FIXME: for now the CMSIS-DAP interface hard-wires a zero-size queue. */
+       int ret;
+       uint32_t ctrlstat;
 
-       return ERROR_OK;
+       /*
+         Some debug dongles do more than asked for(e.g. EDBG from
+         Atmel) behind the scene and issuing an AP write
+         may result in more than just APACC SWD transaction, which in
+         turn can possibly set sticky error bit in CTRL/STAT register
+         of the DP(an example would be writing SYSRESETREQ to AIRCR).
+         Such adapters may interpret CMSIS-DAP secification
+         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.
+       */
+       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;
+       }
+
+       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;
+               }
+       }
+
+       return ret;
 }
 
 const struct dap_ops cmsis_dap_ops = {
@@ -212,7 +240,7 @@ static const struct command_registration cmsis_dap_handlers[] = {
 
 static int cmsis_dap_select(struct command_context *ctx)
 {
-       LOG_DEBUG("CMSIS-ADI: cmsis_dap_select");
+       LOG_DEBUG(" ");
 
        int retval = register_commands(ctx, NULL, cmsis_dap_handlers);
 
@@ -247,7 +275,7 @@ static int cmsis_dap_init(struct command_context *ctx)
        uint32_t idcode;
        int status;
 
-       LOG_DEBUG("CMSIS-ADI: cmsis_dap_init");
+       LOG_DEBUG("CMSIS-ADI init");
 
        /* Force the DAP's ops vector for CMSIS-DAP mode.
         * messy - is there a better way? */
@@ -276,15 +304,13 @@ static int cmsis_dap_init(struct command_context *ctx)
        }
 #endif
 
-       uint8_t ack = 0;
-
        status = cmsis_dap_queue_dp_read(dap, DP_IDCODE, &idcode);
 
        if (status == ERROR_OK)
                LOG_INFO("IDCODE 0x%08" PRIx32, idcode);
 
        /* force clear all sticky faults */
-       cmsis_dap_queue_ap_abort(dap, &ack);
+       cmsis_dap_clear_sticky_errors(dap);
 
        /* this is a workaround to get polling working */
        jtag_add_reset(0, 0);
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)