From 4b608d7fea61855b9a284c5a8e0a2fc167bd7d1f Mon Sep 17 00:00:00 2001 From: Marc Schink Date: Mon, 21 Sep 2015 14:27:49 +0200 Subject: [PATCH] jlink: Retrieve maximum speed from device. If supported, the maximum transport speed is now retrieved from the device. Change-Id: I614f405ec91cf199c851781785fd26cbd10c37a6 Signed-off-by: Marc Schink Reviewed-on: http://openocd.zylin.com/2955 Tested-by: jenkins Reviewed-by: Spencer Oliver --- src/jtag/drivers/jlink.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/src/jtag/drivers/jlink.c b/src/jtag/drivers/jlink.c index 1db1a711e..807bdba96 100644 --- a/src/jtag/drivers/jlink.c +++ b/src/jtag/drivers/jlink.c @@ -216,11 +216,23 @@ static int jlink_execute_queue(void) static int jlink_speed(int speed) { int ret; + uint32_t freq; + uint16_t div; + int max_speed; - if (speed > JLINK_MAX_SPEED) { - LOG_INFO("Reduce speed from %d kHz to %d kHz (maximum).", speed, - JLINK_MAX_SPEED); - speed = JLINK_MAX_SPEED; + if (jaylink_has_cap(caps, JAYLINK_DEV_CAP_GET_SPEEDS)) { + ret = jaylink_get_speeds(devh, &freq, &div); + + if (ret != JAYLINK_OK) { + LOG_ERROR("jaylink_get_speeds() failed: %s.", + jaylink_strerror_name(ret)); + return ERROR_JTAG_DEVICE_ERROR; + } + + freq = freq / 1000; + max_speed = freq / div; + } else { + max_speed = JLINK_MAX_SPEED; } if (!speed) { @@ -230,6 +242,10 @@ static int jlink_speed(int speed) } speed = JAYLINK_SPEED_ADAPTIVE_CLOCKING; + } else if (speed > max_speed) { + LOG_INFO("Reduced speed from %d kHz to %d kHz (maximum).", speed, + max_speed); + speed = max_speed; } ret = jaylink_set_speed(devh, speed);