* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the
* Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
***************************************************************************/
/**
#include "arm_adi_v5.h"
#include <helper/time_support.h>
-#include <jtag/transport.h>
+#include <transport/transport.h>
#include <jtag/interface.h>
#include <jtag/swd.h>
+/* YUK! - but this is currently a global.... */
+extern struct jtag_interface *jtag_interface;
+static int (swd_queue_dp_write)(struct adiv5_dap *dap, unsigned reg,
+ uint32_t data);
+
+static int swd_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),
+ STKCMPCLR | STKERRCLR | WDERRCLR | ORUNERRCLR);
+}
+
+/** Select the DP register bank matching bits 7:4 of reg. */
+static int swd_queue_dp_bankselect(struct adiv5_dap *dap, unsigned reg)
+{
+ uint32_t select_dp_bank = (reg & 0x000000F0) >> 4;
+
+ if (reg == DP_SELECT)
+ return ERROR_OK;
+
+ if (select_dp_bank == dap->dp_bank_value)
+ return ERROR_OK;
+
+ dap->dp_bank_value = select_dp_bank;
+ select_dp_bank |= dap->ap_current | dap->ap_bank_value;
+
+ return swd_queue_dp_write(dap, DP_SELECT, select_dp_bank);
+}
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);
+ int retval;
+ /* REVISIT status return vs ack ... */
+ const struct swd_driver *swd = jtag_interface->swd;
+ assert(swd);
+
+ retval = swd_queue_dp_bankselect(dap, reg);
+ if (retval != ERROR_OK)
+ return retval;
+
+ retval = swd->read_reg(swd_cmd(true, false, reg), data);
+
+ if (retval != ERROR_OK) {
+ /* fault response */
+ uint8_t ack = retval & 0xff;
+ swd_queue_ap_abort(dap, &ack);
+ }
+
+ return retval;
}
static int swd_queue_idcode_read(struct adiv5_dap *dap,
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);
+ int retval;
+ /* REVISIT status return vs ack ... */
+ const struct swd_driver *swd = jtag_interface->swd;
+ assert(swd);
+
+ retval = swd_queue_dp_bankselect(dap, reg);
+ if (retval != ERROR_OK)
+ return retval;
+
+ retval = swd->write_reg(swd_cmd(false, false, reg), data);
+
+ if (retval != ERROR_OK) {
+ /* fault response */
+ uint8_t ack = retval & 0xff;
+ swd_queue_ap_abort(dap, &ack);
+ }
+
+ return retval;
}
+/** Select the AP register bank matching bits 7:4 of reg. */
+static int swd_queue_ap_bankselect(struct adiv5_dap *dap, unsigned reg)
+{
+ uint32_t select_ap_bank = reg & 0x000000F0;
+
+ if (select_ap_bank == dap->ap_bank_value)
+ return ERROR_OK;
+
+ dap->ap_bank_value = select_ap_bank;
+ select_ap_bank |= dap->ap_current | dap->dp_bank_value;
+
+ return swd_queue_dp_write(dap, DP_SELECT, select_ap_bank);
+}
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);
+ /* REVISIT status return ... */
+ const struct swd_driver *swd = jtag_interface->swd;
+ assert(swd);
+
+ int retval = swd_queue_ap_bankselect(dap, reg);
+ if (retval != ERROR_OK)
+ return retval;
+
+ retval = swd->read_reg(swd_cmd(true, true, reg), data);
+
+ if (retval != ERROR_OK) {
+ /* fault response */
+ uint8_t ack = retval & 0xff;
+ swd_queue_ap_abort(dap, &ack);
+ }
+
+ return retval;
}
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);
-}
+ /* REVISIT status return ... */
+ const struct swd_driver *swd = jtag_interface->swd;
+ assert(swd);
-static int (swd_queue_ap_abort)(struct adiv5_dap *dap, uint8_t *ack)
-{
- return ERROR_FAIL;
+ int retval = swd_queue_ap_bankselect(dap, reg);
+ if (retval != ERROR_OK)
+ return retval;
+
+ retval = swd->write_reg(swd_cmd(false, true, reg), data);
+
+ if (retval != ERROR_OK) {
+ /* fault response */
+ uint8_t ack = retval & 0xff;
+ swd_queue_ap_abort(dap, &ack);
+ }
+
+ return retval;
}
/** Executes all queued DAP operations. */
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;
+ 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 = 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);
}
command_print(CMD_CTX,
- "turnaround=%d, prescale=%d",
+ "turnaround=%" PRIu32 ", prescale=%" PRIu32,
WCR_TO_TRN(wcr),
WCR_TO_PRESCALE(wcr));
return ERROR_OK;
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;
+ 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
*/
return ERROR_FAIL;
}
- retval = swd->init(1);
+ 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);
+ /*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;
}
{
struct target *target = get_current_target(ctx);
struct arm *arm = target_to_arm(target);
-struct adiv5_dap *dap = arm->dap;
+ struct adiv5_dap *dap = arm->dap;
uint32_t idcode;
int status;
+ /* Force the DAP's ops vector for SWD mode.
+ * messy - is there a better way? */
+ arm->dap->ops = &swd_dap_ops;
/* FIXME validate transport config ... is the
* configured DAP present (check IDCODE)?
status = swd_queue_idcode_read(dap, &ack, &idcode);
if (status == ERROR_OK)
- LOG_INFO("SWD IDCODE %#8.8x", idcode);
+ LOG_INFO("SWD IDCODE %#8.8" PRIx32, idcode);
- return status;
+ /* force clear all sticky faults */
+ swd_queue_ap_abort(dap, &ack);
+ /* this is a workaround to get polling working */
+ jtag_add_reset(0, 0);
+
+ return status;
}
static struct transport swd_transport = {