zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stlink: add STLINK_F_HAS_TRACE 

Fix the condition for ST-Link/V1; it does not support trace.
Trace is added on ST-Link/V2 and ST-Link/V2.1 only.

Change-Id: I17416edd05a2c8ece605560b7533edac4f982cfc
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/4707
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
log_output
Antonio Borneo 2018-09-23 16:38:13 +02:00 committed by Spencer Oliver
parent 9252a94218
commit 3148bf838d
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/jtag/drivers/stlink_usb.c
View File

@ -259,7 +259,6 @@ struct stlink_usb_handle_s {
#define STLINK_TRACE_SIZE 4096 #define STLINK_TRACE_SIZE 4096
#define STLINK_TRACE_MAX_HZ 2000000 #define STLINK_TRACE_MAX_HZ 2000000
#define STLINK_TRACE_MIN_VERSION 13
/** */ /** */
enum stlink_mode { enum stlink_mode {
@ -278,6 +277,7 @@ enum stlink_mode {
* Map the relevant features, quirks and workaround for specific firmware * Map the relevant features, quirks and workaround for specific firmware
* version of stlink * version of stlink
*/ */
#define STLINK_F_HAS_TRACE (1UL << 0)
/* aliases */ /* aliases */
@ -569,7 +569,7 @@ static int stlink_usb_read_trace(void *handle, const uint8_t *buf, int size)
assert(handle != NULL); assert(handle != NULL);
assert(h->version.stlink >= 2); assert(h->version.flags & STLINK_F_HAS_TRACE);
if (jtag_libusb_bulk_read(h->fd, h->trace_ep, (char *)buf, if (jtag_libusb_bulk_read(h->fd, h->trace_ep, (char *)buf,
size, STLINK_READ_TIMEOUT) != size) { size, STLINK_READ_TIMEOUT) != size) {
@ -668,6 +668,10 @@ static int stlink_usb_version(void *handle)
/* all ST-LINK/V2 and ST-Link/V2.1 use api-v2 */ /* all ST-LINK/V2 and ST-Link/V2.1 use api-v2 */
h->version.jtag_api_max = STLINK_JTAG_API_V2; h->version.jtag_api_max = STLINK_JTAG_API_V2;
/* API for trace from J13 */
if (h->version.jtag >= 13)
flags |= STLINK_F_HAS_TRACE;
break; break;
default: default:
break; break;
@ -1278,7 +1282,7 @@ static int stlink_usb_trace_read(void *handle, uint8_t *buf, size_t *size)
assert(handle != NULL); assert(handle != NULL);
if (h->trace.enabled && h->version.jtag >= STLINK_TRACE_MIN_VERSION) { if (h->trace.enabled && (h->version.flags & STLINK_F_HAS_TRACE)) {
int res; int res;
stlink_usb_init_buffer(handle, h->rx_ep, 10); stlink_usb_init_buffer(handle, h->rx_ep, 10);
@ -1407,7 +1411,7 @@ static void stlink_usb_trace_disable(void *handle)
assert(handle != NULL); assert(handle != NULL);
assert(h->version.jtag >= STLINK_TRACE_MIN_VERSION); assert(h->version.flags & STLINK_F_HAS_TRACE);
LOG_DEBUG("Tracing: disable"); LOG_DEBUG("Tracing: disable");
@ -1429,7 +1433,7 @@ static int stlink_usb_trace_enable(void *handle)
assert(handle != NULL); assert(handle != NULL);
if (h->version.jtag >= STLINK_TRACE_MIN_VERSION) { if (h->version.flags & STLINK_F_HAS_TRACE) {
stlink_usb_init_buffer(handle, h->rx_ep, 10); stlink_usb_init_buffer(handle, h->rx_ep, 10);
h->cmdbuf[h->cmdidx++] = STLINK_DEBUG_COMMAND; h->cmdbuf[h->cmdidx++] = STLINK_DEBUG_COMMAND;
@ -2284,7 +2288,6 @@ static int stlink_usb_open(struct hl_interface_param_s *param, void **fd)
case STLINK_V1_PID: case STLINK_V1_PID:
h->version.stlink = 1; h->version.stlink = 1;
h->tx_ep = STLINK_TX_EP; h->tx_ep = STLINK_TX_EP;
h->trace_ep = STLINK_TRACE_EP;
break; break;
case STLINK_V2_1_PID: case STLINK_V2_1_PID:
case STLINK_V2_1_NO_MSD_PID: case STLINK_V2_1_NO_MSD_PID:
@ -2431,7 +2434,7 @@ int stlink_config_trace(void *handle, bool enabled, enum tpiu_pin_protocol pin_p
{ {
struct stlink_usb_handle_s *h = handle; struct stlink_usb_handle_s *h = handle;
if (enabled && (h->jtag_api < 2 || if (enabled && (!(h->version.flags & STLINK_F_HAS_TRACE) ||
pin_protocol != TPIU_PIN_PROTOCOL_ASYNC_UART)) { pin_protocol != TPIU_PIN_PROTOCOL_ASYNC_UART)) {
LOG_ERROR("The attached ST-LINK version doesn't support this trace mode"); LOG_ERROR("The attached ST-LINK version doesn't support this trace mode");
return ERROR_FAIL; return ERROR_FAIL;