diff options
author | Marc Schink <openocd-dev@marcschink.de> | 2016-12-02 15:39:23 +0100 |
---|---|---|
committer | Paul Fertser <fercerpav@gmail.com> | 2019-12-21 19:25:32 +0000 |
commit | 2dc88e1479f29ef0141b05bfcd907ad9a3e2d54c (patch) | |
tree | f52d7ef4e56c734d25f1bf12bed0fe01110c53cb /src/jtag/core.c | |
parent | 90bd7d148225efa587d8e62017625709a1ac002d (diff) | |
download | riscv-openocd-2dc88e1479f29ef0141b05bfcd907ad9a3e2d54c.zip riscv-openocd-2dc88e1479f29ef0141b05bfcd907ad9a3e2d54c.tar.gz riscv-openocd-2dc88e1479f29ef0141b05bfcd907ad9a3e2d54c.tar.bz2 |
target/armv7m_trace: Improve SWO frequency auto-detection
The SWO frequency auto-detection with J-Link adapters does not work
properly in the current implementation. This is because the trace layer
has only information about the highest possible SWO frequency supported
by the adapter. With that the trace layer calculates the SWO prescaler
which usually leads to a frequency deviation greater than what is
permitted by J-Link adapters.
Move the calculation of the SWO prescaler from the trace layer into the
trace configuration of the adapter to overcome this problem.
The adapter has the necessary information to choose a suitable SWO
frequency and calculate the corresponding prescaler that complies with
the maximum allowed frequency deviation.
Tested with:
- STM32L152RC Discovery Kit (ST-Link)
- EFM32GG-STK3700 (J-Link)
Change-Id: I38ff2b89d32f0a92c597989b590afe5c75cf4902
Signed-off-by: Marc Schink <openocd-dev@marcschink.de>
Reviewed-on: http://openocd.zylin.com/3903
Tested-by: jenkins
Reviewed-by: Paul Fertser <fercerpav@gmail.com>
Diffstat (limited to 'src/jtag/core.c')
-rw-r--r-- | src/jtag/core.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/jtag/core.c b/src/jtag/core.c index 144cf94..a498a8c 100644 --- a/src/jtag/core.c +++ b/src/jtag/core.c @@ -1918,12 +1918,13 @@ void adapter_deassert_reset(void) } int adapter_config_trace(bool enabled, enum tpiu_pin_protocol pin_protocol, - uint32_t port_size, unsigned int *trace_freq) + uint32_t port_size, unsigned int *trace_freq, + unsigned int traceclkin_freq, uint16_t *prescaler) { - if (jtag->config_trace) - return jtag->config_trace(enabled, pin_protocol, port_size, - trace_freq); - else if (enabled) { + if (jtag->config_trace) { + return jtag->config_trace(enabled, pin_protocol, port_size, trace_freq, + traceclkin_freq, prescaler); + } else if (enabled) { LOG_ERROR("The selected interface does not support tracing"); return ERROR_FAIL; } |