interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

aarch64: fix handling of 'reset halt' 

Commit 6c0151623c ("aarch64: add support for "reset halt"")
introduces the register setting to halt at reset vector, but:
- does not consider the case 'srst_pulls_trst' that makes useless
  setting the registers as they will be erased by the pulled trst;
- does not clean sticky errors in case of 'srst_gates_jtag'.

Avoid any register initialization on 'srst_pulls_trst' and move
the cleaning of sticky errors in the common block.

Change-Id: I6f839f06f7b091e234ede31ec18096e51f017bcd
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Fixes: 6c0151623c ("aarch64: add support for "reset halt"")
Reviewed-on: https://review.openocd.org/c/openocd/+/7034
Tested-by: jenkins
Reviewed-by: Christian Hoff <christian.hoff@advantest.com>
This commit is contained in:
Antonio Borneo 2022-06-13 16:41:11 +02:00
parent f23ac68343
commit e4f5ce5d3e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/target/aarch64.c
View File

@ -1942,7 +1942,7 @@ static int aarch64_assert_reset(struct target *target)
else if (reset_config & RESET_HAS_SRST) { else if (reset_config & RESET_HAS_SRST) {
bool srst_asserted = false; bool srst_asserted = false;
if (target->reset_halt) { if (target->reset_halt && !(reset_config & RESET_SRST_PULLS_TRST)) {
if (target_was_examined(target)) { if (target_was_examined(target)) {
if (reset_config & RESET_SRST_NO_GATING) { if (reset_config & RESET_SRST_NO_GATING) {
@ -1952,11 +1952,11 @@ static int aarch64_assert_reset(struct target *target)
*/ */
adapter_assert_reset(); adapter_assert_reset();
srst_asserted = true; srst_asserted = true;
}
/* make sure to clear all sticky errors */ /* make sure to clear all sticky errors */
mem_ap_write_atomic_u32(armv8->debug_ap, mem_ap_write_atomic_u32(armv8->debug_ap,
armv8->debug_base + CPUV8_DBG_DRCR, DRCR_CSE); armv8->debug_base + CPUV8_DBG_DRCR, DRCR_CSE);
}
/* set up Reset Catch debug event to halt the CPU after reset */ /* set up Reset Catch debug event to halt the CPU after reset */
retval = aarch64_enable_reset_catch(target, true); retval = aarch64_enable_reset_catch(target, true);