From 13c3c934d2bdc3fd8a3ec008395179345b0cc84d Mon Sep 17 00:00:00 2001 From: Uwe Bonnes Date: Sun, 19 Apr 2020 15:50:50 +0200 Subject: [PATCH] Hosted: Add Stlink, remove old pc-stlinkv2 platform --- src/platforms/hosted/Makefile.inc | 1 + src/platforms/hosted/platform.c | 146 ++- src/platforms/hosted/platform.h | 6 + src/platforms/hosted/stlinkv2.c | 671 ++++------- src/platforms/hosted/stlinkv2.h | 30 +- src/platforms/pc-stlinkv2/Makefile.inc | 14 - src/platforms/pc-stlinkv2/README.md | 25 - src/platforms/pc-stlinkv2/jtagtap.c | 0 src/platforms/pc-stlinkv2/platform.c | 115 -- src/platforms/pc-stlinkv2/platform.h | 46 - src/platforms/pc-stlinkv2/stlinkv2.c | 1435 ------------------------ src/platforms/pc-stlinkv2/stlinkv2.h | 52 - src/platforms/pc-stlinkv2/swdptap.c | 0 src/platforms/pc/cl_utils.c | 23 +- src/platforms/pc/cl_utils.h | 1 - src/platforms/pc/libusb_utils.c | 1 - 16 files changed, 340 insertions(+), 2226 deletions(-) delete mode 100644 src/platforms/pc-stlinkv2/Makefile.inc delete mode 100644 src/platforms/pc-stlinkv2/README.md delete mode 100644 src/platforms/pc-stlinkv2/jtagtap.c delete mode 100644 src/platforms/pc-stlinkv2/platform.c delete mode 100644 src/platforms/pc-stlinkv2/platform.h delete mode 100644 src/platforms/pc-stlinkv2/stlinkv2.c delete mode 100644 src/platforms/pc-stlinkv2/stlinkv2.h delete mode 100644 src/platforms/pc-stlinkv2/swdptap.c diff --git a/src/platforms/hosted/Makefile.inc b/src/platforms/hosted/Makefile.inc index d11199f..94ed44b 100644 --- a/src/platforms/hosted/Makefile.inc +++ b/src/platforms/hosted/Makefile.inc @@ -9,4 +9,5 @@ LDFLAGS += -lws2_32 endif VPATH += platforms/pc SRC += timing.c cl_utils.c utils.c libusb_utils.c +SRC += stlinkv2.c PC_HOSTED = 1 diff --git a/src/platforms/hosted/platform.c b/src/platforms/hosted/platform.c index 8f256f7..69f340b 100644 --- a/src/platforms/hosted/platform.c +++ b/src/platforms/hosted/platform.c @@ -24,9 +24,14 @@ #include "general.h" #include "swdptap.h" #include "jtagtap.h" +#include "target.h" +#include "target_internal.h" +#include "adiv5.h" #include "timing.h" #include "cl_utils.h" +#include "gdb_if.h" #include +#include "stlinkv2.h" #define VENDOR_ID_BMP 0x1d50 #define PRODUCT_ID_BMP 0x6018 @@ -48,8 +53,20 @@ jtag_proc_t jtag_proc; static void exit_function(void) { - libusb_exit(info.libusb_ctx); - fprintf(stderr, "INFO: Cleanup\n"); + if(info.usb_link) { + libusb_free_transfer(info.usb_link->req_trans); + libusb_free_transfer(info.usb_link->rep_trans); + if (info.usb_link->ul_libusb_device_handle) { + libusb_release_interface ( + info.usb_link->ul_libusb_device_handle, 0); + libusb_close(info.usb_link->ul_libusb_device_handle); + } + } + switch (info.bmp_type) { + default: + break; + } + fflush(stdout); } /* SIGTERM handler. */ @@ -82,7 +99,7 @@ static int find_debuggers( BMP_CL_OPTIONS_t *cl_opts,bmp_info_t *info) if (res < 0) { fprintf(stderr, "WARN: libusb_get_device_descriptor() failed: %s", libusb_strerror(res)); - libusb_free_device_list(devs, 0); + libusb_free_device_list(devs, 1); continue; } libusb_device_handle *handle; @@ -119,13 +136,13 @@ static int find_debuggers( BMP_CL_OPTIONS_t *cl_opts,bmp_info_t *info) continue; } } + libusb_close(handle); if (cl_opts->opt_ident_string) { char *match_manu = NULL; char *match_product = NULL; match_manu = strstr(manufacturer, cl_opts->opt_ident_string); match_product = strstr(product, cl_opts->opt_ident_string); if (!match_manu && !match_product) { - libusb_close(handle); continue; } } @@ -135,16 +152,16 @@ static int find_debuggers( BMP_CL_OPTIONS_t *cl_opts,bmp_info_t *info) (desc.idProduct == PRODUCT_ID_BMP)) { type = BMP_TYPE_BMP; } else if (desc.idVendor == VENDOR_ID_STLINK) { - if (desc.idProduct == PRODUCT_ID_STLINKV1) { - fprintf(stderr, "INFO: STLINKV1 not supported\n"); - continue; - } if ((desc.idProduct == PRODUCT_ID_STLINKV2) || (desc.idProduct == PRODUCT_ID_STLINKV21) || (desc.idProduct == PRODUCT_ID_STLINKV21_MSD) || (desc.idProduct == PRODUCT_ID_STLINKV3) || (desc.idProduct == PRODUCT_ID_STLINKV3E)) { type = BMP_TYPE_STLINKV2; + } else { + if (desc.idProduct == PRODUCT_ID_STLINKV1) + fprintf(stderr, "INFO: STLINKV1 not supported\n"); + continue; } } else { continue; @@ -176,8 +193,8 @@ static int find_debuggers( BMP_CL_OPTIONS_t *cl_opts,bmp_info_t *info) goto rescan; } } - libusb_free_device_list(devs, 0); - return 0; + libusb_free_device_list(devs, 1); + return (found_debuggers == 1) ? 0 : -1; } void platform_init(int argc, char **argv) @@ -202,39 +219,98 @@ void platform_init(int argc, char **argv) printf("Using %s %s %s\n", info.serial, info.manufacturer, info.product); - exit(-1); + switch (info.bmp_type) { + case BMP_TYPE_STLINKV2: + if (stlink_init( &info)) + exit(-1); + break; + default: + exit(-1); + } + int ret = -1; + if (cl_opts.opt_mode != BMP_MODE_DEBUG) { + ret = cl_execute(&cl_opts); + } else { + gdb_if_init(); + return; + } + exit(ret); } int platform_adiv5_swdp_scan(void) { - return -1; + switch (info.bmp_type) { + case BMP_TYPE_STLINKV2: + { + target_list_free(); + ADIv5_DP_t *dp = (void*)calloc(1, sizeof(*dp)); + if (!stlink_enter_debug_swd(&info, dp)) { + adiv5_dp_init(dp); + if (target_list) + return 1; + } + free(dp); + break; + } + default: + return 0; + } + return 0; } int platform_swdptap_init(void) { + switch (info.bmp_type) { + case BMP_TYPE_STLINKV2: + return 0; + break; + default: + return -1; + } return -1; } int platform_jtag_scan(const uint8_t *lrlens) { - (void) lrlens; + switch (info.bmp_type) { + case BMP_TYPE_STLINKV2: + return jtag_scan_stlinkv2(&info, lrlens); + default: + return -1; + } return -1; } int platform_jtagtap_init(void) { - return 0; -} - -int platform_adiv5_dp_defaults(void *arg) -{ - (void)arg; + switch (info.bmp_type) { + case BMP_TYPE_STLINKV2: + return 0; + default: + return -1; + } return -1; } -int platform_jtag_dp_init() +void platform_adiv5_dp_defaults(ADIv5_DP_t *dp) { - return 0; + switch (info.bmp_type) { + case BMP_TYPE_STLINKV2: + return stlink_adiv5_dp_defaults(dp); + default: + break; + } +} + +int platform_jtag_dp_init(ADIv5_DP_t *dp) +{ + switch (info.bmp_type) { + case BMP_TYPE_STLINKV2: + return stlink_jtag_dp_init(dp); + default: + return -1; + } + return 0; } char *platform_ident(void) @@ -258,10 +334,34 @@ char *platform_ident(void) const char *platform_target_voltage(void) { + switch (info.bmp_type) { + case BMP_TYPE_STLINKV2: + return stlink_target_voltage(&info); + default: + break;; + } return NULL; } -void platform_srst_set_val(bool assert) {(void) assert;} +void platform_srst_set_val(bool assert) +{ + switch (info.bmp_type) { + case BMP_TYPE_STLINKV2: + return stlink_srst_set_val(&info, assert); + default: + break; + } +} + +bool platform_srst_get_val(void) +{ + switch (info.bmp_type) { + case BMP_TYPE_STLINKV2: + return stlink_srst_get_val(); + default: + break; + } + return false; +} -bool platform_srst_get_val(void) { return false;} void platform_buffer_flush(void) {} diff --git a/src/platforms/hosted/platform.h b/src/platforms/hosted/platform.h index 0a28110..5a9cea2 100644 --- a/src/platforms/hosted/platform.h +++ b/src/platforms/hosted/platform.h @@ -1,6 +1,8 @@ #ifndef __PLATFORM_H #define __PLATFORM_H #include +#include "libusb_utils.h" + #include "timing.h" char *platform_ident(void); @@ -22,6 +24,8 @@ typedef enum bmp_type_s { typedef struct bmp_info_s { bmp_type_t bmp_type; libusb_context *libusb_ctx; + struct ftdi_context *ftdic; + usb_link_t *usb_link; unsigned int vid; unsigned int pid; char dev; @@ -30,4 +34,6 @@ typedef struct bmp_info_s { char product[128]; } bmp_info_t; +extern bmp_info_t info; + #endif diff --git a/src/platforms/hosted/stlinkv2.c b/src/platforms/hosted/stlinkv2.c index 5f141d2..133606f 100644 --- a/src/platforms/hosted/stlinkv2.c +++ b/src/platforms/hosted/stlinkv2.c @@ -40,19 +40,6 @@ #include "cl_utils.h" -#if !defined(timersub) -/* This is a copy from GNU C Library (GNU LGPL 2.1), sys/time.h. */ -# define timersub(a, b, result) \ - do { \ - (result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \ - (result)->tv_usec = (a)->tv_usec - (b)->tv_usec; \ - if ((result)->tv_usec < 0) { \ - --(result)->tv_sec; \ - (result)->tv_usec += 1000000; \ - } \ - } while (0) -#endif - #define VENDOR_ID_STLINK 0x483 #define PRODUCT_ID_STLINK_MASK 0xffe0 #define PRODUCT_ID_STLINK_GROUP 0x3740 @@ -212,7 +199,7 @@ typedef struct { uint16_t vid; uint16_t pid; uint8_t transport_mode; - char serial[32]; + bool srst; uint8_t dap_select; uint8_t ep_tx; uint8_t ver_hw; /* 20, 21 or 31 deciphered from USB PID.*/ @@ -224,197 +211,15 @@ typedef struct { uint8_t ver_bridge; uint16_t block_size; bool ap_error; - libusb_device_handle *handle; - struct libusb_transfer* req_trans; - struct libusb_transfer* rep_trans; } stlink; stlink Stlink; static int stlink_usb_get_rw_status(bool verbose); -static void exit_function(void) -{ - libusb_exit(NULL); - DEBUG("Cleanup\n"); -} - -/* SIGTERM handler. */ -static void sigterm_handler(int sig) -{ - (void)sig; - exit(0); -} - -struct trans_ctx { -#define TRANS_FLAGS_IS_DONE (1 << 0) -#define TRANS_FLAGS_HAS_ERROR (1 << 1) - volatile unsigned long flags; -}; - int debug_level = 0; -bool has_attached = false; -static int LIBUSB_CALL hotplug_callback_attach( - libusb_context *ctx, libusb_device *dev, libusb_hotplug_event event, - void *user_data) -{ - (void)ctx; - (void)dev; - (void)event; - (void)user_data; - has_attached = true; - return 1; /* deregister Callback*/ -} - -int device_detached = 0; -static int LIBUSB_CALL hotplug_callback_detach( - libusb_context *ctx, libusb_device *dev, libusb_hotplug_event event, - void *user_data) -{ - (void)ctx; - (void)dev; - (void)event; - (void)user_data; - device_detached = 1; - return 1; /* deregister Callback*/ -} - -void stlink_check_detach(int state) -{ - if (state == 1) { - /* Check for hotplug events */ - struct timeval tv = {0,0}; - libusb_handle_events_timeout_completed( - Stlink.libusb_ctx, &tv, &device_detached); - if (device_detached) { - DEBUG("Dongle was detached\n"); - exit(0); - } - } -} - -static void LIBUSB_CALL on_trans_done(struct libusb_transfer * trans) -{ - struct trans_ctx * const ctx = trans->user_data; - - if (trans->status != LIBUSB_TRANSFER_COMPLETED) - { - DEBUG("on_trans_done: "); - if(trans->status == LIBUSB_TRANSFER_TIMED_OUT) - { - DEBUG("Timeout\n"); - } else if (trans->status == LIBUSB_TRANSFER_CANCELLED) { - DEBUG("cancelled\n"); - } else if (trans->status == LIBUSB_TRANSFER_NO_DEVICE) { - DEBUG("no device\n"); - } else { - DEBUG("unknown\n"); - } - ctx->flags |= TRANS_FLAGS_HAS_ERROR; - } - ctx->flags |= TRANS_FLAGS_IS_DONE; -} - -static int submit_wait(struct libusb_transfer * trans) { - struct timeval start; - struct timeval now; - struct timeval diff; - struct trans_ctx trans_ctx; - enum libusb_error error; - - trans_ctx.flags = 0; - - /* brief intrusion inside the libusb interface */ - trans->callback = on_trans_done; - trans->user_data = &trans_ctx; - - if ((error = libusb_submit_transfer(trans))) { - DEBUG("libusb_submit_transfer(%d): %s\n", error, - libusb_strerror(error)); - exit(-1); - } - - gettimeofday(&start, NULL); - - while (trans_ctx.flags == 0) { - struct timeval timeout; - timeout.tv_sec = 1; - timeout.tv_usec = 0; - if (libusb_handle_events_timeout(Stlink.libusb_ctx, &timeout)) { - DEBUG("libusb_handle_events()\n"); - return -1; - } - - gettimeofday(&now, NULL); - timersub(&now, &start, &diff); - if (diff.tv_sec >= 1) { - libusb_cancel_transfer(trans); - DEBUG("libusb_handle_events() timeout\n"); - return -1; - } - } - - if (trans_ctx.flags & TRANS_FLAGS_HAS_ERROR) { - DEBUG("libusb_handle_events() | has_error\n"); - return -1; - } - - return 0; -} #define STLINK_ERROR_DP_FAULT -2 -static int send_recv(uint8_t *txbuf, size_t txsize, - uint8_t *rxbuf, size_t rxsize) -{ - int res = 0; - stlink_check_detach(1); - if( txsize) { - int txlen = txsize; - libusb_fill_bulk_transfer(Stlink.req_trans, Stlink.handle, - Stlink.ep_tx | LIBUSB_ENDPOINT_OUT, - txbuf, txlen, - NULL, NULL, - 0 - ); - DEBUG_USB(" Send (%d): ", txlen); - for (int i = 0; i < txlen && i < 32 ; i++) { - DEBUG_USB("%02x", txbuf[i]); - if ((i & 7) == 7) - DEBUG_USB("."); - } - if (submit_wait(Stlink.req_trans)) { - DEBUG_USB("clear 2\n"); - libusb_clear_halt(Stlink.handle,2); - return -1; - } - } - /* send_only */ - if (rxsize != 0) { - /* read the response */ - libusb_fill_bulk_transfer(Stlink.rep_trans, Stlink.handle, - 0x01| LIBUSB_ENDPOINT_IN, - rxbuf, rxsize, NULL, NULL, 0); - - if (submit_wait(Stlink.rep_trans)) { - DEBUG("clear 1\n"); - libusb_clear_halt(Stlink.handle,1); - return -1; - } - res = Stlink.rep_trans->actual_length; - if (res >0) { - int i; - uint8_t *p = rxbuf; - DEBUG_USB(" Rec (%zu/%d)", rxsize, res); - for (i = 0; i < res && i < 32 ; i++) { - if ( i && ((i & 7) == 0)) - DEBUG_USB("."); - DEBUG_USB("%02x", p[i]); - } - } - } - DEBUG_USB("\n"); - return res; -} /** Converts an STLINK status code held in the first byte of a response to @@ -530,19 +335,16 @@ static int stlink_usb_error_check(uint8_t *data, bool verbose) static int send_recv_retry(uint8_t *txbuf, size_t txsize, uint8_t *rxbuf, size_t rxsize) { - struct timeval start; - struct timeval now; - struct timeval diff; - gettimeofday(&start, NULL); + uint32_t start = platform_time_ms(); int res; + usb_link_t *link = info.usb_link; while(1) { - send_recv(txbuf, txsize, rxbuf, rxsize); + send_recv(link, txbuf, txsize, rxbuf, rxsize); res = stlink_usb_error_check(rxbuf, false); if (res == STLINK_ERROR_OK) return res; - gettimeofday(&now, NULL); - timersub(&now, &start, &diff); - if ((diff.tv_sec >= 1) || (res != STLINK_ERROR_WAIT)) { + uint32_t now = platform_time_ms(); + if (((now - start) > 1000) || (res != STLINK_ERROR_WAIT)) { DEBUG("write_retry failed. "); return res; } @@ -553,19 +355,15 @@ static int send_recv_retry(uint8_t *txbuf, size_t txsize, static int read_retry(uint8_t *txbuf, size_t txsize, uint8_t *rxbuf, size_t rxsize) { - struct timeval start; - struct timeval now; - struct timeval diff; - gettimeofday(&start, NULL); + uint32_t start = platform_time_ms(); int res; while(1) { - send_recv(txbuf, txsize, rxbuf, rxsize); + send_recv(info.usb_link, txbuf, txsize, rxbuf, rxsize); res = stlink_usb_get_rw_status(false); if (res == STLINK_ERROR_OK) return res; - gettimeofday(&now, NULL); - timersub(&now, &start, &diff); - if ((diff.tv_sec >= 1) || (res != STLINK_ERROR_WAIT)) { + uint32_t now = platform_time_ms(); + if (((now -start) > 1000) || (res != STLINK_ERROR_WAIT)) { DEBUG("read_retry failed. "); stlink_usb_get_rw_status(true); return res; @@ -577,20 +375,17 @@ static int read_retry(uint8_t *txbuf, size_t txsize, static int write_retry(uint8_t *cmdbuf, size_t cmdsize, uint8_t *txbuf, size_t txsize) { - struct timeval start; - struct timeval now; - struct timeval diff; - gettimeofday(&start, NULL); + uint32_t start = platform_time_ms(); int res; + usb_link_t *link = info.usb_link; while(1) { - send_recv(cmdbuf, cmdsize, NULL, 0); - send_recv(txbuf, txsize, NULL, 0); + send_recv(link, cmdbuf, cmdsize, NULL, 0); + send_recv(link, txbuf, txsize, NULL, 0); res = stlink_usb_get_rw_status(false); if (res == STLINK_ERROR_OK) return res; - gettimeofday(&now, NULL); - timersub(&now, &start, &diff); - if ((diff.tv_sec >= 1) || (res != STLINK_ERROR_WAIT)) { + uint32_t now = platform_time_ms(); + if (((now - start) > 1000) || (res != STLINK_ERROR_WAIT)) { stlink_usb_get_rw_status(true); return res; } @@ -598,12 +393,12 @@ static int write_retry(uint8_t *cmdbuf, size_t cmdsize, return res; } -static void stlink_version(void) +static void stlink_version(bmp_info_t *info) { if (Stlink.ver_hw == 30) { uint8_t cmd[16] = {STLINK_APIV3_GET_VERSION_EX}; uint8_t data[12]; - int size = send_recv(cmd, 16, data, 12); + int size = send_recv(info->usb_link, cmd, 16, data, 12); if (size == -1) { printf("[!] send_recv STLINK_APIV3_GET_VERSION_EX\n"); } @@ -618,7 +413,7 @@ static void stlink_version(void) } else { uint8_t cmd[16] = {STLINK_GET_VERSION}; uint8_t data[6]; - int size = send_recv(cmd, 16, data, 6); + int size = send_recv(info->usb_link, cmd, 16, data, 6); if (size == -1) { printf("[!] send_recv STLINK_GET_VERSION_EX\n"); } @@ -646,23 +441,24 @@ static void stlink_version(void) DEBUG("\n"); } -void stlink_leave_state(void) +static bool stlink_leave_state(bmp_info_t *info) { uint8_t cmd[16] = {STLINK_GET_CURRENT_MODE}; uint8_t data[2]; - send_recv(cmd, 16, data, 2); + send_recv(info->usb_link,cmd, 16, data, 2); if (data[0] == STLINK_DEV_DFU_MODE) { uint8_t dfu_cmd[16] = {STLINK_DFU_COMMAND, STLINK_DFU_EXIT}; DEBUG("Leaving DFU Mode\n"); - send_recv(dfu_cmd, 16, NULL, 0); + send_recv(info->usb_link, dfu_cmd, 16, NULL, 0); + return true; } else if (data[0] == STLINK_DEV_SWIM_MODE) { uint8_t swim_cmd[16] = {STLINK_SWIM_COMMAND, STLINK_SWIM_EXIT}; DEBUG("Leaving SWIM Mode\n"); - send_recv(swim_cmd, 16, NULL, 0); + send_recv(info->usb_link, swim_cmd, 16, NULL, 0); } else if (data[0] == STLINK_DEV_DEBUG_MODE) { uint8_t dbg_cmd[16] = {STLINK_DEBUG_COMMAND, STLINK_DEBUG_EXIT}; DEBUG("Leaving DEBUG Mode\n"); - send_recv(dbg_cmd, 16, NULL, 0); + send_recv(info->usb_link, dbg_cmd, 16, NULL, 0); } else if (data[0] == STLINK_DEV_BOOTLOADER_MODE) { DEBUG("Leaving BOOTLOADER Mode\n"); } else if (data[0] == STLINK_DEV_MASS_MODE) { @@ -670,13 +466,14 @@ void stlink_leave_state(void) } else { DEBUG("Unknown Mode %02x\n", data[0]); } + return false; } -const char *stlink_target_voltage(void) +const char *stlink_target_voltage(bmp_info_t *info) { uint8_t cmd[16] = {STLINK_GET_TARGET_VOLTAGE}; uint8_t data[8]; - send_recv(cmd, 16, data, 8); + send_recv(info->usb_link, cmd, 16, data, 8); uint16_t adc[2]; adc[0] = data[0] | data[1] << 8; /* Calibration value? */ adc[1] = data[4] | data[5] << 8; /* Measured value?*/ @@ -688,268 +485,161 @@ const char *stlink_target_voltage(void) return res; } -static void stlink_resetsys(void) +static void stlink_resetsys(bmp_info_t *info) { uint8_t cmd[16] = {STLINK_DEBUG_COMMAND ,STLINK_DEBUG_APIV2_RESETSYS}; uint8_t data[2]; - send_recv(cmd, 16, data, 2); + send_recv(info->usb_link, cmd, 16, data, 2); } -void stlink_init(int argc, char **argv) +int stlink_init(bmp_info_t *info) { - BMP_CL_OPTIONS_t cl_opts = {0}; - cl_opts.opt_idstring = "Blackmagic Debug Probe on StlinkV2/3"; - cl_init(&cl_opts, argc, argv); + usb_link_t *sl = calloc(1, sizeof(usb_link_t)); + if (!sl) + return -1; + info->usb_link = sl; + sl->ul_libusb_ctx = info->libusb_ctx; libusb_device **devs, *dev; - int r; - int ret = -1; - atexit(exit_function); - signal(SIGTERM, sigterm_handler); - signal(SIGINT, sigterm_handler); - libusb_init(&Stlink.libusb_ctx); - r = libusb_init(NULL); - if (r < 0) - DEBUG("Failed: %s", libusb_strerror(r)); - bool hotplug = true; - if (!libusb_has_capability (LIBUSB_CAP_HAS_HOTPLUG)) { - printf("Hotplug capabilites are not supported on this platform\n"); - hotplug = false; - } ssize_t cnt; - rescan: - has_attached = 0; - memset(&Stlink, 0, sizeof(Stlink)); - cnt = libusb_get_device_list(NULL, &devs); + cnt = libusb_get_device_list(info->libusb_ctx, &devs); if (cnt < 0) { - DEBUG("Failed: %s", libusb_strerror(r)); - goto error; + fprintf(stderr, "FATAL: Stlink libusb_get_device_list failed\n"); + return -1; } int i = 0; - int nr_stlinks = 0; + bool found = false; while ((dev = devs[i++]) != NULL) { struct libusb_device_descriptor desc; int r = libusb_get_device_descriptor(dev, &desc); if (r < 0) { fprintf(stderr, "libusb_get_device_descriptor failed %s", libusb_strerror(r)); - goto error; + return -1; } - if ((desc.idVendor == VENDOR_ID_STLINK) && - ((desc.idProduct & PRODUCT_ID_STLINK_MASK) == - PRODUCT_ID_STLINK_GROUP)) { - if (desc.idProduct == PRODUCT_ID_STLINKV1) { /* Reject V1 devices.*/ - DEBUG("STLINKV1 not supported\n"); - continue; - } - Stlink.vid = desc.idVendor; - Stlink.pid = desc.idProduct; - r = libusb_open(dev, &Stlink.handle); - if (r == LIBUSB_SUCCESS) { - uint8_t data[32]; - uint16_t lang; - libusb_get_string_descriptor( - Stlink.handle, 0, 0, data, sizeof(data)); - lang = data[2] << 8 | data[3]; - unsigned char sernum[32]; - if (desc.iSerialNumber) { - r = libusb_get_string_descriptor - (Stlink.handle, desc.iSerialNumber, lang, - sernum, sizeof(sernum)); - } else { - DEBUG("No serial number\n"); - } - /* Older devices have hex values instead of ascii - * in the serial string. Recode eventually!*/ - bool readable = true; - uint16_t *p = (uint16_t *)sernum; - for (p += 1; *p; p++) { - bool isr = isalnum(*p); - readable &= isr; - } - char *s = Stlink.serial; - p = (uint16_t *)sernum; - for (p += 1; *p; p++, s++) { - if (readable) - *s = *p; - else - snprintf(s, 3, "%02x", *p & 0xff); - } - if (cl_opts.opt_serial && (!strncmp(Stlink.serial, cl_opts.opt_serial, - strlen(cl_opts.opt_serial)))) - DEBUG("Found "); - if (desc.idProduct == PRODUCT_ID_STLINKV2) { - DEBUG("STLINKV20 serial %s\n", Stlink.serial); - Stlink.ver_hw = 20; - Stlink.ep_tx = 2; - } else if (desc.idProduct == PRODUCT_ID_STLINKV21) { - DEBUG("STLINKV21 serial %s\n", Stlink.serial); - Stlink.ver_hw = 21; - Stlink.ep_tx = 1; - } else if (desc.idProduct == PRODUCT_ID_STLINKV21_MSD) { - DEBUG("STLINKV21_MSD serial %s\n", Stlink.serial); - Stlink.ver_hw = 21; - Stlink.ep_tx = 1; - } else if (desc.idProduct == PRODUCT_ID_STLINKV3E) { - DEBUG("STLINKV3E serial %s\n", Stlink.serial); - Stlink.ver_hw = 30; - Stlink.ep_tx = 1; - } else if (desc.idProduct == PRODUCT_ID_STLINKV3) { - DEBUG("STLINKV3 serial %s\n", Stlink.serial); - Stlink.ver_hw = 30; - Stlink.ep_tx = 1; - } else { - DEBUG("Unknown STLINK variant, serial %s\n", Stlink.serial); - } - nr_stlinks++; - if (cl_opts.opt_serial) { - if (!strncmp(Stlink.serial, cl_opts.opt_serial, - strlen(cl_opts.opt_serial))) { - break; - } else { - libusb_close(Stlink.handle); - Stlink.handle = 0; - } - } - } else { - DEBUG("Open failed %s\n", libusb_strerror(r)); - } + if ((desc.idVendor != info->vid) || + (desc.idProduct != info->pid) || + (libusb_open(dev, &sl->ul_libusb_device_handle) + != LIBUSB_SUCCESS)) { + continue; } + char serial[64]; + r = libusb_get_string_descriptor_ascii( + sl->ul_libusb_device_handle, desc.iSerialNumber, + (uint8_t*)serial,sizeof(serial)); + if (r <= 0 || !strstr(serial, info->serial)) { + libusb_close(sl->ul_libusb_device_handle); + continue; + } + found = true; + break; } libusb_free_device_list(devs, 1); - if (!Stlink.handle) { - if (nr_stlinks && cl_opts.opt_serial) { - DEBUG("No Stlink with given serial number %s\n", cl_opts.opt_serial); - } else if (nr_stlinks > 1) { - DEBUG("Multiple Stlinks. Please specify serial number\n"); - goto error; - } else { - DEBUG("No Stlink device found!\n"); - } - if (hotplug && !cl_opts.opt_no_wait) { - libusb_hotplug_callback_handle hp; - int rc = libusb_hotplug_register_callback - (NULL, LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED, 0, - VENDOR_ID_STLINK, LIBUSB_HOTPLUG_MATCH_ANY, - LIBUSB_HOTPLUG_MATCH_ANY, - hotplug_callback_attach, NULL, &hp); - if (LIBUSB_SUCCESS != rc) { - DEBUG("Error registering attach callback\n"); - goto error; - } - DEBUG("Waiting for %sST device%s%s to attach\n", - (cl_opts.opt_serial)? "" : "some ", - (cl_opts.opt_serial)? " with serial ": "", - (cl_opts.opt_serial)? cl_opts.opt_serial: ""); - DEBUG("Terminate with ^C\n"); - while (has_attached == 0) { - rc = libusb_handle_events (NULL); - if (rc < 0) - printf("libusb_handle_events() failed: %s\n", - libusb_error_name(rc)); - } - goto rescan; - } - goto error; + if (!found) + return 0; + if (info->pid == PRODUCT_ID_STLINKV2) { + Stlink.ver_hw = 20; + info->usb_link->ep_tx = 2; + Stlink.ep_tx = 2; + } else if ((info->pid == PRODUCT_ID_STLINKV21)|| + (info->pid == PRODUCT_ID_STLINKV21_MSD)) { + Stlink.ver_hw = 21; + info->usb_link->ep_tx = 1; + Stlink.ep_tx = 1; + } else if ((info->pid == PRODUCT_ID_STLINKV3) || + (info->pid == PRODUCT_ID_STLINKV3E)) { + Stlink.ver_hw = 30; + info->usb_link->ep_tx = 1; + Stlink.ep_tx = 1; } + info->usb_link->ep_rx = 1; int config; - r = libusb_get_configuration(Stlink.handle, &config); + int r = libusb_get_configuration(sl->ul_libusb_device_handle, &config); if (r) { - DEBUG("libusb_get_configuration failed %d: %s", r, libusb_strerror(r)); - goto error_1; + fprintf(stderr, "FATAL: Stlink libusb_get_configuration failed %d: %s", + r, libusb_strerror(r)); + return -1; } - DEBUG("Config %d\n", config); if (config != 1) { - r = libusb_set_configuration(Stlink.handle, 0); + r = libusb_set_configuration(sl->ul_libusb_device_handle, 0); if (r) { - DEBUG("libusb_set_configuration failed %d: %s", - r, libusb_strerror(r)); - goto error_1; + fprintf(stderr, "FATAL: Stlinklibusb_set_configuration " + "failed %d: %s", r, libusb_strerror(r)); + return -1; } } - r = libusb_claim_interface(Stlink.handle, 0); - if (r) - { - DEBUG("libusb_claim_interface failed %s\n", libusb_strerror(r)); - goto error_1; + r = libusb_claim_interface(sl->ul_libusb_device_handle, 0); + if (r) { + fprintf(stderr, "FATAL: Stlink libusb_claim_interface failed %s\n", + libusb_strerror(r)); + return -1; } - if (hotplug) { /* Allow gracefully exit when stlink is unplugged*/ - libusb_hotplug_callback_handle hp; - int rc = libusb_hotplug_register_callback - (NULL, LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT, 0, Stlink.vid, Stlink.pid, - LIBUSB_HOTPLUG_MATCH_ANY, hotplug_callback_detach, NULL, &hp); - if (LIBUSB_SUCCESS != rc) { - DEBUG("Error registering detach callback\n"); - goto error; - } - } - Stlink.req_trans = libusb_alloc_transfer(0); - Stlink.rep_trans = libusb_alloc_transfer(0); - stlink_version(); + sl->req_trans = libusb_alloc_transfer(0); + sl->rep_trans = libusb_alloc_transfer(0); + stlink_version(info); if ((Stlink.ver_stlink < 3 && Stlink.ver_jtag < 32) || (Stlink.ver_stlink == 3 && Stlink.ver_jtag < 3)) { /* Maybe the adapter is in some strange state. Try to reset */ - int result = libusb_reset_device(Stlink.handle); - DEBUG("Trying reset\n"); + int result = libusb_reset_device(sl->ul_libusb_device_handle); + fprintf(stderr, "INFO: Trying Stlink reset\n"); if (result == LIBUSB_ERROR_BUSY) { /* Try again */ platform_delay(50); - result = libusb_reset_device(Stlink.handle); + result = libusb_reset_device(sl->ul_libusb_device_handle); } if (result != LIBUSB_SUCCESS) { - DEBUG("libusb_reset_device failed\n"); - goto error_1; + fprintf(stderr, "FATAL: Stlink libusb_reset_device failed\n"); + return -1; } - stlink_version(); + stlink_version(info); } if ((Stlink.ver_stlink < 3 && Stlink.ver_jtag < 32) || (Stlink.ver_stlink == 3 && Stlink.ver_jtag < 3)) { DEBUG("Please update Firmware\n"); - goto error_1; + return -1; } - stlink_leave_state(); - stlink_resetsys(); - if (cl_opts.opt_mode != BMP_MODE_DEBUG) { - ret = cl_execute(&cl_opts); - } else { - assert(gdb_if_init() == 0); - return; + if (stlink_leave_state(info)) { + printf("Stlink board was in DFU mode. Restart\n"); + return -1; } - error_1: - libusb_close(Stlink.handle); - error: - libusb_exit(Stlink.libusb_ctx); - exit(ret); + stlink_resetsys(info); + return 0; } -void stlink_srst_set_val(bool assert) +void stlink_srst_set_val(bmp_info_t *info, bool assert) { uint8_t cmd[16] = {STLINK_DEBUG_COMMAND, STLINK_DEBUG_APIV2_DRIVE_NRST, (assert)? STLINK_DEBUG_APIV2_DRIVE_NRST_LOW : STLINK_DEBUG_APIV2_DRIVE_NRST_HIGH}; uint8_t data[2]; - send_recv(cmd, 16, data, 2); + Stlink.srst = assert; + send_recv(info->usb_link, cmd, 16, data, 2); stlink_usb_error_check(data, true); } -bool stlink_set_freq_divisor(uint16_t divisor) +bool stlink_srst_get_val(void) +{ + return Stlink.srst; +} + +static bool stlink_set_freq_divisor(bmp_info_t *info, uint16_t divisor) { uint8_t cmd[16] = {STLINK_DEBUG_COMMAND, STLINK_DEBUG_APIV2_SWD_SET_FREQ, divisor & 0xff, divisor >> 8}; uint8_t data[2]; - send_recv(cmd, 16, data, 2); + send_recv(info->usb_link, cmd, 16, data, 2); if (stlink_usb_error_check(data, false)) return false; return true; } -bool stlink3_set_freq_divisor(uint16_t divisor) +static bool stlink3_set_freq_divisor(bmp_info_t *info, uint16_t divisor) { uint8_t cmd[16] = {STLINK_DEBUG_COMMAND, STLINK_APIV3_GET_COM_FREQ, Stlink.transport_mode}; uint8_t data[52]; - send_recv(cmd, 16, data, 52); + send_recv(info->usb_link, cmd, 16, data, 52); stlink_usb_error_check(data, true); int size = data[8]; if (divisor > size) @@ -965,7 +655,7 @@ bool stlink3_set_freq_divisor(uint16_t divisor) cmd[5] = p[1]; cmd[6] = p[2]; cmd[7] = p[3]; - send_recv(cmd, 16, data, 8); + send_recv(info->usb_link, cmd, 16, data, 8); return true; } @@ -974,57 +664,40 @@ int stlink_hwversion(void) return Stlink.ver_stlink; } -int stlink_enter_debug_swd(void) +static int stlink_enter_debug_jtag(bmp_info_t *info) { - stlink_leave_state(); - Stlink.transport_mode = STLINK_MODE_SWD; - if (Stlink.ver_stlink == 3) - stlink3_set_freq_divisor(2); - else - stlink_set_freq_divisor(1); - uint8_t cmd[16] = {STLINK_DEBUG_COMMAND, - STLINK_DEBUG_APIV2_ENTER, - STLINK_DEBUG_ENTER_SWD_NO_RESET}; - uint8_t data[2]; - DEBUG("Enter SWD\n"); - send_recv_retry(cmd, 16, data, 2); - return stlink_usb_error_check(data, true); -} - -int stlink_enter_debug_jtag(void) -{ - stlink_leave_state(); + stlink_leave_state(info); Stlink.transport_mode = STLINK_MODE_JTAG; if (Stlink.ver_stlink == 3) - stlink3_set_freq_divisor(4); + stlink3_set_freq_divisor(info, 4); else - stlink_set_freq_divisor(1); + stlink_set_freq_divisor(info, 1); uint8_t cmd[16] = {STLINK_DEBUG_COMMAND, STLINK_DEBUG_APIV2_ENTER, STLINK_DEBUG_ENTER_JTAG_NO_RESET}; uint8_t data[2]; DEBUG("Enter JTAG\n"); - send_recv(cmd, 16, data, 2); + send_recv(info->usb_link, cmd, 16, data, 2); return stlink_usb_error_check(data, true); } -uint32_t stlink_read_coreid(void) +static uint32_t stlink_read_coreid(void) { uint8_t cmd[16] = {STLINK_DEBUG_COMMAND, STLINK_DEBUG_READCOREID}; uint8_t data[4]; - send_recv(cmd, 16, data, 4); + send_recv(info.usb_link, cmd, 16, data, 4); uint32_t id = data[0] | data[1] << 8 | data[2] << 16 | data[3] << 24; DEBUG("Read Core ID: 0x%08" PRIx32 "\n", id); return id; } -int stlink_read_idcodes(uint32_t *idcodes) +static int stlink_read_idcodes(bmp_info_t *info, uint32_t *idcodes) { uint8_t cmd[16] = {STLINK_DEBUG_COMMAND, STLINK_DEBUG_APIV2_READ_IDCODES}; uint8_t data[12]; - send_recv(cmd, 16, data, 12); + send_recv(info->usb_link, cmd, 16, data, 12); if (stlink_usb_error_check(data, true)) return 0; uint8_t *p = data + 4; @@ -1034,7 +707,10 @@ int stlink_read_idcodes(uint32_t *idcodes) return 2; } -uint32_t stlink_dp_read(ADIv5_DP_t *dp, uint16_t addr) +uint32_t stlink_dp_low_access(ADIv5_DP_t *dp, uint8_t RnW, + uint16_t addr, uint32_t value); + + static uint32_t stlink_dp_read(ADIv5_DP_t *dp, uint16_t addr) { if (addr & ADIV5_APnDP) { DEBUG_STLINK("AP read addr 0x%04" PRIx16 "\n", addr); @@ -1078,7 +754,7 @@ void stlink_dp_abort(ADIv5_DP_t *dp, uint32_t abort) adiv5_dp_write(dp, ADIV5_DP_ABORT, abort); } -int stlink_read_dp_register(uint16_t port, uint16_t addr, uint32_t *reg) +static int stlink_read_dp_register(uint16_t port, uint16_t addr, uint32_t *reg) { uint8_t cmd[16] = {STLINK_DEBUG_COMMAND, STLINK_DEBUG_APIV2_READ_DAP_REG, @@ -1101,7 +777,7 @@ int stlink_read_dp_register(uint16_t port, uint16_t addr, uint32_t *reg) return res; } -int stlink_write_dp_register(uint16_t port, uint16_t addr, uint32_t val) +static int stlink_write_dp_register(uint16_t port, uint16_t addr, uint32_t val) { if (port == STLINK_DEBUG_PORT_ACCESS && addr == 8) { Stlink.dap_select = val; @@ -1160,7 +836,7 @@ static bool stlink_ap_setup(int ap) ap, }; uint8_t data[2]; - send_recv_retry(cmd, 16, data, 2); + send_recv(info.usb_link, cmd, 16, data, 2); DEBUG_STLINK("Open AP %d\n", ap); int res = stlink_usb_error_check(data, true); if (res) { @@ -1180,7 +856,7 @@ static void stlink_ap_cleanup(int ap) ap, }; uint8_t data[2]; - send_recv(cmd, 16, data, 2); + send_recv(info.usb_link, cmd, 16, data, 2); DEBUG_STLINK("Close AP %d\n", ap); stlink_usb_error_check(data, true); } @@ -1191,7 +867,7 @@ static int stlink_usb_get_rw_status(bool verbose) STLINK_DEBUG_APIV2_GETLASTRWSTATUS2 }; uint8_t data[12]; - send_recv(cmd, 16, data, 12); + send_recv(info.usb_link, cmd, 16, data, 12); return stlink_usb_error_check(data, verbose); } @@ -1246,9 +922,10 @@ static void stlink_readmem(ADIv5_AP_t *ap, void *dest, uint32_t src, size_t len) DEBUG_STLINK("\n"); } -static void stlink_writemem8(ADIv5_AP_t *ap, uint32_t addr, size_t len, - uint8_t *buffer) +static void stlink_writemem8(usb_link_t *link, ADIv5_AP_t *ap, uint32_t addr, + size_t len, uint8_t *buffer) { + (void)link; DEBUG_STLINK("Mem Write8 AP %d len %zu addr 0x%08" PRIx32 ": ", ap->apsel, len, addr); for (size_t t = 0; t < len; t++) { @@ -1257,6 +934,7 @@ static void stlink_writemem8(ADIv5_AP_t *ap, uint32_t addr, size_t len, DEBUG_STLINK("\n"); while (len) { size_t length; + /* OpenOCD has some note about writemem8*/ if (len > Stlink.block_size) length = Stlink.block_size; else @@ -1267,17 +945,18 @@ static void stlink_writemem8(ADIv5_AP_t *ap, uint32_t addr, size_t len, addr & 0xff, (addr >> 8) & 0xff, (addr >> 16) & 0xff, (addr >> 24) & 0xff, length & 0xff, length >> 8, ap->apsel}; - send_recv(cmd, 16, NULL, 0); - send_recv((void*)buffer, length, NULL, 0); + send_recv(link, cmd, 16, NULL, 0); + send_recv(link, (void*)buffer, length, NULL, 0); stlink_usb_get_rw_status(true); len -= length; addr += length; } } -static void stlink_writemem16(ADIv5_AP_t *ap, uint32_t addr, size_t len, - uint16_t *buffer) +static void stlink_writemem16(usb_link_t *link, ADIv5_AP_t *ap, uint32_t addr, + size_t len, uint16_t *buffer) { + (void)link; DEBUG_STLINK("Mem Write16 AP %d len %zu addr 0x%08" PRIx32 ": ", ap->apsel, len, addr); for (size_t t = 0; t < len; t+=2) { @@ -1290,14 +969,15 @@ static void stlink_writemem16(ADIv5_AP_t *ap, uint32_t addr, size_t len, addr & 0xff, (addr >> 8) & 0xff, (addr >> 16) & 0xff, (addr >> 24) & 0xff, len & 0xff, len >> 8, ap->apsel}; - send_recv(cmd, 16, NULL, 0); - send_recv((void*)buffer, len, NULL, 0); + send_recv(link, cmd, 16, NULL, 0); + send_recv(link, (void*)buffer, len, NULL, 0); stlink_usb_get_rw_status(true); } -static void stlink_writemem32(ADIv5_AP_t *ap, uint32_t addr, size_t len, - uint32_t *buffer) +static void stlink_writemem32(usb_link_t * link, ADIv5_AP_t *ap, uint32_t addr, + size_t len, uint32_t *buffer) { + (void)link; DEBUG_STLINK("Mem Write32 AP %d len %zu addr 0x%08" PRIx32 ": ", ap->apsel, len, addr); for (size_t t = 0; t < len; t+=4) { @@ -1313,23 +993,23 @@ static void stlink_writemem32(ADIv5_AP_t *ap, uint32_t addr, size_t len, write_retry(cmd, 16, (void*)buffer, len); } -void stlink_regs_read(ADIv5_AP_t *ap, void *data) +static void stlink_regs_read(ADIv5_AP_t *ap, void *data) { uint8_t cmd[16] = {STLINK_DEBUG_COMMAND, STLINK_DEBUG_APIV2_READALLREGS, ap->apsel}; uint8_t res[88]; DEBUG_STLINK("AP %d: Read all core registers\n", ap->apsel); - send_recv(cmd, 16, res, 88); + send_recv(info.usb_link, cmd, 16, res, 88); stlink_usb_error_check(res, true); memcpy(data, res + 4, 84); } -uint32_t stlink_reg_read(ADIv5_AP_t *ap, int num) +static uint32_t stlink_reg_read(ADIv5_AP_t *ap, int num) { uint8_t cmd[16] = {STLINK_DEBUG_COMMAND, STLINK_DEBUG_APIV2_READREG, num, ap->apsel}; uint8_t res[8]; - send_recv(cmd, 16, res, 8); + send_recv(info.usb_link, cmd, 16, res, 8); stlink_usb_error_check(res, true); uint32_t ret = res[0] | res[1] << 8 | res[2] << 16 | res[3] << 24; DEBUG_STLINK("AP %d: Read reg %02" PRId32 " val 0x%08" PRIx32 "\n", @@ -1337,14 +1017,14 @@ uint32_t stlink_reg_read(ADIv5_AP_t *ap, int num) return ret; } -void stlink_reg_write(ADIv5_AP_t *ap, int num, uint32_t val) +static void stlink_reg_write(ADIv5_AP_t *ap, int num, uint32_t val) { uint8_t cmd[16] = { STLINK_DEBUG_COMMAND, STLINK_DEBUG_APIV2_WRITEREG, num, val & 0xff, (val >> 8) & 0xff, (val >> 16) & 0xff, (val >> 24) & 0xff, ap->apsel}; uint8_t res[2]; - send_recv(cmd, 16, res, 2); + send_recv(info.usb_link, cmd, 16, res, 2); DEBUG_STLINK("AP %d: Write reg %02" PRId32 " val 0x%08" PRIx32 "\n", ap->apsel, num, val); stlink_usb_error_check(res, true); @@ -1356,14 +1036,17 @@ static void stlink_mem_write_sized( ADIv5_AP_t *ap, uint32_t dest, { if (len == 0) return; + usb_link_t *link = info.usb_link; switch(align) { - case ALIGN_BYTE: stlink_writemem8(ap, dest, len, (uint8_t *) src); + case ALIGN_BYTE: + stlink_writemem8(link, ap, dest, len, (uint8_t *) src); break; - case ALIGN_HALFWORD: stlink_writemem16(ap, dest, len, (uint16_t *) src); + case ALIGN_HALFWORD: + stlink_writemem16(link,ap, dest, len, (uint16_t *) src); break; - case ALIGN_WORD: stlink_writemem32(ap, dest, len, (uint32_t *) src); - break; - case ALIGN_DWORD: stlink_writemem32(ap, dest, len, (uint32_t *) src); + case ALIGN_WORD: + case ALIGN_DWORD: + stlink_writemem32(link, ap, dest, len, (uint32_t *) src); break; } } @@ -1384,7 +1067,7 @@ struct jtag_dev_s jtag_devs[JTAG_MAX_DEVS+1]; int jtag_dev_count; jtag_proc_t jtag_proc; -int jtag_scan_stlinkv2(const uint8_t *irlens) +int jtag_scan_stlinkv2(bmp_info_t *info, const uint8_t *irlens) { uint32_t idcodes[JTAG_MAX_DEVS+1]; (void) *irlens; @@ -1392,9 +1075,9 @@ int jtag_scan_stlinkv2(const uint8_t *irlens) jtag_dev_count = 0; memset(&jtag_devs, 0, sizeof(jtag_devs)); - if (stlink_enter_debug_jtag()) + if (stlink_enter_debug_jtag(info)) return 0; - jtag_dev_count = stlink_read_idcodes(idcodes); + jtag_dev_count = stlink_read_idcodes(info, idcodes); /* Check for known devices and handle accordingly */ for(int i = 0; i < jtag_dev_count; i++) jtag_devs[i].idcode = idcodes[i]; @@ -1410,7 +1093,7 @@ int jtag_scan_stlinkv2(const uint8_t *irlens) return jtag_dev_count; } -int platform_jtag_dp_init(ADIv5_DP_t *dp) +int stlink_jtag_dp_init(ADIv5_DP_t *dp) { dp->dp_read = stlink_dp_read; dp->error = stlink_dp_error; @@ -1421,7 +1104,7 @@ int platform_jtag_dp_init(ADIv5_DP_t *dp) } -int platform_adiv5_dp_defaults(ADIv5_DP_t *dp) +void stlink_adiv5_dp_defaults(ADIv5_DP_t *dp) { dp->ap_regs_read = stlink_regs_read; dp->ap_reg_read = stlink_reg_read; @@ -1432,6 +1115,30 @@ int platform_adiv5_dp_defaults(ADIv5_DP_t *dp) dp->ap_read = stlink_ap_read; dp->mem_read = stlink_readmem; dp->mem_write_sized = stlink_mem_write_sized; +} +int stlink_enter_debug_swd(bmp_info_t *info, ADIv5_DP_t *dp) +{ + stlink_leave_state(info); + Stlink.transport_mode = STLINK_MODE_SWD; + if (Stlink.ver_stlink == 3) + stlink3_set_freq_divisor(info, 2); + else + stlink_set_freq_divisor(info, 1); + uint8_t cmd[16] = {STLINK_DEBUG_COMMAND, + STLINK_DEBUG_APIV2_ENTER, + STLINK_DEBUG_ENTER_SWD_NO_RESET}; + uint8_t data[2]; + DEBUG("Enter SWD\n"); + send_recv(info->usb_link, cmd, 16, data, 2); + if (stlink_usb_error_check(data, true)) + return -1; + dp->idcode = stlink_read_coreid(); + dp->dp_read = stlink_dp_read; + dp->error = stlink_dp_error; + dp->low_access = stlink_dp_low_access; + dp->abort = stlink_dp_abort; + + stlink_dp_error(dp); return 0; } diff --git a/src/platforms/hosted/stlinkv2.h b/src/platforms/hosted/stlinkv2.h index dea9a8b..1960a5b 100644 --- a/src/platforms/hosted/stlinkv2.h +++ b/src/platforms/hosted/stlinkv2.h @@ -24,28 +24,18 @@ #define STLINK_DEBUG_PORT_ACCESS 0xffff -void stlink_init(int argc, char **argv); +int stlink_init(bmp_info_t *info); int stlink_hwversion(void); -void stlink_leave_state(void); -const char *stlink_target_voltage(void); -void stlink_srst_set_val(bool assert); -int stlink_enter_debug_swd(void); -int stlink_enter_debug_jtag(void); -int stlink_read_idcodes(uint32_t *); -uint32_t stlink_read_coreid(void); -int stlink_read_dp_register(uint16_t port, uint16_t addr, uint32_t *res); -int stlink_write_dp_register(uint16_t port, uint16_t addr, uint32_t val); +const char *stlink_target_voltage(bmp_info_t *info); +void stlink_srst_set_val(bmp_info_t *info, bool assert); +bool stlink_srst_get_val(void); +int stlink_enter_debug_swd(bmp_info_t *info, ADIv5_DP_t *dp); -uint32_t stlink_dp_low_access(ADIv5_DP_t *dp, uint8_t RnW, - uint16_t addr, uint32_t value); -uint32_t stlink_dp_read(ADIv5_DP_t *dp, uint16_t addr); -uint32_t stlink_dp_error(ADIv5_DP_t *dp); -void stlink_dp_abort(ADIv5_DP_t *dp, uint32_t abort); -int stlink_open_ap(uint8_t ap); -void stlink_close_ap(uint8_t ap); -void stlink_regs_read(ADIv5_AP_t *ap, void *data); -uint32_t stlink_reg_read(ADIv5_AP_t *ap, int idx); -void stlink_reg_write(ADIv5_AP_t *ap, int num, uint32_t val); +const char *stlink_target_voltage(bmp_info_t *info); +void stlink_adiv5_dp_defaults(ADIv5_DP_t *dp); +int stlink_jtag_dp_init(ADIv5_DP_t *dp); +int jtag_scan_stlinkv2(bmp_info_t *info, const uint8_t *irlens); +void stlink_exit_function(bmp_info_t *info); extern int debug_level; # define DEBUG_STLINK if (debug_level > 0) printf # define DEBUG_USB if (debug_level > 1) printf diff --git a/src/platforms/pc-stlinkv2/Makefile.inc b/src/platforms/pc-stlinkv2/Makefile.inc deleted file mode 100644 index 70f6f8e..0000000 --- a/src/platforms/pc-stlinkv2/Makefile.inc +++ /dev/null @@ -1,14 +0,0 @@ -TARGET=blackmagic_stlinkv2 -SYS = $(shell $(CC) -dumpmachine) -CFLAGS += -DSTLINKV2 -DJTAG_HL -DENABLE_DEBUG -CFLAGS +=-I ./target -I./platforms/pc -LDFLAGS += -lusb-1.0 -ifneq (, $(findstring mingw, $(SYS))) -LDFLAGS += -lws2_32 -else ifneq (, $(findstring cygwin, $(SYS))) -LDFLAGS += -lws2_32 -endif -VPATH += platforms/pc -SRC += timing.c stlinkv2.c cl_utils.c utils.c -OWN_HL = 1 -PC_HOSTED = 1 diff --git a/src/platforms/pc-stlinkv2/README.md b/src/platforms/pc-stlinkv2/README.md deleted file mode 100644 index d70b4d7..0000000 --- a/src/platforms/pc-stlinkv2/README.md +++ /dev/null @@ -1,25 +0,0 @@ -ST-Link V2/3 with original STM firmware as Blackmagic Debug Probes - -Recent STM ST-LINK firmware revision (V3 and V2 >= J32) expose all -functionality that BMP needs. This platform implements blackmagic debug -probe for the STM ST-LINK. -Use at your own risk, but report or better fix problems. - -Compile with "make PROBE_HOST=pc-stlinkv2" - -Run the resulting blackmagic_stlinkv2 executable to start the gdb server. - -You can also use on the command line alone, e.g -- "blackmagic_stlinkv2 -t" to scan and display the results of the scan -- "blackmagic_stlinkv2 " to flash at 0x08000000 -- "blackmagic_stlinkv2 -h" for more options - -Cross-compling for windows with mingw succeeds. - -Drawback: -- JTAG does not work for chains with multiple devices. -- ST-LINKV3 seem to only work on STM32 devices. -- St-LINKV3 needs connect under reset on more devices than V2 - -ToDo: -- Implement an SWO server \ No newline at end of file diff --git a/src/platforms/pc-stlinkv2/jtagtap.c b/src/platforms/pc-stlinkv2/jtagtap.c deleted file mode 100644 index e69de29..0000000 diff --git a/src/platforms/pc-stlinkv2/platform.c b/src/platforms/pc-stlinkv2/platform.c deleted file mode 100644 index 07379b0..0000000 --- a/src/platforms/pc-stlinkv2/platform.c +++ /dev/null @@ -1,115 +0,0 @@ -/* - * This file is part of the Black Magic Debug project. - * - * Copyright (C) 2019 2019 Uwe Bonnes - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#include "general.h" -#include "gdb_if.h" -#include "version.h" -#include "platform.h" -#include "target.h" -#include "target_internal.h" -#include "swdptap.h" - -#include -#include -#include -#include - -#include "adiv5.h" -#include "stlinkv2.h" - -int platform_hwversion(void) -{ - return stlink_hwversion(); -} - -const char *platform_target_voltage(void) -{ - return stlink_target_voltage(); -} - -int platform_swdptap_init(void) -{ - return 0; -} - -swd_proc_t swd_proc; -jtag_proc_t jtag_proc; - -static int adiv5_swdp_scan_stlinkv2(void) -{ - target_list_free(); - ADIv5_DP_t *dp = (void*)calloc(1, sizeof(*dp)); - if (stlink_enter_debug_swd()) - return 0; - dp->idcode = stlink_read_coreid(); - dp->dp_read = stlink_dp_read; - dp->error = stlink_dp_error; - dp->low_access = stlink_dp_low_access; - dp->abort = stlink_dp_abort; - - stlink_dp_error(dp); - adiv5_dp_init(dp); - - return target_list?1:0; - return 0; -} -int platform_adiv5_swdp_scan(void) -{ - return adiv5_swdp_scan_stlinkv2(); -} - -int platform_jtag_scan(const uint8_t *lrlens) -{ - return jtag_scan_stlinkv2(lrlens); -} - -void platform_init(int argc, char **argv) -{ - stlink_init(argc, argv); -} - -static bool srst_status = false; -void platform_srst_set_val(bool assert) -{ - stlink_srst_set_val(assert); - srst_status = assert; -} - -bool platform_srst_get_val(void) { return srst_status; } - -void platform_buffer_flush(void) -{ -} - -int platform_buffer_write(const uint8_t *data, int size) -{ - (void) data; - (void) size; - return size; -} - -int platform_buffer_read(uint8_t *data, int size) -{ - (void) data; - return size; -} - -int platform_jtagtap_init(void) -{ - return 0; -} diff --git a/src/platforms/pc-stlinkv2/platform.h b/src/platforms/pc-stlinkv2/platform.h deleted file mode 100644 index b63b0e1..0000000 --- a/src/platforms/pc-stlinkv2/platform.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * This file is part of the Black Magic Debug project. - * - * Copyright (C) 2011 Black Sphere Technologies Ltd. - * Written by Gareth McMullin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __PLATFORM_H -#define __PLATFORM_H - -#include - -#include "timing.h" - -#ifndef _WIN32 -# include -#else -# ifndef alloca -# define alloca __builtin_alloca -# endif -#endif - -#define PLATFORM_IDENT() "StlinkV2/3" -#define SET_RUN_STATE(state) -void stlink_check_detach(int state); -#define SET_IDLE_STATE(state) stlink_check_detach(state) -//#define SET_ERROR_STATE(state) - -void platform_buffer_flush(void); -int platform_buffer_write(const uint8_t *data, int size); -int platform_buffer_read(uint8_t *data, int size); -int jtag_scan_stlinkv2(const uint8_t *irlens); -#endif diff --git a/src/platforms/pc-stlinkv2/stlinkv2.c b/src/platforms/pc-stlinkv2/stlinkv2.c deleted file mode 100644 index 0d5012f..0000000 --- a/src/platforms/pc-stlinkv2/stlinkv2.c +++ /dev/null @@ -1,1435 +0,0 @@ -/* - * This file is part of the Black Magic Debug project. - * - * Copyright (C) 2019 Uwe Bonnes - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -/* Much code and ideas shamelessly taken form - * https://github.com/texane/stlink.git - * git://git.code.sf.net/p/openocd/code - * https://github.com/pavelrevak/pystlink - * https://github.com/pavelrevak/pystlink - * - * with some contribution. - */ -#include "general.h" -#include "gdb_if.h" -#include "adiv5.h" -#include "stlinkv2.h" -#include "exception.h" -#include "jtag_devs.h" -#include "target.h" - -#include -#include -#include -#include -#include - -#include "cl_utils.h" - -#if !defined(timersub) -/* This is a copy from GNU C Library (GNU LGPL 2.1), sys/time.h. */ -# define timersub(a, b, result) \ - do { \ - (result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \ - (result)->tv_usec = (a)->tv_usec - (b)->tv_usec; \ - if ((result)->tv_usec < 0) { \ - --(result)->tv_sec; \ - (result)->tv_usec += 1000000; \ - } \ - } while (0) -#endif - -#define VENDOR_ID_STLINK 0x483 -#define PRODUCT_ID_STLINK_MASK 0xffe0 -#define PRODUCT_ID_STLINK_GROUP 0x3740 -#define PRODUCT_ID_STLINKV1 0x3744 -#define PRODUCT_ID_STLINKV2 0x3748 -#define PRODUCT_ID_STLINKV21 0x374b -#define PRODUCT_ID_STLINKV21_MSD 0x3752 -#define PRODUCT_ID_STLINKV3 0x374f -#define PRODUCT_ID_STLINKV3E 0x374e - -#define STLINK_SWIM_ERR_OK 0x00 -#define STLINK_SWIM_BUSY 0x01 -#define STLINK_DEBUG_ERR_OK 0x80 -#define STLINK_DEBUG_ERR_FAULT 0x81 -#define STLINK_JTAG_UNKNOWN_JTAG_CHAIN 0x04 -#define STLINK_NO_DEVICE_CONNECTED 0x05 -#define STLINK_JTAG_COMMAND_ERROR 0x08 -#define STLINK_JTAG_COMMAND_ERROR 0x08 -#define STLINK_JTAG_GET_IDCODE_ERROR 0x09 -#define STLINK_JTAG_DBG_POWER_ERROR 0x0b -#define STLINK_SWD_AP_WAIT 0x10 -#define STLINK_SWD_AP_FAULT 0x11 -#define STLINK_SWD_AP_ERROR 0x12 -#define STLINK_SWD_AP_PARITY_ERROR 0x13 -#define STLINK_JTAG_WRITE_ERROR 0x0c -#define STLINK_JTAG_WRITE_VERIF_ERROR 0x0d -#define STLINK_SWD_DP_WAIT 0x14 -#define STLINK_SWD_DP_FAULT 0x15 -#define STLINK_SWD_DP_ERROR 0x16 -#define STLINK_SWD_DP_PARITY_ERROR 0x17 - -#define STLINK_SWD_AP_WDATA_ERROR 0x18 -#define STLINK_SWD_AP_STICKY_ERROR 0x19 -#define STLINK_SWD_AP_STICKYORUN_ERROR 0x1a -#define STLINK_BAD_AP_ERROR 0x1d -#define STLINK_TOO_MANY_AP_ERROR 0x29 -#define STLINK_JTAG_UNKNOWN_CMD 0x42 - -#define STLINK_CORE_RUNNING 0x80 -#define STLINK_CORE_HALTED 0x81 -#define STLINK_CORE_STAT_UNKNOWN -1 - -#define STLINK_GET_VERSION 0xF1 -#define STLINK_DEBUG_COMMAND 0xF2 -#define STLINK_DFU_COMMAND 0xF3 -#define STLINK_SWIM_COMMAND 0xF4 -#define STLINK_GET_CURRENT_MODE 0xF5 -#define STLINK_GET_TARGET_VOLTAGE 0xF7 - -#define STLINK_DEV_DFU_MODE 0x00 -#define STLINK_DEV_MASS_MODE 0x01 -#define STLINK_DEV_DEBUG_MODE 0x02 -#define STLINK_DEV_SWIM_MODE 0x03 -#define STLINK_DEV_BOOTLOADER_MODE 0x04 -#define STLINK_DEV_UNKNOWN_MODE -1 - -#define STLINK_DFU_EXIT 0x07 - -#define STLINK_SWIM_ENTER 0x00 -#define STLINK_SWIM_EXIT 0x01 -#define STLINK_SWIM_READ_CAP 0x02 -#define STLINK_SWIM_SPEED 0x03 -#define STLINK_SWIM_ENTER_SEQ 0x04 -#define STLINK_SWIM_GEN_RST 0x05 -#define STLINK_SWIM_RESET 0x06 -#define STLINK_SWIM_ASSERT_RESET 0x07 -#define STLINK_SWIM_DEASSERT_RESET 0x08 -#define STLINK_SWIM_READSTATUS 0x09 -#define STLINK_SWIM_WRITEMEM 0x0a -#define STLINK_SWIM_READMEM 0x0b -#define STLINK_SWIM_READBUF 0x0c - -#define STLINK_DEBUG_GETSTATUS 0x01 -#define STLINK_DEBUG_FORCEDEBUG 0x02 -#define STLINK_DEBUG_APIV1_RESETSYS 0x03 -#define STLINK_DEBUG_APIV1_READALLREGS 0x04 -#define STLINK_DEBUG_APIV1_READREG 0x05 -#define STLINK_DEBUG_APIV1_WRITEREG 0x06 -#define STLINK_DEBUG_READMEM_32BIT 0x07 -#define STLINK_DEBUG_WRITEMEM_32BIT 0x08 -#define STLINK_DEBUG_RUNCORE 0x09 -#define STLINK_DEBUG_STEPCORE 0x0a -#define STLINK_DEBUG_APIV1_SETFP 0x0b -#define STLINK_DEBUG_READMEM_8BIT 0x0c -#define STLINK_DEBUG_WRITEMEM_8BIT 0x0d -#define STLINK_DEBUG_APIV1_CLEARFP 0x0e -#define STLINK_DEBUG_APIV1_WRITEDEBUGREG 0x0f -#define STLINK_DEBUG_APIV1_SETWATCHPOINT 0x10 - -#define STLINK_DEBUG_ENTER_JTAG_RESET 0x00 -#define STLINK_DEBUG_ENTER_SWD_NO_RESET 0xa3 -#define STLINK_DEBUG_ENTER_JTAG_NO_RESET 0xa4 - -#define STLINK_DEBUG_APIV1_ENTER 0x20 -#define STLINK_DEBUG_EXIT 0x21 -#define STLINK_DEBUG_READCOREID 0x22 - -#define STLINK_DEBUG_APIV2_ENTER 0x30 -#define STLINK_DEBUG_APIV2_READ_IDCODES 0x31 -#define STLINK_DEBUG_APIV2_RESETSYS 0x32 -#define STLINK_DEBUG_APIV2_READREG 0x33 -#define STLINK_DEBUG_APIV2_WRITEREG 0x34 -#define STLINK_DEBUG_APIV2_WRITEDEBUGREG 0x35 -#define STLINK_DEBUG_APIV2_READDEBUGREG 0x36 - -#define STLINK_DEBUG_APIV2_READALLREGS 0x3A -#define STLINK_DEBUG_APIV2_GETLASTRWSTATUS 0x3B -#define STLINK_DEBUG_APIV2_DRIVE_NRST 0x3C - -#define STLINK_DEBUG_APIV2_GETLASTRWSTATUS2 0x3E - -#define STLINK_DEBUG_APIV2_START_TRACE_RX 0x40 -#define STLINK_DEBUG_APIV2_STOP_TRACE_RX 0x41 -#define STLINK_DEBUG_APIV2_GET_TRACE_NB 0x42 -#define STLINK_DEBUG_APIV2_SWD_SET_FREQ 0x43 -#define STLINK_DEBUG_APIV2_JTAG_SET_FREQ 0x44 -#define STLINK_DEBUG_APIV2_READ_DAP_REG 0x45 -#define STLINK_DEBUG_APIV2_WRITE_DAP_REG 0x46 -#define STLINK_DEBUG_APIV2_READMEM_16BIT 0x47 -#define STLINK_DEBUG_APIV2_WRITEMEM_16BIT 0x48 - -#define STLINK_DEBUG_APIV2_INIT_AP 0x4B -#define STLINK_DEBUG_APIV2_CLOSE_AP_DBG 0x4C - -#define STLINK_APIV3_SET_COM_FREQ 0x61 -#define STLINK_APIV3_GET_COM_FREQ 0x62 - -#define STLINK_APIV3_GET_VERSION_EX 0xFB - -#define STLINK_DEBUG_APIV2_DRIVE_NRST_LOW 0x00 -#define STLINK_DEBUG_APIV2_DRIVE_NRST_HIGH 0x01 -#define STLINK_DEBUG_APIV2_DRIVE_NRST_PULSE 0x02 - - -#define STLINK_TRACE_SIZE 4096 -#define STLINK_TRACE_MAX_HZ 2000000 - -#define STLINK_V3_MAX_FREQ_NB 10 - -/** */ -enum stlink_mode { - STLINK_MODE_UNKNOWN = 0, - STLINK_MODE_DFU, - STLINK_MODE_MASS, - STLINK_MODE_DEBUG_JTAG, - STLINK_MODE_DEBUG_SWD, - STLINK_MODE_DEBUG_SWIM -}; - -enum transport_mode_t{ - STLINK_MODE_SWD = 0, - STLINK_MODE_JTAG -}; - -typedef struct { - libusb_context* libusb_ctx; - uint16_t vid; - uint16_t pid; - uint8_t transport_mode; - char serial[32]; - uint8_t dap_select; - uint8_t ep_tx; - uint8_t ver_hw; /* 20, 21 or 31 deciphered from USB PID.*/ - uint8_t ver_stlink; /* 2 or 3 from API.*/ - uint8_t ver_api; - uint8_t ver_jtag; - uint8_t ver_mass; - uint8_t ver_swim; - uint8_t ver_bridge; - uint16_t block_size; - bool ap_error; - libusb_device_handle *handle; - struct libusb_transfer* req_trans; - struct libusb_transfer* rep_trans; -} stlink; - -stlink Stlink; - -static int stlink_usb_get_rw_status(bool verbose); - -static void exit_function(void) -{ - libusb_exit(NULL); - DEBUG("Cleanup\n"); -} - -/* SIGTERM handler. */ -static void sigterm_handler(int sig) -{ - (void)sig; - exit(0); -} - -struct trans_ctx { -#define TRANS_FLAGS_IS_DONE (1 << 0) -#define TRANS_FLAGS_HAS_ERROR (1 << 1) - volatile unsigned long flags; -}; - -int debug_level = 0; -bool has_attached = false; - -static int LIBUSB_CALL hotplug_callback_attach( - libusb_context *ctx, libusb_device *dev, libusb_hotplug_event event, - void *user_data) -{ - (void)ctx; - (void)dev; - (void)event; - (void)user_data; - has_attached = true; - return 1; /* deregister Callback*/ -} - -int device_detached = 0; -static int LIBUSB_CALL hotplug_callback_detach( - libusb_context *ctx, libusb_device *dev, libusb_hotplug_event event, - void *user_data) -{ - (void)ctx; - (void)dev; - (void)event; - (void)user_data; - device_detached = 1; - return 1; /* deregister Callback*/ -} - -void stlink_check_detach(int state) -{ - if (state == 1) { - /* Check for hotplug events */ - struct timeval tv = {0,0}; - libusb_handle_events_timeout_completed( - Stlink.libusb_ctx, &tv, &device_detached); - if (device_detached) { - DEBUG("Dongle was detached\n"); - exit(0); - } - } -} - -static void LIBUSB_CALL on_trans_done(struct libusb_transfer * trans) -{ - struct trans_ctx * const ctx = trans->user_data; - - if (trans->status != LIBUSB_TRANSFER_COMPLETED) - { - DEBUG("on_trans_done: "); - if(trans->status == LIBUSB_TRANSFER_TIMED_OUT) - { - DEBUG("Timeout\n"); - } else if (trans->status == LIBUSB_TRANSFER_CANCELLED) { - DEBUG("cancelled\n"); - } else if (trans->status == LIBUSB_TRANSFER_NO_DEVICE) { - DEBUG("no device\n"); - } else { - DEBUG("unknown\n"); - } - ctx->flags |= TRANS_FLAGS_HAS_ERROR; - } - ctx->flags |= TRANS_FLAGS_IS_DONE; -} - -static int submit_wait(struct libusb_transfer * trans) { - struct timeval start; - struct timeval now; - struct timeval diff; - struct trans_ctx trans_ctx; - enum libusb_error error; - - trans_ctx.flags = 0; - - /* brief intrusion inside the libusb interface */ - trans->callback = on_trans_done; - trans->user_data = &trans_ctx; - - if ((error = libusb_submit_transfer(trans))) { - DEBUG("libusb_submit_transfer(%d): %s\n", error, - libusb_strerror(error)); - exit(-1); - } - - gettimeofday(&start, NULL); - - while (trans_ctx.flags == 0) { - struct timeval timeout; - timeout.tv_sec = 1; - timeout.tv_usec = 0; - if (libusb_handle_events_timeout(Stlink.libusb_ctx, &timeout)) { - DEBUG("libusb_handle_events()\n"); - return -1; - } - - gettimeofday(&now, NULL); - timersub(&now, &start, &diff); - if (diff.tv_sec >= 1) { - libusb_cancel_transfer(trans); - DEBUG("libusb_handle_events() timeout\n"); - return -1; - } - } - - if (trans_ctx.flags & TRANS_FLAGS_HAS_ERROR) { - DEBUG("libusb_handle_events() | has_error\n"); - return -1; - } - - return 0; -} -#define STLINK_ERROR_DP_FAULT -2 -static int send_recv(uint8_t *txbuf, size_t txsize, - uint8_t *rxbuf, size_t rxsize) -{ - int res = 0; - stlink_check_detach(1); - if( txsize) { - int txlen = txsize; - libusb_fill_bulk_transfer(Stlink.req_trans, Stlink.handle, - Stlink.ep_tx | LIBUSB_ENDPOINT_OUT, - txbuf, txlen, - NULL, NULL, - 0 - ); - DEBUG_USB(" Send (%d): ", txlen); - for (int i = 0; i < txlen && i < 32 ; i++) { - DEBUG_USB("%02x", txbuf[i]); - if ((i & 7) == 7) - DEBUG_USB("."); - } - if (submit_wait(Stlink.req_trans)) { - DEBUG_USB("clear 2\n"); - libusb_clear_halt(Stlink.handle,2); - return -1; - } - } - /* send_only */ - if (rxsize != 0) { - /* read the response */ - libusb_fill_bulk_transfer(Stlink.rep_trans, Stlink.handle, - 0x01| LIBUSB_ENDPOINT_IN, - rxbuf, rxsize, NULL, NULL, 0); - - if (submit_wait(Stlink.rep_trans)) { - DEBUG("clear 1\n"); - libusb_clear_halt(Stlink.handle,1); - return -1; - } - res = Stlink.rep_trans->actual_length; - if (res >0) { - int i; - uint8_t *p = rxbuf; - DEBUG_USB(" Rec (%zu/%d)", rxsize, res); - for (i = 0; i < res && i < 32 ; i++) { - if ( i && ((i & 7) == 0)) - DEBUG_USB("."); - DEBUG_USB("%02x", p[i]); - } - } - } - DEBUG_USB("\n"); - return res; -} - -/** - Converts an STLINK status code held in the first byte of a response to - readable error -*/ -static int stlink_usb_error_check(uint8_t *data, bool verbose) -{ - switch (data[0]) { - case STLINK_DEBUG_ERR_OK: - return STLINK_ERROR_OK; - case STLINK_DEBUG_ERR_FAULT: - if (verbose) - DEBUG("SWD fault response (0x%x)\n", STLINK_DEBUG_ERR_FAULT); - return STLINK_ERROR_FAIL; - case STLINK_JTAG_UNKNOWN_JTAG_CHAIN: - if (verbose) - DEBUG("Unknown JTAG chain\n"); - return STLINK_ERROR_FAIL; - case STLINK_NO_DEVICE_CONNECTED: - if (verbose) - DEBUG("No device connected\n"); - return STLINK_ERROR_FAIL; - case STLINK_JTAG_COMMAND_ERROR: - if (verbose) - DEBUG("Command error\n"); - return STLINK_ERROR_FAIL; - case STLINK_JTAG_GET_IDCODE_ERROR: - if (verbose) - DEBUG("Failure reading IDCODE\n"); - return STLINK_ERROR_FAIL; - case STLINK_JTAG_DBG_POWER_ERROR: - if (verbose) - DEBUG("Failure powering DBG\n"); - return STLINK_ERROR_WAIT; - case STLINK_SWD_AP_WAIT: - if (verbose) - DEBUG("wait status SWD_AP_WAIT (0x%x)\n", STLINK_SWD_AP_WAIT); - return STLINK_ERROR_WAIT; - case STLINK_SWD_DP_WAIT: - if (verbose) - DEBUG("wait status SWD_DP_WAIT (0x%x)\n", STLINK_SWD_DP_WAIT); - return STLINK_ERROR_WAIT; - case STLINK_JTAG_WRITE_ERROR: - if (verbose) - DEBUG("Write error\n"); - return STLINK_ERROR_FAIL; - case STLINK_JTAG_WRITE_VERIF_ERROR: - if (verbose) - DEBUG("Write verify error, ignoring\n"); - return STLINK_ERROR_OK; - case STLINK_SWD_AP_FAULT: - /* git://git.ac6.fr/openocd commit 657e3e885b9ee10 - * returns STLINK_ERROR_OK with the comment: - * Change in error status when reading outside RAM. - * This fix allows CDT plugin to visualize memory. - */ - Stlink.ap_error = true; - if (verbose) - DEBUG("STLINK_SWD_AP_FAULT\n"); - return STLINK_ERROR_DP_FAULT; - case STLINK_SWD_AP_ERROR: - if (verbose) - DEBUG("STLINK_SWD_AP_ERROR\n"); - return STLINK_ERROR_FAIL; - case STLINK_SWD_AP_PARITY_ERROR: - if (verbose) - DEBUG("STLINK_SWD_AP_PARITY_ERROR\n"); - return STLINK_ERROR_FAIL; - case STLINK_SWD_DP_FAULT: - if (verbose) - DEBUG("STLINK_SWD_DP_FAULT\n"); - return STLINK_ERROR_FAIL; - case STLINK_SWD_DP_ERROR: - if (verbose) - DEBUG("STLINK_SWD_DP_ERROR\n"); - raise_exception(EXCEPTION_ERROR, "STLINK_SWD_DP_ERROR"); - return STLINK_ERROR_FAIL; - case STLINK_SWD_DP_PARITY_ERROR: - if (verbose) - DEBUG("STLINK_SWD_DP_PARITY_ERROR\n"); - return STLINK_ERROR_FAIL; - case STLINK_SWD_AP_WDATA_ERROR: - if (verbose) - DEBUG("STLINK_SWD_AP_WDATA_ERROR\n"); - return STLINK_ERROR_FAIL; - case STLINK_SWD_AP_STICKY_ERROR: - if (verbose) - DEBUG("STLINK_SWD_AP_STICKY_ERROR\n"); - return STLINK_ERROR_FAIL; - case STLINK_SWD_AP_STICKYORUN_ERROR: - if (verbose) - DEBUG("STLINK_SWD_AP_STICKYORUN_ERROR\n"); - return STLINK_ERROR_FAIL; - case STLINK_BAD_AP_ERROR: - /* ADIV5 probe 256 APs, most of them are non exisitant.*/ - return STLINK_ERROR_FAIL; - case STLINK_TOO_MANY_AP_ERROR: - /* TI TM4C duplicates AP. Error happens at AP9.*/ - if (verbose) - DEBUG("STLINK_TOO_MANY_AP_ERROR\n"); - return STLINK_ERROR_FAIL; - case STLINK_JTAG_UNKNOWN_CMD : - if (verbose) - DEBUG("STLINK_JTAG_UNKNOWN_CMD\n"); - return STLINK_ERROR_FAIL; - default: - if (verbose) - DEBUG("unknown/unexpected STLINK status code 0x%x\n", data[0]); - return STLINK_ERROR_FAIL; - } -} - -static int send_recv_retry(uint8_t *txbuf, size_t txsize, - uint8_t *rxbuf, size_t rxsize) -{ - struct timeval start; - struct timeval now; - struct timeval diff; - gettimeofday(&start, NULL); - int res; - while(1) { - send_recv(txbuf, txsize, rxbuf, rxsize); - res = stlink_usb_error_check(rxbuf, false); - if (res == STLINK_ERROR_OK) - return res; - gettimeofday(&now, NULL); - timersub(&now, &start, &diff); - if ((diff.tv_sec >= 1) || (res != STLINK_ERROR_WAIT)) { - DEBUG("write_retry failed. "); - return res; - } - } - return res; -} - -static int read_retry(uint8_t *txbuf, size_t txsize, - uint8_t *rxbuf, size_t rxsize) -{ - struct timeval start; - struct timeval now; - struct timeval diff; - gettimeofday(&start, NULL); - int res; - while(1) { - send_recv(txbuf, txsize, rxbuf, rxsize); - res = stlink_usb_get_rw_status(false); - if (res == STLINK_ERROR_OK) - return res; - gettimeofday(&now, NULL); - timersub(&now, &start, &diff); - if ((diff.tv_sec >= 1) || (res != STLINK_ERROR_WAIT)) { - DEBUG("read_retry failed. "); - stlink_usb_get_rw_status(true); - return res; - } - } - return res; -} - -static int write_retry(uint8_t *cmdbuf, size_t cmdsize, - uint8_t *txbuf, size_t txsize) -{ - struct timeval start; - struct timeval now; - struct timeval diff; - gettimeofday(&start, NULL); - int res; - while(1) { - send_recv(cmdbuf, cmdsize, NULL, 0); - send_recv(txbuf, txsize, NULL, 0); - res = stlink_usb_get_rw_status(false); - if (res == STLINK_ERROR_OK) - return res; - gettimeofday(&now, NULL); - timersub(&now, &start, &diff); - if ((diff.tv_sec >= 1) || (res != STLINK_ERROR_WAIT)) { - stlink_usb_get_rw_status(true); - return res; - } - } - return res; -} - -static void stlink_version(void) -{ - if (Stlink.ver_hw == 30) { - uint8_t cmd[16] = {STLINK_APIV3_GET_VERSION_EX}; - uint8_t data[12]; - int size = send_recv(cmd, 16, data, 12); - if (size == -1) { - printf("[!] send_recv STLINK_APIV3_GET_VERSION_EX\n"); - } - Stlink.ver_stlink = data[0]; - Stlink.ver_swim = data[1]; - Stlink.ver_jtag = data[2]; - Stlink.ver_mass = data[3]; - Stlink.ver_bridge = data[4]; - Stlink.block_size = 512; - Stlink.vid = data[3] << 9 | data[8]; - Stlink.pid = data[5] << 11 | data[10]; - } else { - uint8_t cmd[16] = {STLINK_GET_VERSION}; - uint8_t data[6]; - int size = send_recv(cmd, 16, data, 6); - if (size == -1) { - printf("[!] send_recv STLINK_GET_VERSION_EX\n"); - } - Stlink.vid = data[3] << 8 | data[2]; - Stlink.pid = data[5] << 8 | data[4]; - int version = data[0] << 8 | data[1]; /* Big endian here!*/ - Stlink.block_size = 64; - Stlink.ver_stlink = (version >> 12) & 0x0f; - Stlink.ver_jtag = (version >> 6) & 0x3f; - if ((Stlink.pid == PRODUCT_ID_STLINKV21_MSD) || - (Stlink.pid == PRODUCT_ID_STLINKV21)) { - Stlink.ver_mass = (version >> 0) & 0x3f; - } else { - Stlink.ver_swim = (version >> 0) & 0x3f; - } - } - DEBUG("V%dJ%d",Stlink.ver_stlink, Stlink.ver_jtag); - if (Stlink.ver_hw == 30) { - DEBUG("M%dB%dS%d", Stlink.ver_mass, Stlink.ver_bridge, Stlink.ver_swim); - } else if (Stlink.ver_hw == 20) { - DEBUG("S%d", Stlink.ver_swim); - } else if (Stlink.ver_hw == 21) { - DEBUG("M%d", Stlink.ver_mass); - } - DEBUG("\n"); -} - -void stlink_leave_state(void) -{ - uint8_t cmd[16] = {STLINK_GET_CURRENT_MODE}; - uint8_t data[2]; - send_recv(cmd, 16, data, 2); - if (data[0] == STLINK_DEV_DFU_MODE) { - uint8_t dfu_cmd[16] = {STLINK_DFU_COMMAND, STLINK_DFU_EXIT}; - DEBUG("Leaving DFU Mode\n"); - send_recv(dfu_cmd, 16, NULL, 0); - } else if (data[0] == STLINK_DEV_SWIM_MODE) { - uint8_t swim_cmd[16] = {STLINK_SWIM_COMMAND, STLINK_SWIM_EXIT}; - DEBUG("Leaving SWIM Mode\n"); - send_recv(swim_cmd, 16, NULL, 0); - } else if (data[0] == STLINK_DEV_DEBUG_MODE) { - uint8_t dbg_cmd[16] = {STLINK_DEBUG_COMMAND, STLINK_DEBUG_EXIT}; - DEBUG("Leaving DEBUG Mode\n"); - send_recv(dbg_cmd, 16, NULL, 0); - } else if (data[0] == STLINK_DEV_BOOTLOADER_MODE) { - DEBUG("Leaving BOOTLOADER Mode\n"); - } else if (data[0] == STLINK_DEV_MASS_MODE) { - DEBUG("Leaving MASS Mode\n"); - } else { - DEBUG("Unknown Mode %02x\n", data[0]); - } -} - -const char *stlink_target_voltage(void) -{ - uint8_t cmd[16] = {STLINK_GET_TARGET_VOLTAGE}; - uint8_t data[8]; - send_recv(cmd, 16, data, 8); - uint16_t adc[2]; - adc[0] = data[0] | data[1] << 8; /* Calibration value? */ - adc[1] = data[4] | data[5] << 8; /* Measured value?*/ - float result = 0.0; - if (adc[0]) - result = 2.0 * adc[1] * 1.2 / adc[0]; - static char res[6]; - sprintf(res, "%4.2fV", result); - return res; -} - -static void stlink_resetsys(void) -{ - uint8_t cmd[16] = {STLINK_DEBUG_COMMAND ,STLINK_DEBUG_APIV2_RESETSYS}; - uint8_t data[2]; - send_recv(cmd, 16, data, 2); -} - -void stlink_init(int argc, char **argv) -{ - BMP_CL_OPTIONS_t cl_opts = {0}; - cl_opts.opt_idstring = "Blackmagic Debug Probe on StlinkV2/3"; - cl_init(&cl_opts, argc, argv); - libusb_device **devs, *dev; - int r; - int ret = -1; - atexit(exit_function); - signal(SIGTERM, sigterm_handler); - signal(SIGINT, sigterm_handler); - libusb_init(&Stlink.libusb_ctx); - r = libusb_init(NULL); - if (r < 0) - DEBUG("Failed: %s", libusb_strerror(r)); - bool hotplug = true; - if (!libusb_has_capability (LIBUSB_CAP_HAS_HOTPLUG)) { - printf("Hotplug capabilites are not supported on this platform\n"); - hotplug = false; - } - ssize_t cnt; - rescan: - has_attached = 0; - memset(&Stlink, 0, sizeof(Stlink)); - cnt = libusb_get_device_list(NULL, &devs); - if (cnt < 0) { - DEBUG("Failed: %s", libusb_strerror(r)); - goto error; - } - int i = 0; - int nr_stlinks = 0; - while ((dev = devs[i++]) != NULL) { - struct libusb_device_descriptor desc; - int r = libusb_get_device_descriptor(dev, &desc); - if (r < 0) { - fprintf(stderr, "libusb_get_device_descriptor failed %s", - libusb_strerror(r)); - goto error; - } - if ((desc.idVendor == VENDOR_ID_STLINK) && - ((desc.idProduct & PRODUCT_ID_STLINK_MASK) == - PRODUCT_ID_STLINK_GROUP)) { - if (desc.idProduct == PRODUCT_ID_STLINKV1) { /* Reject V1 devices.*/ - DEBUG("STLINKV1 not supported\n"); - continue; - } - Stlink.vid = desc.idVendor; - Stlink.pid = desc.idProduct; - r = libusb_open(dev, &Stlink.handle); - if (r == LIBUSB_SUCCESS) { - uint8_t data[32]; - uint16_t lang; - libusb_get_string_descriptor( - Stlink.handle, 0, 0, data, sizeof(data)); - lang = data[2] << 8 | data[3]; - unsigned char sernum[32]; - if (desc.iSerialNumber) { - r = libusb_get_string_descriptor - (Stlink.handle, desc.iSerialNumber, lang, - sernum, sizeof(sernum)); - } else { - DEBUG("No serial number\n"); - } - /* Older devices have hex values instead of ascii - * in the serial string. Recode eventually!*/ - bool readable = true; - uint16_t *p = (uint16_t *)sernum; - for (p += 1; *p; p++) { - bool isr = isalnum(*p); - readable &= isr; - } - char *s = Stlink.serial; - p = (uint16_t *)sernum; - for (p += 1; *p; p++, s++) { - if (readable) - *s = *p; - else - snprintf(s, 3, "%02x", *p & 0xff); - } - if (cl_opts.opt_serial && (!strncmp(Stlink.serial, cl_opts.opt_serial, - strlen(cl_opts.opt_serial)))) - DEBUG("Found "); - if (desc.idProduct == PRODUCT_ID_STLINKV2) { - DEBUG("STLINKV20 serial %s\n", Stlink.serial); - Stlink.ver_hw = 20; - Stlink.ep_tx = 2; - } else if (desc.idProduct == PRODUCT_ID_STLINKV21) { - DEBUG("STLINKV21 serial %s\n", Stlink.serial); - Stlink.ver_hw = 21; - Stlink.ep_tx = 1; - } else if (desc.idProduct == PRODUCT_ID_STLINKV21_MSD) { - DEBUG("STLINKV21_MSD serial %s\n", Stlink.serial); - Stlink.ver_hw = 21; - Stlink.ep_tx = 1; - } else if (desc.idProduct == PRODUCT_ID_STLINKV3E) { - DEBUG("STLINKV3E serial %s\n", Stlink.serial); - Stlink.ver_hw = 30; - Stlink.ep_tx = 1; - } else if (desc.idProduct == PRODUCT_ID_STLINKV3) { - DEBUG("STLINKV3 serial %s\n", Stlink.serial); - Stlink.ver_hw = 30; - Stlink.ep_tx = 1; - } else { - DEBUG("Unknown STLINK variant, serial %s\n", Stlink.serial); - } - nr_stlinks++; - if (cl_opts.opt_serial) { - if (!strncmp(Stlink.serial, cl_opts.opt_serial, - strlen(cl_opts.opt_serial))) { - break; - } else { - libusb_close(Stlink.handle); - Stlink.handle = 0; - } - } - } else { - DEBUG("Open failed %s\n", libusb_strerror(r)); - } - } - } - libusb_free_device_list(devs, 1); - if (!Stlink.handle) { - if (nr_stlinks && cl_opts.opt_serial) { - DEBUG("No Stlink with given serial number %s\n", cl_opts.opt_serial); - } else if (nr_stlinks > 1) { - DEBUG("Multiple Stlinks. Please specify serial number\n"); - goto error; - } else { - DEBUG("No Stlink device found!\n"); - } - if (hotplug && !cl_opts.opt_no_wait) { - libusb_hotplug_callback_handle hp; - int rc = libusb_hotplug_register_callback - (NULL, LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED, 0, - VENDOR_ID_STLINK, LIBUSB_HOTPLUG_MATCH_ANY, - LIBUSB_HOTPLUG_MATCH_ANY, - hotplug_callback_attach, NULL, &hp); - if (LIBUSB_SUCCESS != rc) { - DEBUG("Error registering attach callback\n"); - goto error; - } - DEBUG("Waiting for %sST device%s%s to attach\n", - (cl_opts.opt_serial)? "" : "some ", - (cl_opts.opt_serial)? " with serial ": "", - (cl_opts.opt_serial)? cl_opts.opt_serial: ""); - DEBUG("Terminate with ^C\n"); - while (has_attached == 0) { - rc = libusb_handle_events (NULL); - if (rc < 0) - printf("libusb_handle_events() failed: %s\n", - libusb_error_name(rc)); - } - goto rescan; - } - goto error; - } - int config; - r = libusb_get_configuration(Stlink.handle, &config); - if (r) { - DEBUG("libusb_get_configuration failed %d: %s", r, libusb_strerror(r)); - goto error_1; - } - DEBUG("Config %d\n", config); - if (config != 1) { - r = libusb_set_configuration(Stlink.handle, 0); - if (r) { - DEBUG("libusb_set_configuration failed %d: %s", - r, libusb_strerror(r)); - goto error_1; - } - } - r = libusb_claim_interface(Stlink.handle, 0); - if (r) - { - DEBUG("libusb_claim_interface failed %s\n", libusb_strerror(r)); - goto error_1; - } - if (hotplug) { /* Allow gracefully exit when stlink is unplugged*/ - libusb_hotplug_callback_handle hp; - int rc = libusb_hotplug_register_callback - (NULL, LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT, 0, Stlink.vid, Stlink.pid, - LIBUSB_HOTPLUG_MATCH_ANY, hotplug_callback_detach, NULL, &hp); - if (LIBUSB_SUCCESS != rc) { - DEBUG("Error registering detach callback\n"); - goto error; - } - } - Stlink.req_trans = libusb_alloc_transfer(0); - Stlink.rep_trans = libusb_alloc_transfer(0); - stlink_version(); - if ((Stlink.ver_stlink < 3 && Stlink.ver_jtag < 32) || - (Stlink.ver_stlink == 3 && Stlink.ver_jtag < 3)) { - /* Maybe the adapter is in some strange state. Try to reset */ - int result = libusb_reset_device(Stlink.handle); - DEBUG("Trying reset\n"); - if (result == LIBUSB_ERROR_BUSY) { /* Try again */ - platform_delay(50); - result = libusb_reset_device(Stlink.handle); - } - if (result != LIBUSB_SUCCESS) { - DEBUG("libusb_reset_device failed\n"); - goto error_1; - } - stlink_version(); - } - if ((Stlink.ver_stlink < 3 && Stlink.ver_jtag < 32) || - (Stlink.ver_stlink == 3 && Stlink.ver_jtag < 3)) { - DEBUG("Please update Firmware\n"); - goto error_1; - } - stlink_leave_state(); - stlink_resetsys(); - if (cl_opts.opt_mode != BMP_MODE_DEBUG) { - ret = cl_execute(&cl_opts); - } else { - assert(gdb_if_init() == 0); - return; - } - error_1: - libusb_close(Stlink.handle); - error: - libusb_exit(Stlink.libusb_ctx); - exit(ret); -} - -void stlink_srst_set_val(bool assert) -{ - uint8_t cmd[16] = {STLINK_DEBUG_COMMAND, - STLINK_DEBUG_APIV2_DRIVE_NRST, - (assert)? STLINK_DEBUG_APIV2_DRIVE_NRST_LOW - : STLINK_DEBUG_APIV2_DRIVE_NRST_HIGH}; - uint8_t data[2]; - send_recv(cmd, 16, data, 2); - stlink_usb_error_check(data, true); -} - -bool stlink_set_freq_divisor(uint16_t divisor) -{ - uint8_t cmd[16] = {STLINK_DEBUG_COMMAND, - STLINK_DEBUG_APIV2_SWD_SET_FREQ, - divisor & 0xff, divisor >> 8}; - uint8_t data[2]; - send_recv(cmd, 16, data, 2); - if (stlink_usb_error_check(data, false)) - return false; - return true; -} - -bool stlink3_set_freq_divisor(uint16_t divisor) -{ - uint8_t cmd[16] = {STLINK_DEBUG_COMMAND, - STLINK_APIV3_GET_COM_FREQ, - Stlink.transport_mode}; - uint8_t data[52]; - send_recv(cmd, 16, data, 52); - stlink_usb_error_check(data, true); - int size = data[8]; - if (divisor > size) - divisor = size; - uint8_t *p = data + 12 + divisor * sizeof(uint32_t); - uint32_t freq = p[0] | p[1] << 8 | p[2] << 16 | p[3] << 24; - DEBUG("Selected %" PRId32 " khz\n", freq); - cmd[1] = STLINK_APIV3_SET_COM_FREQ; - cmd[2] = Stlink.transport_mode; - cmd[3] = 0; - p = data + 12 + divisor * sizeof(uint32_t); - cmd[4] = p[0]; - cmd[5] = p[1]; - cmd[6] = p[2]; - cmd[7] = p[3]; - send_recv(cmd, 16, data, 8); - return true; -} - -int stlink_hwversion(void) -{ - return Stlink.ver_stlink; -} - -int stlink_enter_debug_swd(void) -{ - stlink_leave_state(); - Stlink.transport_mode = STLINK_MODE_SWD; - if (Stlink.ver_stlink == 3) - stlink3_set_freq_divisor(2); - else - stlink_set_freq_divisor(1); - uint8_t cmd[16] = {STLINK_DEBUG_COMMAND, - STLINK_DEBUG_APIV2_ENTER, - STLINK_DEBUG_ENTER_SWD_NO_RESET}; - uint8_t data[2]; - DEBUG("Enter SWD\n"); - send_recv_retry(cmd, 16, data, 2); - return stlink_usb_error_check(data, true); -} - -int stlink_enter_debug_jtag(void) -{ - stlink_leave_state(); - Stlink.transport_mode = STLINK_MODE_JTAG; - if (Stlink.ver_stlink == 3) - stlink3_set_freq_divisor(4); - else - stlink_set_freq_divisor(1); - uint8_t cmd[16] = {STLINK_DEBUG_COMMAND, - STLINK_DEBUG_APIV2_ENTER, - STLINK_DEBUG_ENTER_JTAG_NO_RESET}; - uint8_t data[2]; - DEBUG("Enter JTAG\n"); - send_recv(cmd, 16, data, 2); - return stlink_usb_error_check(data, true); -} - -uint32_t stlink_read_coreid(void) -{ - uint8_t cmd[16] = {STLINK_DEBUG_COMMAND, - STLINK_DEBUG_READCOREID}; - uint8_t data[4]; - send_recv(cmd, 16, data, 4); - uint32_t id = data[0] | data[1] << 8 | data[2] << 16 | data[3] << 24; - DEBUG("Read Core ID: 0x%08" PRIx32 "\n", id); - return id; -} - -int stlink_read_idcodes(uint32_t *idcodes) -{ - uint8_t cmd[16] = {STLINK_DEBUG_COMMAND, - STLINK_DEBUG_APIV2_READ_IDCODES}; - uint8_t data[12]; - send_recv(cmd, 16, data, 12); - if (stlink_usb_error_check(data, true)) - return 0; - uint8_t *p = data + 4; - idcodes[0] = p[0] | p[1] << 8 | p[2] << 16 | p[3] << 24; - p += 4; - idcodes[1] = p[0] | p[1] << 8 | p[2] << 16 | p[3] << 24; - return 2; -} - -uint32_t stlink_dp_read(ADIv5_DP_t *dp, uint16_t addr) -{ - if (addr & ADIV5_APnDP) { - DEBUG_STLINK("AP read addr 0x%04" PRIx16 "\n", addr); - stlink_dp_low_access(dp, ADIV5_LOW_READ, addr, 0); - return stlink_dp_low_access(dp, ADIV5_LOW_READ, - ADIV5_DP_RDBUFF, 0); - } else { - DEBUG_STLINK("DP read addr 0x%04" PRIx16 "\n", addr); - return stlink_dp_low_access(dp, ADIV5_LOW_READ, addr, 0); - } -} - -uint32_t stlink_dp_error(ADIv5_DP_t *dp) -{ - uint32_t err, clr = 0; - - err = stlink_dp_read(dp, ADIV5_DP_CTRLSTAT) & - (ADIV5_DP_CTRLSTAT_STICKYORUN | ADIV5_DP_CTRLSTAT_STICKYCMP | - ADIV5_DP_CTRLSTAT_STICKYERR | ADIV5_DP_CTRLSTAT_WDATAERR); - - if(err & ADIV5_DP_CTRLSTAT_STICKYORUN) - clr |= ADIV5_DP_ABORT_ORUNERRCLR; - if(err & ADIV5_DP_CTRLSTAT_STICKYCMP) - clr |= ADIV5_DP_ABORT_STKCMPCLR; - if(err & ADIV5_DP_CTRLSTAT_STICKYERR) - clr |= ADIV5_DP_ABORT_STKERRCLR; - if(err & ADIV5_DP_CTRLSTAT_WDATAERR) - clr |= ADIV5_DP_ABORT_WDERRCLR; - - adiv5_dp_write(dp, ADIV5_DP_ABORT, clr); - dp->fault = 0; - if (err) - DEBUG("stlink_dp_error %d\n", err); - err |= Stlink.ap_error; - Stlink.ap_error = false; - return err; -} - -void stlink_dp_abort(ADIv5_DP_t *dp, uint32_t abort) -{ - adiv5_dp_write(dp, ADIV5_DP_ABORT, abort); -} - -int stlink_read_dp_register(uint16_t port, uint16_t addr, uint32_t *reg) -{ - uint8_t cmd[16] = {STLINK_DEBUG_COMMAND, - STLINK_DEBUG_APIV2_READ_DAP_REG, - port & 0xff, port >> 8, - addr & 0xff, addr >> 8}; - if (port == STLINK_DEBUG_PORT_ACCESS && Stlink.dap_select) - cmd[4] = ((Stlink.dap_select & 0xf) << 4) | (addr & 0xf); - else - cmd[4] = addr & 0xff; - DEBUG_STLINK("Read DP, Addr 0x%04" PRIx16 ": \n", addr); - uint8_t data[8]; - int res = send_recv_retry(cmd, 16, data, 8); - if (res == STLINK_ERROR_OK) { - uint32_t ret = data[4] | data[5] << 8 | data[6] << 16 | data[7] << 24; - DEBUG_STLINK("0x%08" PRIx32" \n", ret); - *reg = ret; - } else { - DEBUG_STLINK("failed, res %d\n", res); - } - return res; -} - -int stlink_write_dp_register(uint16_t port, uint16_t addr, uint32_t val) -{ - if (port == STLINK_DEBUG_PORT_ACCESS && addr == 8) { - Stlink.dap_select = val; - DEBUG_STLINK("Caching SELECT 0x%02" PRIx32 "\n", val); - return STLINK_ERROR_OK; - } else { - uint8_t cmd[16] = { - STLINK_DEBUG_COMMAND, STLINK_DEBUG_APIV2_WRITE_DAP_REG, - port & 0xff, port >> 8, - addr & 0xff, addr >> 8, - val & 0xff, (val >> 8) & 0xff, (val >> 16) & 0xff, - (val >> 24) & 0xff}; - uint8_t data[2]; - send_recv_retry(cmd, 16, data, 2); - DEBUG_STLINK("Write DP, Addr 0x%04" PRIx16 ": 0x%08" PRIx32 - " \n", addr, val); - return stlink_usb_error_check(data, true); - } -} - -uint32_t stlink_dp_low_access(ADIv5_DP_t *dp, uint8_t RnW, - uint16_t addr, uint32_t value) -{ - uint32_t response = 0; - int res; - if (RnW) { - res = stlink_read_dp_register( - STLINK_DEBUG_PORT_ACCESS, addr, &response); - DEBUG_STLINK("SWD read addr %04" PRIx16 ": %08" PRIx32 "\n", - addr, response); - } else { - DEBUG_STLINK("SWD write addr %04" PRIx16 ": %08" PRIx32 "\n", - addr, value); - res = stlink_write_dp_register(STLINK_DEBUG_PORT_ACCESS, addr, value); - } - if (res == STLINK_ERROR_WAIT) - raise_exception(EXCEPTION_TIMEOUT, "DP ACK timeout"); - - if(res == STLINK_ERROR_DP_FAULT) { - dp->fault = 1; - return 0; - } - if(res == STLINK_ERROR_FAIL) - raise_exception(EXCEPTION_ERROR, "SWDP invalid ACK"); - - return response; -} - -static bool stlink_ap_setup(int ap) -{ - if (ap > 7) - return false; - uint8_t cmd[16] = { - STLINK_DEBUG_COMMAND, - STLINK_DEBUG_APIV2_INIT_AP, - ap, - }; - uint8_t data[2]; - send_recv_retry(cmd, 16, data, 2); - DEBUG_STLINK("Open AP %d\n", ap); - int res = stlink_usb_error_check(data, true); - if (res) { - if (Stlink.ver_hw == 30) { - DEBUG("STLINKV3 only connects to STM8/32!\n"); - } - return false; - } - return true; -} - -static void stlink_ap_cleanup(int ap) -{ - uint8_t cmd[16] = { - STLINK_DEBUG_COMMAND, - STLINK_DEBUG_APIV2_CLOSE_AP_DBG, - ap, - }; - uint8_t data[2]; - send_recv(cmd, 16, data, 2); - DEBUG_STLINK("Close AP %d\n", ap); - stlink_usb_error_check(data, true); -} -static int stlink_usb_get_rw_status(bool verbose) -{ - uint8_t cmd[16] = { - STLINK_DEBUG_COMMAND, - STLINK_DEBUG_APIV2_GETLASTRWSTATUS2 - }; - uint8_t data[12]; - send_recv(cmd, 16, data, 12); - return stlink_usb_error_check(data, verbose); -} - -static void stlink_readmem(ADIv5_AP_t *ap, void *dest, uint32_t src, size_t len) -{ - if (len == 0) - return; - size_t read_len = len; - uint8_t type; - char *CMD; - if (src & 1 || len & 1) { - CMD = "READMEM_8BIT"; - type = STLINK_DEBUG_READMEM_8BIT; - if (len > Stlink.block_size) { - DEBUG(" Too large!\n"); - return; - } - if (len == 1) - read_len ++; /* Fix read length as in openocd*/ - } else if (src & 3 || len & 3) { - CMD = "READMEM_16BIT"; - type = STLINK_DEBUG_APIV2_READMEM_16BIT; - } else { - CMD = "READMEM_32BIT"; - type = STLINK_DEBUG_READMEM_32BIT; - - } - DEBUG_STLINK("%s len %zu addr 0x%08" PRIx32 " AP %d : ", - CMD, len, src, ap->apsel); - uint8_t cmd[16] = { - STLINK_DEBUG_COMMAND, - type, - src & 0xff, (src >> 8) & 0xff, (src >> 16) & 0xff, - (src >> 24) & 0xff, - len & 0xff, len >> 8, ap->apsel}; - int res = read_retry(cmd, 16, dest, read_len); - if (res == STLINK_ERROR_OK) { - uint8_t *p = (uint8_t*)dest; - for (size_t i = 0; i < len ; i++) { - DEBUG_STLINK("%02x", *p++); - } - } else { - /* FIXME: What is the right measure when failing? - * - * E.g. TM4C129 gets here when NRF probe reads 0x10000010 - * Approach taken: - * Fill the memory with some fixed pattern so hopefully - * the caller notices the error*/ - DEBUG("stlink_readmem failed\n"); - memset(dest, 0xff, len); - } - DEBUG_STLINK("\n"); -} - -static void stlink_writemem8(ADIv5_AP_t *ap, uint32_t addr, size_t len, - uint8_t *buffer) -{ - DEBUG_STLINK("Mem Write8 AP %d len %zu addr 0x%08" PRIx32 ": ", - ap->apsel, len, addr); - for (size_t t = 0; t < len; t++) { - DEBUG_STLINK("%02x", buffer[t]); - } - DEBUG_STLINK("\n"); - while (len) { - size_t length; - if (len > Stlink.block_size) - length = Stlink.block_size; - else - length = len; - uint8_t cmd[16] = { - STLINK_DEBUG_COMMAND, - STLINK_DEBUG_WRITEMEM_8BIT, - addr & 0xff, (addr >> 8) & 0xff, (addr >> 16) & 0xff, - (addr >> 24) & 0xff, - length & 0xff, length >> 8, ap->apsel}; - send_recv(cmd, 16, NULL, 0); - send_recv((void*)buffer, length, NULL, 0); - stlink_usb_get_rw_status(true); - len -= length; - addr += length; - } -} - -static void stlink_writemem16(ADIv5_AP_t *ap, uint32_t addr, size_t len, - uint16_t *buffer) -{ - DEBUG_STLINK("Mem Write16 AP %d len %zu addr 0x%08" PRIx32 ": ", - ap->apsel, len, addr); - for (size_t t = 0; t < len; t+=2) { - DEBUG_STLINK("%04x", buffer[t]); - } - DEBUG_STLINK("\n"); - uint8_t cmd[16] = { - STLINK_DEBUG_COMMAND, - STLINK_DEBUG_APIV2_WRITEMEM_16BIT, - addr & 0xff, (addr >> 8) & 0xff, (addr >> 16) & 0xff, - (addr >> 24) & 0xff, - len & 0xff, len >> 8, ap->apsel}; - send_recv(cmd, 16, NULL, 0); - send_recv((void*)buffer, len, NULL, 0); - stlink_usb_get_rw_status(true); -} - -static void stlink_writemem32(ADIv5_AP_t *ap, uint32_t addr, size_t len, - uint32_t *buffer) -{ - DEBUG_STLINK("Mem Write32 AP %d len %zu addr 0x%08" PRIx32 ": ", - ap->apsel, len, addr); - for (size_t t = 0; t < len; t+=4) { - DEBUG_STLINK("%04x", buffer[t]); - } - DEBUG_STLINK("\n"); - uint8_t cmd[16] = { - STLINK_DEBUG_COMMAND, - STLINK_DEBUG_WRITEMEM_32BIT, - addr & 0xff, (addr >> 8) & 0xff, (addr >> 16) & 0xff, - (addr >> 24) & 0xff, - len & 0xff, len >> 8, ap->apsel}; - write_retry(cmd, 16, (void*)buffer, len); -} - -void stlink_regs_read(ADIv5_AP_t *ap, void *data) -{ - uint8_t cmd[16] = {STLINK_DEBUG_COMMAND, STLINK_DEBUG_APIV2_READALLREGS, - ap->apsel}; - uint8_t res[88]; - DEBUG_STLINK("AP %d: Read all core registers\n", ap->apsel); - send_recv(cmd, 16, res, 88); - stlink_usb_error_check(res, true); - memcpy(data, res + 4, 84); -} - -uint32_t stlink_reg_read(ADIv5_AP_t *ap, int num) -{ - uint8_t cmd[16] = {STLINK_DEBUG_COMMAND, STLINK_DEBUG_APIV2_READREG, num, - ap->apsel}; - uint8_t res[8]; - send_recv(cmd, 16, res, 8); - stlink_usb_error_check(res, true); - uint32_t ret = res[0] | res[1] << 8 | res[2] << 16 | res[3] << 24; - DEBUG_STLINK("AP %d: Read reg %02" PRId32 " val 0x%08" PRIx32 "\n", - ap->apsel, num, ret); - return ret; -} - -void stlink_reg_write(ADIv5_AP_t *ap, int num, uint32_t val) -{ - uint8_t cmd[16] = { - STLINK_DEBUG_COMMAND, STLINK_DEBUG_APIV2_WRITEREG, num, - val & 0xff, (val >> 8) & 0xff, (val >> 16) & 0xff, - (val >> 24) & 0xff, ap->apsel}; - uint8_t res[2]; - send_recv(cmd, 16, res, 2); - DEBUG_STLINK("AP %d: Write reg %02" PRId32 " val 0x%08" PRIx32 "\n", - ap->apsel, num, val); - stlink_usb_error_check(res, true); -} - -static void stlink_mem_write_sized( ADIv5_AP_t *ap, uint32_t dest, - const void *src, size_t len, - enum align align) -{ - if (len == 0) - return; - switch(align) { - case ALIGN_BYTE: stlink_writemem8(ap, dest, len, (uint8_t *) src); - break; - case ALIGN_HALFWORD: stlink_writemem16(ap, dest, len, (uint16_t *) src); - break; - case ALIGN_WORD: stlink_writemem32(ap, dest, len, (uint32_t *) src); - break; - case ALIGN_DWORD: stlink_writemem32(ap, dest, len, (uint32_t *) src); - break; - } -} - -static void stlink_ap_write(ADIv5_AP_t *ap, uint16_t addr, uint32_t value) -{ - stlink_write_dp_register(ap->apsel, addr, value); -} - -static uint32_t stlink_ap_read(ADIv5_AP_t *ap, uint16_t addr) -{ - uint32_t ret; - stlink_read_dp_register(ap->apsel, addr, &ret); - return ret; -} - -struct jtag_dev_s jtag_devs[JTAG_MAX_DEVS+1]; -int jtag_dev_count; -jtag_proc_t jtag_proc; - -int jtag_scan_stlinkv2(const uint8_t *irlens) -{ - uint32_t idcodes[JTAG_MAX_DEVS+1]; - (void) *irlens; - target_list_free(); - - jtag_dev_count = 0; - memset(&jtag_devs, 0, sizeof(jtag_devs)); - if (stlink_enter_debug_jtag()) - return 0; - jtag_dev_count = stlink_read_idcodes(idcodes); - /* Check for known devices and handle accordingly */ - for(int i = 0; i < jtag_dev_count; i++) - jtag_devs[i].idcode = idcodes[i]; - for(int i = 0; i < jtag_dev_count; i++) - for(int j = 0; dev_descr[j].idcode; j++) - if((jtag_devs[i].idcode & dev_descr[j].idmask) == - dev_descr[j].idcode) { - if(dev_descr[j].handler) - dev_descr[j].handler(&jtag_devs[i]); - break; - } - - return jtag_dev_count; -} - -int platform_jtag_dp_init(ADIv5_DP_t *dp) -{ - dp->dp_read = stlink_dp_read; - dp->error = stlink_dp_error; - dp->low_access = stlink_dp_low_access; - dp->abort = stlink_dp_abort; - - return true; - -} - -void platform_adiv5_dp_defaults(ADIv5_DP_t *dp) -{ - dp->ap_regs_read = stlink_regs_read; - dp->ap_reg_read = stlink_reg_read; - dp->ap_reg_write = stlink_reg_write; - dp->ap_setup = stlink_ap_setup; - dp->ap_cleanup = stlink_ap_cleanup; - dp->ap_write = stlink_ap_write; - dp->ap_read = stlink_ap_read; - dp->mem_read = stlink_readmem; - dp->mem_write_sized = stlink_mem_write_sized; -} diff --git a/src/platforms/pc-stlinkv2/stlinkv2.h b/src/platforms/pc-stlinkv2/stlinkv2.h deleted file mode 100644 index dea9a8b..0000000 --- a/src/platforms/pc-stlinkv2/stlinkv2.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * This file is part of the Black Magic Debug project. - * - * Copyright (C) 2019 Uwe Bonnes - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#if !defined(__STLINKV2_H_) - -#define STLINK_ERROR_FAIL -1 -#define STLINK_ERROR_OK 0 -#define STLINK_ERROR_WAIT 1 - -#define STLINK_DEBUG_PORT_ACCESS 0xffff - -void stlink_init(int argc, char **argv); -int stlink_hwversion(void); -void stlink_leave_state(void); -const char *stlink_target_voltage(void); -void stlink_srst_set_val(bool assert); -int stlink_enter_debug_swd(void); -int stlink_enter_debug_jtag(void); -int stlink_read_idcodes(uint32_t *); -uint32_t stlink_read_coreid(void); -int stlink_read_dp_register(uint16_t port, uint16_t addr, uint32_t *res); -int stlink_write_dp_register(uint16_t port, uint16_t addr, uint32_t val); - -uint32_t stlink_dp_low_access(ADIv5_DP_t *dp, uint8_t RnW, - uint16_t addr, uint32_t value); -uint32_t stlink_dp_read(ADIv5_DP_t *dp, uint16_t addr); -uint32_t stlink_dp_error(ADIv5_DP_t *dp); -void stlink_dp_abort(ADIv5_DP_t *dp, uint32_t abort); -int stlink_open_ap(uint8_t ap); -void stlink_close_ap(uint8_t ap); -void stlink_regs_read(ADIv5_AP_t *ap, void *data); -uint32_t stlink_reg_read(ADIv5_AP_t *ap, int idx); -void stlink_reg_write(ADIv5_AP_t *ap, int num, uint32_t val); -extern int debug_level; -# define DEBUG_STLINK if (debug_level > 0) printf -# define DEBUG_USB if (debug_level > 1) printf -#endif diff --git a/src/platforms/pc-stlinkv2/swdptap.c b/src/platforms/pc-stlinkv2/swdptap.c deleted file mode 100644 index e69de29..0000000 diff --git a/src/platforms/pc/cl_utils.c b/src/platforms/pc/cl_utils.c index d68dc78..6fd4fe9 100644 --- a/src/platforms/pc/cl_utils.c +++ b/src/platforms/pc/cl_utils.c @@ -120,27 +120,29 @@ static void cl_help(char **argv, BMP_CL_OPTIONS_t *opt) printf("\t-h\t\t: This help.\n"); printf("\t-v[1|2]\t\t: Increasing verbosity\n"); printf("\t-d \"path\"\t: Use serial device at \"path\"\n"); - printf("\t-P \t: Use device found as "); + printf("\t-P \t: Use debugger found at position \n"); + printf("\t-n \t: Use target device found at position \n"); printf("\t-s \"string\"\t: Use dongle with (partial) " "serial number \"string\"\n"); printf("\t-c \"string\"\t: Use ftdi dongle with type \"string\"\n"); - printf("\t-n\t\t: Exit immediate if no device found\n"); printf("\tRun mode related options:\n"); + printf("\tDefault mode is to start the debug server at :2000\n"); + printf("\t-j\t\t: Use JTAG. SWD is default.\n"); printf("\t-C\t\t: Connect under reset\n"); - printf("\t-t\t\t: Scan SWD, with no target found scan jtag and exit\n"); + printf("\t-t\t\t: Scan SWD and display information about connected" + "devices\n"); printf("\t-E\t\t: Erase flash until flash end or for given size\n"); printf("\t-V\t\t: Verify flash against binary file\n"); printf("\t-r\t\t: Read flash and write to binary file\n"); printf("\t-p\t\t: Supplies power to the target (where applicable)\n"); printf("\t-R\t\t: Reset device\n"); - printf("\t\tDefault mode is starting the debug server\n"); printf("\tFlash operation modifiers options:\n"); printf("\t-a \t: Start flash operation at flash address \n" - "\t\t\tDefault start is 0x08000000\n"); + "\t\t\t Default start is 0x08000000\n"); printf("\t-S \t: Read bytes. Default is until read fails.\n"); - printf("\t-j\t\t: Use JTAG. SWD is default.\n"); printf("\t \t\t: Use (binary) file for flash operation\n" - "\t\t\tGiven writes to flash if neither -r or -V is given\n"); + "\t\t\t Given writes to flash if neither -r or -V is " + "given\n"); exit(0); } @@ -150,7 +152,7 @@ void cl_init(BMP_CL_OPTIONS_t *opt, int argc, char **argv) opt->opt_target_dev = 1; opt->opt_flash_start = 0x08000000; opt->opt_flash_size = 16 * 1024 *1024; - while((c = getopt(argc, argv, "Ehv::d:s:I:c:CnN:tVta:S:jpP:rR")) != -1) { + while((c = getopt(argc, argv, "Ehv::d:s:I:c:Cn:tVta:S:jpP:rR")) != -1) { switch(c) { case 'c': if (optarg) @@ -171,9 +173,6 @@ void cl_init(BMP_CL_OPTIONS_t *opt, int argc, char **argv) case 'C': opt->opt_connect_under_reset = true; break; - case 'n': - opt->opt_no_wait = true; - break; case 'd': if (optarg) opt->opt_device = optarg; @@ -208,7 +207,7 @@ void cl_init(BMP_CL_OPTIONS_t *opt, int argc, char **argv) if (optarg) opt->opt_flash_start = strtol(optarg, NULL, 0); break; - case 'N': + case 'n': if (optarg) opt->opt_target_dev = strtol(optarg, NULL, 0); break; diff --git a/src/platforms/pc/cl_utils.h b/src/platforms/pc/cl_utils.h index 5c485b7..88bff7e 100644 --- a/src/platforms/pc/cl_utils.h +++ b/src/platforms/pc/cl_utils.h @@ -39,7 +39,6 @@ enum bmp_cl_mode { typedef struct BMP_CL_OPTIONS_s { enum bmp_cl_mode opt_mode; bool opt_usejtag; - bool opt_no_wait; bool opt_tpwr; bool opt_connect_under_reset; char *opt_flash_file; diff --git a/src/platforms/pc/libusb_utils.c b/src/platforms/pc/libusb_utils.c index 26c95a0..2672490 100644 --- a/src/platforms/pc/libusb_utils.c +++ b/src/platforms/pc/libusb_utils.c @@ -18,7 +18,6 @@ */ #include "general.h" #include "cl_utils.h" -#include static void LIBUSB_CALL on_trans_done(struct libusb_transfer *trans) {