[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-541-g71ca3a134

[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  71ca3a134916c74bb9199d1da0941a77670c914a (commit)
      from  c892f1055ddd25257457a194a017f3547d547aaa (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 71ca3a134916c74bb9199d1da0941a77670c914a
Author: Bohdan Tymkiv <boh...@gm...>
Date:   Thu Dec 2 10:08:33 2021 +0200

    target/arm_jtag.h: fix wrong comparison in arm_jtag_set_instr
    
    Change [1] introduced a regression that results in comparison
    in arm_jtag_set_instr() to be always true if the length of the
    IR register is not 8 bit. The value on the left side
    of the != operator contains only tap->ir_length number of
    bits while value on the right is full 8-bit instruction code.
    
    This forces OpenOCD to update the JTAG IR register on each
    transaction even if the instruction in the JTAG IR register
    is correct. This causes noticeable performance degradation,
    especially with slow JTAG adapters.
    
    [1] https://review.openocd.org/c/openocd/+/6285
    
    time ./src/openocd -s tcl/ -f interface/cmsis-dap.cfg \
      -c "transport select jtag" -f target/psoc6.cfg \
      -c "init; load_image data.bin 0x08000000; exit"
    
    Without this change:
    real    0m4,863s
    user    0m0,074s
    sys     0m0,128s
    
    With this change:
    real    0m3,083s
    user    0m0,038s
    sys     0m0,098s
    
    Signed-off-by: Bohdan Tymkiv <boh...@gm...>
    Change-Id: Iaded83a04ecc7e65f18256afae582267ccc1fc59
    Reviewed-on: https://review.openocd.org/c/openocd/+/6762
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/target/arm_jtag.h b/src/target/arm_jtag.h
index bf5b83748..f3e0bc2a3 100644
--- a/src/target/arm_jtag.h
+++ b/src/target/arm_jtag.h
@@ -23,6 +23,7 @@
 #define OPENOCD_TARGET_ARM_JTAG_H
 
 #include <jtag/jtag.h>
+#include <helper/bits.h>
 
 struct arm_jtag {
 	struct jtag_tap *tap;
@@ -42,7 +43,7 @@ static inline int arm_jtag_set_instr(struct jtag_tap *tap,
 		uint32_t new_instr, void *no_verify_capture, tap_state_t end_state)
 {
 	/* inline most common code path */
-	if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr)
+	if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != (new_instr & (BIT(tap->ir_length) - 1)))
 		return arm_jtag_set_instr_inner(tap, new_instr, no_verify_capture, end_state);
 
 	return ERROR_OK;

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

Summary of changes:
 src/target/arm_jtag.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository