X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fadi_v5_cmsis_dap.c;h=9cdf08abef1ad780cffa1f1de0d0d21b477c91e9;hb=refs%2Fchanges%2F32%2F2132%2F4;hp=9b591464394c18925d4f68887e48a2df81511c82;hpb=ccf4d6d64844410483d2d2513c2c4ed173604649;p=openocd.git diff --git a/src/target/adi_v5_cmsis_dap.c b/src/target/adi_v5_cmsis_dap.c index 9b59146439..9cdf08abef 100644 --- a/src/target/adi_v5_cmsis_dap.c +++ b/src/target/adi_v5_cmsis_dap.c @@ -56,42 +56,42 @@ extern struct jtag_interface *jtag_interface; static int cmsis_dap_clear_sticky_errors(struct adiv5_dap *dap) { - LOG_DEBUG("CMSIS-ADI: %s", __func__); + LOG_DEBUG(" "); 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) { - LOG_DEBUG("CMSIS-ADI: %s", __func__); + 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); + 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("CMSIS-ADI: cmsis_dap_queue_dp_read %d", reg); - - int retval = jtag_interface->swd->read_reg( - (CMSIS_CMD_DP | CMSIS_CMD_READ | CMSIS_CMD_A32(reg)), data); + LOG_DEBUG("reg = %d", reg); - 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) { - 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 */ @@ -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("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); + 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("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); + 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); - return ret; + if (retval == ERROR_OK && (ctrlstat & SSTICKYERR)) + LOG_WARNING("Adapter returned success despite SSTICKYERR being set."); + + if (retval != ERROR_OK || (ctrlstat & SSTICKYERR)) + cmsis_dap_clear_sticky_errors(dap); + + return retval; } const struct dap_ops cmsis_dap_ops = { @@ -258,7 +244,7 @@ static int cmsis_dap_select(struct command_context *ctx) return ERROR_FAIL; } - retval = swd->init(1); + retval = swd->init(); if (retval != ERROR_OK) { LOG_ERROR("unable to init CMSIS-DAP driver"); return retval; @@ -275,7 +261,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? */