From 7259995361dcb4471dd813e3e7b587c5d4eebbf3 Mon Sep 17 00:00:00 2001 From: wangyanwen Date: Thu, 26 Dec 2024 10:49:56 +0800 Subject: [PATCH] target/riscv: fix bug in riscv_openocd_poll() function This code forced all harts to halt when they reported a mixture of halted and non-halted status. This breaks long-running algorithms run on a single core under SMP, because the first poll will force the core executing the algorithm to halt. Fix by adding an exception when all running cores are running under debugger control (target->status == 4). Do not force harts to halt in this case. Change-Id: I940172926ed9b80b95891d8aecbd10897e148585 Signed-off-by: wangyanwen --- src/target/riscv/riscv.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/target/riscv/riscv.c b/src/target/riscv/riscv.c index f5b7c2396..f52966d2f 100644 --- a/src/target/riscv/riscv.c +++ b/src/target/riscv/riscv.c @@ -3914,6 +3914,7 @@ int riscv_openocd_poll(struct target *target) unsigned int should_resume = 0; unsigned int halted = 0; unsigned int running = 0; + unsigned int running_under_debug = 0; struct target_list *entry; foreach_smp_target(entry, targets) { struct target *t = entry->target; @@ -3937,6 +3938,8 @@ int riscv_openocd_poll(struct target *target) if (t->state == TARGET_RUNNING || t->state == TARGET_DEBUG_RUNNING) running++; + if (t->state == TARGET_DEBUG_RUNNING) + running_under_debug++; break; case RPH_REMAIN_HALTED: should_remain_halted++; @@ -3960,7 +3963,10 @@ int riscv_openocd_poll(struct target *target) } else if (should_resume) { LOG_TARGET_DEBUG(target, "resume all"); riscv_resume(target, true, 0, 0, 0, false); - } else if (halted && running) { + } else if (halted && running && (running_under_debug != running)) { + /* Note we don't halt when harts are running *under debug control* + (state == TARGET_DEBUG_RUNNING) because this causes early abort of + long-running algorithms running on a single core under SMP. */ LOG_TARGET_DEBUG(target, "halt all; halted=%d", halted); riscv_halt(target);