summaryrefslogtreecommitdiff
path: root/src/target
diff options
context:
space:
mode:
Diffstat (limited to 'src/target')
-rw-r--r--src/target/adi_v5_swd.c281
-rw-r--r--src/target/arm_adi_v5.c8
-rw-r--r--src/target/arm_adi_v5.h3
3 files changed, 284 insertions, 8 deletions
diff --git a/src/target/adi_v5_swd.c b/src/target/adi_v5_swd.c
index f103e4b0..39f38572 100644
--- a/src/target/adi_v5_swd.c
+++ b/src/target/adi_v5_swd.c
@@ -20,8 +20,26 @@
/**
* @file
- * This file implements SWD transport support for cores implementing
- the ARM Debug Interface version 5 (ADIv5).
+ * Utilities to support ARM "Serial Wire Debug" (SWD), a low pin-count debug
+ * link protocol used in cases where JTAG is not wanted. This is coupled to
+ * recent versions of ARM's "CoreSight" debug framework. This specific code
+ * is a transport level interface, with "target/arm_adi_v5.[hc]" code
+ * understanding operation semantics, shared with the JTAG transport.
+ *
+ * Single-DAP support only.
+ *
+ * for details, see "ARM IHI 0031A"
+ * ARM Debug Interface v5 Architecture Specification
+ * especially section 5.3 for SWD protocol
+ *
+ * On many chips (most current Cortex-M3 parts) SWD is a run-time alternative
+ * to JTAG. Boards may support one or both. There are also SWD-only chips,
+ * (using SW-DP not SWJ-DP).
+ *
+ * Even boards that also support JTAG can benefit from SWD support, because
+ * usually there's no way to access the SWO trace view mechanism in JTAG mode.
+ * That is, trace access may require SWD support.
+ *
*/
#ifdef HAVE_CONFIG_H
@@ -32,6 +50,83 @@
#include "arm_adi_v5.h"
#include <helper/time_support.h>
+#include <jtag/transport.h>
+#include <jtag/interface.h>
+
+#include <jtag/swd.h>
+
+
+
+static int swd_queue_dp_read(struct adiv5_dap *dap, unsigned reg,
+ uint32_t *data)
+{
+ // REVISIT status return vs ack ...
+ return swd->read_reg(swd_cmd(true, false, reg), data);
+}
+
+static int swd_queue_idcode_read(struct adiv5_dap *dap,
+ uint8_t *ack, uint32_t *data)
+{
+ int status = swd_queue_dp_read(dap, DP_IDCODE, data);
+ if (status < 0)
+ return status;
+ *ack = status;
+ // ??
+ return ERROR_OK;
+}
+
+static int (swd_queue_dp_write)(struct adiv5_dap *dap, unsigned reg,
+ uint32_t data)
+{
+ // REVISIT status return vs ack ...
+ return swd->write_reg(swd_cmd(false, false, reg), data);
+}
+
+
+static int (swd_queue_ap_read)(struct adiv5_dap *dap, unsigned reg,
+ uint32_t *data)
+{
+ // REVISIT APSEL ...
+ // REVISIT status return ...
+ return swd->read_reg(swd_cmd(true, true, reg), data);
+}
+
+static int (swd_queue_ap_write)(struct adiv5_dap *dap, unsigned reg,
+ uint32_t data)
+{
+ // REVISIT APSEL ...
+ // REVISIT status return ...
+ return swd->write_reg(swd_cmd(false, true, reg), data);
+}
+
+static int (swd_queue_ap_abort)(struct adiv5_dap *dap, uint8_t *ack)
+{
+ return ERROR_FAIL;
+}
+
+/** Executes all queued DAP operations. */
+static int swd_run(struct adiv5_dap *dap)
+{
+ /* for now the SWD interface hard-wires a zero-size queue. */
+
+ /* FIXME but we still need to check and scrub
+ * any hardware errors ...
+ */
+ return ERROR_OK;
+}
+
+const struct dap_ops swd_dap_ops = {
+ .is_swd = true,
+
+ .queue_idcode_read = swd_queue_idcode_read,
+ .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,
+};
+
/*
* This represents the bits which must be sent out on TMS/SWDIO to
* switch a DAP implemented using an SWJ-DP module into SWD mode.
@@ -48,7 +143,7 @@ static const uint8_t jtag2swd_bitseq[] = {
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
/* Switching sequence enables SWD and disables JTAG
* NOTE: bits in the DP's IDCODE may expose the need for
- * an old/deprecated sequence (0xb6 0xed).
+ * an old/obsolete/deprecated sequence (0xb6 0xed).
*/
0x9e, 0xe7,
/* More than 50 TCK/SWCLK cycles with TMS/SWDIO high,
@@ -72,12 +167,13 @@ static const uint8_t jtag2swd_bitseq[] = {
*/
int dap_to_swd(struct target *target)
{
+ struct arm *arm = target_to_arm(target);
int retval;
LOG_DEBUG("Enter SWD mode");
- /* REVISIT it's nasty to need to make calls to a "jtag"
- * subsystem if the link isn't in JTAG mode...
+ /* REVISIT it's ugly to need to make calls to a "jtag"
+ * subsystem if the link may not be in JTAG mode...
*/
retval = jtag_add_tms_seq(8 * sizeof(jtag2swd_bitseq),
@@ -85,8 +181,181 @@ int dap_to_swd(struct target *target)
if (retval == ERROR_OK)
retval = jtag_execute_queue();
- /* REVISIT set up the DAP's ops vector for SWD mode. */
+ /* set up the DAP's ops vector for SWD mode. */
+ arm->dap->ops = &swd_dap_ops;
return retval;
}
+
+
+COMMAND_HANDLER(handle_swd_wcr)
+{
+ int retval;
+ struct target *target = get_current_target(CMD_CTX);
+ struct arm *arm = target_to_arm(target);
+struct adiv5_dap *dap = arm->dap;
+ uint32_t wcr;
+ unsigned trn, scale = 0;
+
+
+ switch (CMD_ARGC) {
+ /* no-args: just dump state */
+ case 0:
+ //retval = swd_queue_dp_read(dap, DP_WCR, &wcr);
+ retval = dap_queue_dp_read(dap, DP_WCR, &wcr);
+ if (retval == ERROR_OK)
+ dap->ops->run(dap);
+ if (retval != ERROR_OK) {
+ LOG_ERROR("can't read WCR?");
+ return retval;
+ }
+
+ command_print(CMD_CTX,
+ "turnaround=%d, prescale=%d",
+ WCR_TO_TRN(wcr),
+ WCR_TO_PRESCALE(wcr));
+ return ERROR_OK;
+
+ case 2: /* TRN and prescale */
+ COMMAND_PARSE_NUMBER(uint, CMD_ARGV[1], scale);
+ if (scale > 7) {
+ LOG_ERROR("prescale %d is too big", scale);
+ return ERROR_FAIL;
+ }
+ /* FALL THROUGH */
+
+ case 1: /* TRN only */
+ COMMAND_PARSE_NUMBER(uint, CMD_ARGV[0], trn);
+ if (trn < 1 || trn > 4) {
+ LOG_ERROR("turnaround %d is invalid", trn);
+ return ERROR_FAIL;
+ }
+
+ wcr = ((trn - 1) << 8) | scale;
+ /* FIXME
+ * write WCR ...
+ * then, re-init adapter with new TRN
+ */
+ LOG_ERROR("can't yet modify WCR");
+ return ERROR_FAIL;
+
+ default: /* too many arguments */
+ return ERROR_COMMAND_SYNTAX_ERROR;
+ }
+}
+
+static const struct command_registration swd_commands[] = {
+ {
+ /*
+ * Set up SWD and JTAG targets identically, unless/until
+ * infrastructure improves ... meanwhile, ignore all
+ * JTAG-specific stuff like IR length for SWD.
+ *
+ * REVISIT can we verify "just one SWD DAP" here/early?
+ */
+ .name = "newdap",
+ .jim_handler = jim_jtag_newtap,
+ .mode = COMMAND_CONFIG,
+ .help = "declare a new SWD DAP"
+ },
+ {
+ .name = "wcr",
+ .handler = handle_swd_wcr,
+ .mode = COMMAND_ANY,
+ .help = "display or update DAP's WCR register",
+ .usage = "turnaround (1..4), prescale (0..7)",
+ },
+
+ /* REVISIT -- add a command for SWV trace on/off */
+ COMMAND_REGISTRATION_DONE
+};
+
+static const struct command_registration swd_handlers[] = {
+ {
+ .name = "swd",
+ .mode = COMMAND_ANY,
+ .help = "SWD command group",
+ .chain = swd_commands,
+ },
+ COMMAND_REGISTRATION_DONE
+};
+
+static int swd_select(struct command_context *ctx)
+{
+ struct target *target = get_current_target(ctx);
+ int retval;
+
+ retval = register_commands(ctx, NULL, swd_handlers);
+
+ if (retval != ERROR_OK)
+ return retval;
+
+ /* be sure driver is in SWD mode; start
+ * with hardware default TRN (1), it can be changed later
+ */
+ if (!swd || !swd->read_reg || !swd->write_reg || !swd->init) {
+ LOG_DEBUG("no SWD driver?");
+ return ERROR_FAIL;
+ }
+
+ retval = swd->init(1);
+ if (retval != ERROR_OK) {
+ LOG_DEBUG("can't init SWD driver");
+ return retval;
+ }
+
+ /* force DAP into SWD mode (not JTAG) */
+ 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;
+ uint32_t idcode;
+ int status;
+
+
+ /* FIXME validate transport config ... is the
+ * configured DAP present (check IDCODE)?
+ * Is *only* one DAP configured?
+ *
+ * MUST READ IDCODE
+ */
+
+ /* Note, debugport_init() does setup too */
+
+ uint8_t ack;
+
+ status = swd_queue_idcode_read(dap, &ack, &idcode);
+
+ if (status == ERROR_OK)
+ LOG_INFO("SWD IDCODE %#8.8x", idcode);
+
+ return status;
+
+}
+
+static struct transport swd_transport = {
+ .name = "swd",
+ .select = swd_select,
+ .init = swd_init,
+};
+
+static void swd_constructor(void) __attribute__((constructor));
+static void swd_constructor(void)
+{
+ transport_register(&swd_transport);
+}
+
+/** Returns true if the current debug session
+ * is using SWD as its transport.
+ */
+bool transport_is_swd(void)
+{
+ return get_current_transport() == &swd_transport;
+}
diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index 81edba4e..69a3ce7a 100644
--- a/src/target/arm_adi_v5.c
+++ b/src/target/arm_adi_v5.c
@@ -913,8 +913,12 @@ int ahbap_debugport_init(struct adiv5_dap *dap)
LOG_DEBUG(" ");
- /* JTAG-DP or SWJ-DP, in JTAG mode */
- dap->ops = &jtag_dp_ops;
+ /* JTAG-DP or SWJ-DP, in JTAG mode
+ * ... for SWD mode this is patched as part
+ * of link switchover
+ */
+ if (!dap->ops)
+ dap->ops = &jtag_dp_ops;
/* Default MEM-AP setup.
*
diff --git a/src/target/arm_adi_v5.h b/src/target/arm_adi_v5.h
index 6c1808a5..f64f7c84 100644
--- a/src/target/arm_adi_v5.h
+++ b/src/target/arm_adi_v5.h
@@ -59,6 +59,9 @@
#define DP_SELECT 0x8 /* JTAG: r/w; SWD: write */
#define DP_RDBUFF 0xC /* read-only */
+#define WCR_TO_TRN(wcr) (1 + (3 & ((wcr)) >> 8)) /* 1..4 clocks */
+#define WCR_TO_PRESCALE(wcr) (7 & ((wcr))) /* impl defined */
+
/* Fields of the DP's AP ABORT register */
#define DAPABORT (1 << 0)
#define STKCMPCLR (1 << 1) /* SWD-only */
generated by cgit v1.2.3 (git 2.46.0) at 2024-12-23 10:52:23 +0000