From: Antonio Borneo Date: Mon, 15 Apr 2019 21:47:50 +0000 (+0200) Subject: target/cortex_a: fix waiting for target halted after step X-Git-Tag: v0.11.0-rc1~732 X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=d3a9e535d52bebf9973babe564c09797c71a2fc2 target/cortex_a: fix waiting for target halted after step Depending on adapter speed, the function cortex_a_poll() can take time to execute and can complete successfully when the timeout is already expired. Checking the timeout at function return causes a timeout error while that could be avoided. Check the target status at cortex_a_poll() return, before checking for the timeout. Change-Id: I4c1581f6e718298c566df7b1359255e16e3955d5 Signed-off-by: Antonio Borneo Reviewed-on: http://openocd.zylin.com/5111 Tested-by: jenkins Reviewed-by: Matthias Welwarsky --- diff --git a/src/target/cortex_a.c b/src/target/cortex_a.c index 6eb6aa9338..8ed81b78f9 100644 --- a/src/target/cortex_a.c +++ b/src/target/cortex_a.c @@ -1206,6 +1206,8 @@ static int cortex_a_step(struct target *target, int current, target_addr_t addre retval = cortex_a_poll(target); if (retval != ERROR_OK) return retval; + if (target->state == TARGET_HALTED) + break; if (timeval_ms() > then + 1000) { LOG_ERROR("timeout waiting for target halt"); return ERROR_FAIL;