interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM7/ARM9: improved reset support 

Teach most remaining ARM cores how to use the "reset-assert" event.

Same model as elsewhere:  iff a handler is provided for that event,
use that instead of trying to assert SRST (which may be unavailable,
or inappropriate since it resets too much).  Else no change.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
This commit is contained in:
David Brownell 2010-01-14 12:45:58 -08:00
parent 000a1cfd01
commit 1d140c4dcd
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/target/arm7_9_common.c
View File

@ -944,13 +944,15 @@ int arm7_9_assert_reset(struct target *target)
{ {
struct arm7_9_common *arm7_9 = target_to_arm7_9(target); struct arm7_9_common *arm7_9 = target_to_arm7_9(target);
enum reset_types jtag_reset_config = jtag_get_reset_config(); enum reset_types jtag_reset_config = jtag_get_reset_config();
bool use_event = false;
LOG_DEBUG("target->state: %s", LOG_DEBUG("target->state: %s",
target_state_name(target)); target_state_name(target));
if (!(jtag_reset_config & RESET_HAS_SRST)) if (target_has_event_action(target, TARGET_EVENT_RESET_ASSERT))
{ use_event = true;
LOG_ERROR("Can't assert SRST"); else if (!(jtag_reset_config & RESET_HAS_SRST)) {
LOG_ERROR("%s: how to reset?", target_name(target));
return ERROR_FAIL; return ERROR_FAIL;
} }
@ -965,7 +967,8 @@ int arm7_9_assert_reset(struct target *target)
*/ */
bool srst_asserted = false; bool srst_asserted = false;
if (((jtag_reset_config & RESET_SRST_PULLS_TRST) == 0) if (!use_event
&& !(jtag_reset_config & RESET_SRST_PULLS_TRST)
&& (jtag_reset_config & RESET_SRST_NO_GATING)) && (jtag_reset_config & RESET_SRST_NO_GATING))
{ {
jtag_add_reset(0, 1); jtag_add_reset(0, 1);
@ -1015,22 +1018,28 @@ int arm7_9_assert_reset(struct target *target)
} }
} }
/* here we should issue an SRST only, but we may have to assert TRST as well */ if (use_event) {
if (jtag_reset_config & RESET_SRST_PULLS_TRST) target_handle_event(target, TARGET_EVENT_RESET_ASSERT);
{ } else {
jtag_add_reset(1, 1); /* If we use SRST ... we'd like to issue just SRST, but the
} else if (!srst_asserted) * board or chip may be set up so we have to assert TRST as
{ * well. On some chips that combination is equivalent to a
jtag_add_reset(0, 1); * power-up reset, and generally clobbers EICE state.
*/
if (jtag_reset_config & RESET_SRST_PULLS_TRST)
jtag_add_reset(1, 1);
else if (!srst_asserted)
jtag_add_reset(0, 1);
jtag_add_sleep(50000);
} }
target->state = TARGET_RESET; target->state = TARGET_RESET;
jtag_add_sleep(50000);
register_cache_invalidate(arm7_9->armv4_5_common.core_cache); register_cache_invalidate(arm7_9->armv4_5_common.core_cache);
/* REVISIT why isn't standard debug entry logic sufficient?? */
if (target->reset_halt if (target->reset_halt
&& !(jtag_reset_config & RESET_SRST_PULLS_TRST)) && (!(jtag_reset_config & RESET_SRST_PULLS_TRST)
|| use_event))
{ {
/* debug entry was prepared above */ /* debug entry was prepared above */
target->debug_reason = DBG_REASON_DBGRQ; target->debug_reason = DBG_REASON_DBGRQ;