[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-471-gcaa169813

[OpenOCD-Gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  caa16981364d747c1c71edaf156e8a4faa83b02b (commit)
      from  88f429ead019fd6df96ec15f0d897385f3cef0d0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit caa16981364d747c1c71edaf156e8a4faa83b02b
Author: Andreas Fritiofson <and...@gm...>
Date:   Mon Nov 8 18:09:56 2021 +0100

    cortex_m: Restore fast register reads if no polling is needed
    
    If the target is in a state where S_REGRDY polling is necessary (slow
    clock, low power state...?), OpenOCD will continue to use the slow
    path even if the condition is temporary and the target at a later
    point would be capable of fast reads again.
    
    Revert to fast reads if a full register dump can be made without need
    for polling any of the registers; presumably it will succeed the next
    time too.
    
    Change-Id: I557f0d90b7ce6f9d81aa409b6400fc9c83d16008
    Signed-off-by: Andreas Fritiofson <and...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/6678
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c
index 82d5eff80..721cf0a24 100644
--- a/src/target/cortex_m.c
+++ b/src/target/cortex_m.c
@@ -183,6 +183,7 @@ static int cortex_m_load_core_reg_u32(struct target *target,
 		cortex_m_cumulate_dhcsr_sticky(cortex_m, cortex_m->dcb_dhcsr);
 		if (cortex_m->dcb_dhcsr & S_REGRDY)
 			break;
+		cortex_m->slow_register_read = true; /* Polling (still) needed. */
 		if (timeval_ms() > then + DHCSR_S_REGRDY_TIMEOUT) {
 			LOG_ERROR("Timeout waiting for DCRDR transfer ready");
 			return ERROR_TIMEOUT_REACHED;
@@ -204,9 +205,14 @@ static int cortex_m_load_core_reg_u32(struct target *target,
 
 static int cortex_m_slow_read_all_regs(struct target *target)
 {
+	struct cortex_m_common *cortex_m = target_to_cm(target);
 	struct armv7m_common *armv7m = target_to_armv7m(target);
 	const unsigned int num_regs = armv7m->arm.core_cache->num_regs;
 
+	/* Opportunistically restore fast read, it'll revert to slow
+	 * if any register needed polling in cortex_m_load_core_reg_u32(). */
+	cortex_m->slow_register_read = false;
+
 	for (unsigned int reg_id = 0; reg_id < num_regs; reg_id++) {
 		struct reg *r = &armv7m->arm.core_cache->reg_list[reg_id];
 		if (r->exist) {
@@ -215,6 +221,10 @@ static int cortex_m_slow_read_all_regs(struct target *target)
 				return retval;
 		}
 	}
+
+	if (!cortex_m->slow_register_read)
+		LOG_DEBUG("Switching back to fast register reads");
+
 	return ERROR_OK;
 }
 

-----------------------------------------------------------------------

Summary of changes:
 src/target/cortex_m.c | 10 ++++++++++
 1 file changed, 10 insertions(+)


hooks/post-receive
-- 
Main OpenOCD repository