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

stlink: fix connect under reset issues 

We need to make sure that srst is asserted before we attempt to switch into
jtag or swd mode otherwise we receive a error (-9) - invalid device id.

Change-Id: I625166c751cfba8e8a5290f40122bb9afc9dbb39
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/1315
Tested-by: jenkins
__archive__
Spencer Oliver 2013-04-11 11:15:32 +01:00
parent 0a33b7b2aa
commit b2189fa936
3 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -579,8 +579,10 @@ static int stlink_usb_mode_leave(void *handle, enum stlink_mode type)
return ERROR_OK; return ERROR_OK;
} }
static int stlink_usb_assert_srst(void *handle, int srst);
/** */ /** */
static int stlink_usb_init_mode(void *handle) static int stlink_usb_init_mode(void *handle, bool connect_under_reset)
{ {
int res; int res;
uint8_t mode; uint8_t mode;
@ -674,6 +676,12 @@ static int stlink_usb_init_mode(void *handle)
return ERROR_FAIL; return ERROR_FAIL;
} }
if (connect_under_reset) {
res = stlink_usb_assert_srst(handle, 0);
if (res != ERROR_OK)
return res;
}
res = stlink_usb_mode_enter(handle, emode); res = stlink_usb_mode_enter(handle, emode);
if (res != ERROR_OK) if (res != ERROR_OK)
@ -1314,7 +1322,7 @@ static int stlink_usb_open(struct hl_interface_param_s *param, void **fd)
h->jtag_api = api; h->jtag_api = api;
/* initialize the debug hardware */ /* initialize the debug hardware */
err = stlink_usb_init_mode(h); err = stlink_usb_init_mode(h, param->connect_under_reset);
if (err != ERROR_OK) { if (err != ERROR_OK) {
LOG_ERROR("init mode failed"); LOG_ERROR("init mode failed");

20
src/jtag/hla/hla_interface.c
View File

@ -37,12 +37,21 @@
#include <target/target.h> #include <target/target.h>
static struct hl_interface_s hl_if = { {0, 0, 0, 0, 0, 0, 0}, 0, 0 }; static struct hl_interface_s hl_if = { {0, 0, 0, 0, 0, HL_TRANSPORT_UNKNOWN, 0, false}, 0, 0 };
int hl_interface_open(enum hl_transports tr) int hl_interface_open(enum hl_transports tr)
{ {
LOG_DEBUG("hl_interface_open"); LOG_DEBUG("hl_interface_open");
enum reset_types jtag_reset_config = jtag_get_reset_config();
if (jtag_reset_config & RESET_CNCT_UNDER_SRST) {
if (jtag_reset_config & RESET_SRST_NO_GATING)
hl_if.param.connect_under_reset = true;
else
LOG_WARNING("\'srst_nogate\' reset_config option is required");
}
/* set transport mode */ /* set transport mode */
hl_if.param.transport = tr; hl_if.param.transport = tr;
@ -117,14 +126,11 @@ static int hl_interface_execute_queue(void)
int hl_interface_init_reset(void) int hl_interface_init_reset(void)
{ {
enum reset_types jtag_reset_config = jtag_get_reset_config(); /* incase the adapter has not already handled asserting srst
* we will attempt it again */
if (jtag_reset_config & RESET_CNCT_UNDER_SRST) { if (hl_if.param.connect_under_reset) {
if (jtag_reset_config & RESET_SRST_NO_GATING) {
jtag_add_reset(0, 1); jtag_add_reset(0, 1);
hl_if.layout->api->assert_srst(hl_if.fd, 0); hl_if.layout->api->assert_srst(hl_if.fd, 0);
} else
LOG_WARNING("\'srst_nogate\' reset_config option is required");
} }
return ERROR_OK; return ERROR_OK;

2
src/jtag/hla/hla_interface.h
View File

@ -46,6 +46,8 @@ struct hl_interface_param_s {
enum hl_transports transport; enum hl_transports transport;
/** */ /** */
int max_buffer; int max_buffer;
/** */
bool connect_under_reset;
}; };
struct hl_interface_s { struct hl_interface_s {