Skip to content

Clear RISC-V hart triggers during attach/detach #2194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ALTracer wants to merge 3 commits into
base: main
Choose a base branch
from
+16 −0
Open

Clear RISC-V hart triggers during attach/detach #2194

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a154018
riscv_debug: Log tdata2 from discovered triggers during probe (to det…
ALTracer Feb 12, 2026
428f19a
riscv_debug: Unconditionally disable triggers during attach
ALTracer Feb 12, 2026
295a574
riscv_debug: Unconditionally disable triggers during detach
ALTracer Feb 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions src/target/riscv_debug.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -968,6 +968,10 @@ static void riscv_hart_discover_triggers(riscv_hart_s *const hart)
/* Now info's bottom 16 bits contain the supported trigger modes, so write this info to the slot in the hart */
hart->trigger_uses[trigger] = info;
DEBUG_TARGET("Hart trigger slot %" PRIu32 " modes: %04" PRIx32 "\n", trigger, info);
/* Display whatever contents of tdata2 (normally address to match for stale trigger) */
uint32_t tdata2 = 0;
riscv_csr_read(hart, RV_TRIG_DATA_2, &tdata2);
DEBUG_TARGET("Hart trigger slot %" PRIu32 " tdata2 = %08" PRIx32 "\n", trigger, tdata2);
}
}

Expand Down Expand Up @@ -1045,6 +1049,12 @@ bool riscv_attach(target_s *const target)
/* We then also need to select the Hart again so we're poking with the right one on the target */
if (!riscv_dm_write(hart->dbg_module, RV_DM_CONTROL, hart->hartsel))
return false;
/* Clear any stale triggers */
for (size_t trigger = 0; trigger < hart->triggers; trigger++) {
const uint32_t tdata1 = 0;
const uint32_t tdata2 = 0;
riscv_config_trigger(hart, trigger, RISCV_TRIGGER_MODE_UNUSED, &tdata1, &tdata2);
}
/* We then need to halt the hart so the attach process can function */
riscv_halt_request(target);
return true;
Expand All @@ -1053,6 +1063,12 @@ bool riscv_attach(target_s *const target)
void riscv_detach(target_s *const target)
{
riscv_hart_s *const hart = riscv_hart_struct(target);
/* Clear any stale triggers */
for (size_t trigger = 0; trigger < hart->triggers; trigger++) {
const uint32_t tdata1 = 0;
const uint32_t tdata2 = 0;
riscv_config_trigger(hart, trigger, RISCV_TRIGGER_MODE_UNUSED, &tdata1, &tdata2);
}
/* Once we get done and the user's asked us to detach, we need to resume the hart */
riscv_halt_resume(target, false);
/* If the DMI needs steps done to quiesce it, finsh up with that */
Expand Down
Loading