[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-rc1-37-ga69b382ef

[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  a69b382efd35f13e0f7e63194086a2f5ac24215b (commit)
      from  8bf5482754715f2e1b05be03de8780f26c305955 (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 a69b382efd35f13e0f7e63194086a2f5ac24215b
Author: Daniel Goehring <dgo...@os...>
Date:   Tue Oct 4 00:03:42 2022 -0700

    target/adiv5: 64-bit TAR setup bugfix
    
    For 64-bit TAR setup, if 'tar_valid == false' perform the upper 32-bit
    write even if the cached copy matches the upper TAR value to be written.
    
    Signed-off-by: Daniel Goehring <dgo...@os...>
    Change-Id: I320377dc90a9d1d7b64cbb281b2527e56c7621ee
    Reviewed-on: https://review.openocd.org/c/openocd/+/7245
    Reviewed-by: Tomas Vanek <va...@fb...>
    Reviewed-by: Antonio Borneo <bor...@gm...>
    Tested-by: jenkins

diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index c44642825..da5da3197 100644
--- a/src/target/arm_adi_v5.c
+++ b/src/target/arm_adi_v5.c
@@ -113,7 +113,7 @@ static int mem_ap_setup_tar(struct adiv5_ap *ap, target_addr_t tar)
 		int retval = dap_queue_ap_write(ap, MEM_AP_REG_TAR(ap->dap), (uint32_t)(tar & 0xffffffffUL));
 		if (retval == ERROR_OK && is_64bit_ap(ap)) {
 			/* See if bits 63:32 of tar is different from last setting */
-			if ((ap->tar_value >> 32) != (tar >> 32))
+			if (!ap->tar_valid || (ap->tar_value >> 32) != (tar >> 32))
 				retval = dap_queue_ap_write(ap, MEM_AP_REG_TAR64(ap->dap), (uint32_t)(tar >> 32));
 		}
 		if (retval != ERROR_OK) {

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

Summary of changes:
 src/target/arm_adi_v5.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository