Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
arm_adi_v5: put SWJ-DP back to JTAG mode at exit
[openocd.git] / src / target / adi_v5_swd.c
diff --git a/src/target/adi_v5_swd.c b/src/target/adi_v5_swd.c
index 60223f91163c134f7f8f4aa2034c24243051476c..b520223b0e7940cb93080b1b3a1c4e2ba0f5cd25 100644 (file)
--- a/src/target/adi_v5_swd.c
+++ b/src/target/adi_v5_swd.c
@@ -53,13 +53,11 @@
 
 #include <jtag/swd.h>
 
-/* YUK! - but this is currently a global.... */
-extern struct jtag_interface *jtag_interface;
 static bool do_sync;
 
 static void swd_finish_read(struct adiv5_dap *dap)
 {
-       const struct swd_driver *swd = jtag_interface->swd;
+       const struct swd_driver *swd = adiv5_dap_swd_driver(dap);
        if (dap->last_read != NULL) {
                swd->read_reg(swd_cmd(true, false, DP_RDBUFF), dap->last_read, 0);
                dap->last_read = NULL;
@@ -73,7 +71,7 @@ static int swd_queue_dp_read(struct adiv5_dap *dap, unsigned reg,
 
 static void swd_clear_sticky_errors(struct adiv5_dap *dap)
 {
-       const struct swd_driver *swd = jtag_interface->swd;
+       const struct swd_driver *swd = adiv5_dap_swd_driver(dap);
        assert(swd);
 
        swd->write_reg(swd_cmd(false,  false, DP_ABORT),
@@ -82,7 +80,7 @@ static void swd_clear_sticky_errors(struct adiv5_dap *dap)
 
 static int swd_run_inner(struct adiv5_dap *dap)
 {
-       const struct swd_driver *swd = jtag_interface->swd;
+       const struct swd_driver *swd = adiv5_dap_swd_driver(dap);
        int retval;
 
        retval = swd->run();
@@ -97,6 +95,7 @@ static int swd_run_inner(struct adiv5_dap *dap)
 
 static int swd_connect(struct adiv5_dap *dap)
 {
+       const struct swd_driver *swd = adiv5_dap_swd_driver(dap);
        uint32_t dpidr;
        int status;
 
@@ -107,12 +106,24 @@ static int swd_connect(struct adiv5_dap *dap)
         * MUST READ DPIDR
         */
 
+       /* Check if we should reset srst already when connecting, but not if reconnecting. */
+       if (!dap->do_reconnect) {
+               enum reset_types jtag_reset_config = jtag_get_reset_config();
+
+               if (jtag_reset_config & RESET_CNCT_UNDER_SRST) {
+                       if (jtag_reset_config & RESET_SRST_NO_GATING)
+                               swd_add_reset(1);
+                       else
+                               LOG_WARNING("\'srst_nogate\' reset_config option is required");
+               }
+       }
+
        /* Note, debugport_init() does setup too */
-       jtag_interface->swd->switch_seq(JTAG_TO_SWD);
+       swd->switch_seq(JTAG_TO_SWD);
 
        /* Clear link state, including the SELECT cache. */
        dap->do_reconnect = false;
-       dap->select = DP_SELECT_INVALID;
+       dap_invalidate_cache(dap);
 
        swd_queue_dp_read(dap, DP_DPIDR, &dpidr);
 
@@ -124,6 +135,7 @@ static int swd_connect(struct adiv5_dap *dap)
        if (status == ERROR_OK) {
                LOG_INFO("SWD DPIDR %#8.8" PRIx32, dpidr);
                dap->do_reconnect = false;
+               status = dap_dp_init(dap);
        } else
                dap->do_reconnect = true;
 
@@ -145,7 +157,7 @@ static int swd_check_reconnect(struct adiv5_dap *dap)
 
 static int swd_queue_ap_abort(struct adiv5_dap *dap, uint8_t *ack)
 {
-       const struct swd_driver *swd = jtag_interface->swd;
+       const struct swd_driver *swd = adiv5_dap_swd_driver(dap);
        assert(swd);
 
        swd->write_reg(swd_cmd(false,  false, DP_ABORT),
@@ -175,7 +187,7 @@ static void swd_queue_dp_bankselect(struct adiv5_dap *dap, unsigned reg)
 static int swd_queue_dp_read(struct adiv5_dap *dap, unsigned reg,
                uint32_t *data)
 {
-       const struct swd_driver *swd = jtag_interface->swd;
+       const struct swd_driver *swd = adiv5_dap_swd_driver(dap);
        assert(swd);
 
        int retval = swd_check_reconnect(dap);
@@ -191,7 +203,7 @@ static int swd_queue_dp_read(struct adiv5_dap *dap, unsigned reg,
 static int swd_queue_dp_write(struct adiv5_dap *dap, unsigned reg,
                uint32_t data)
 {
-       const struct swd_driver *swd = jtag_interface->swd;
+       const struct swd_driver *swd = adiv5_dap_swd_driver(dap);
        assert(swd);
 
        int retval = swd_check_reconnect(dap);
@@ -224,10 +236,9 @@ static void swd_queue_ap_bankselect(struct adiv5_ap *ap, unsigned reg)
 static int swd_queue_ap_read(struct adiv5_ap *ap, unsigned reg,
                uint32_t *data)
 {
-       const struct swd_driver *swd = jtag_interface->swd;
-       assert(swd);
-
        struct adiv5_dap *dap = ap->dap;
+       const struct swd_driver *swd = adiv5_dap_swd_driver(dap);
+       assert(swd);
 
        int retval = swd_check_reconnect(dap);
        if (retval != ERROR_OK)
@@ -243,10 +254,9 @@ static int swd_queue_ap_read(struct adiv5_ap *ap, unsigned reg,
 static int swd_queue_ap_write(struct adiv5_ap *ap, unsigned reg,
                uint32_t data)
 {
-       const struct swd_driver *swd = jtag_interface->swd;
-       assert(swd);
-
        struct adiv5_dap *dap = ap->dap;
+       const struct swd_driver *swd = adiv5_dap_swd_driver(dap);
+       assert(swd);
 
        int retval = swd_check_reconnect(dap);
        if (retval != ERROR_OK)
@@ -266,13 +276,25 @@ static int swd_run(struct adiv5_dap *dap)
        return swd_run_inner(dap);
 }
 
+/** Put the SWJ-DP back to JTAG mode */
+static void swd_quit(struct adiv5_dap *dap)
+{
+       const struct swd_driver *swd = adiv5_dap_swd_driver(dap);
+
+       swd->switch_seq(SWD_TO_JTAG);
+       /* flush the queue before exit */
+       swd->run();
+}
+
 const struct dap_ops swd_dap_ops = {
+       .connect = swd_connect,
        .queue_dp_read = swd_queue_dp_read,
        .queue_dp_write = swd_queue_dp_write,
        .queue_ap_read = swd_queue_ap_read,
        .queue_ap_write = swd_queue_ap_write,
        .queue_ap_abort = swd_queue_ap_abort,
        .run = swd_run,
+       .quit = swd_quit,
 };
 
 /*
@@ -369,15 +391,15 @@ static const struct command_registration swd_handlers[] = {
 
 static int swd_select(struct command_context *ctx)
 {
+       /* FIXME: only place where global 'jtag_interface' is still needed */
+       extern struct jtag_interface *jtag_interface;
+       const struct swd_driver *swd = jtag_interface->swd;
        int retval;
 
        retval = register_commands(ctx, NULL, swd_handlers);
-
        if (retval != ERROR_OK)
                return retval;
 
-       const struct swd_driver *swd = jtag_interface->swd;
-
         /* be sure driver is in SWD mode; start
          * with hardware default TRN (1), it can be changed later
          */
@@ -392,28 +414,14 @@ static int swd_select(struct command_context *ctx)
                return retval;
        }
 
-       /* force DAP into SWD mode (not JTAG) */
-       /*retval = dap_to_swd(target);*/
-
-       if (ctx->current_target) {
-               /* force DAP into SWD mode (not JTAG) */
-               struct target *target = get_current_target(ctx);
-               retval = dap_to_swd(target);
-       }
-
        return retval;
 }
 
 static int swd_init(struct command_context *ctx)
 {
-       struct target *target = get_current_target(ctx);
-       struct arm *arm = target_to_arm(target);
-       struct adiv5_dap *dap = arm->dap;
-       /* Force the DAP's ops vector for SWD mode.
-        * messy - is there a better way? */
-       arm->dap->ops = &swd_dap_ops;
-
-       return swd_connect(dap);
+       /* nothing done here, SWD is initialized
+        * together with the DAP */
+       return ERROR_OK;
 }
 
 static struct transport swd_transport = {
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)