Whenever bscan mode is entered, reset the variable that tracksbscan_optimization

whether we are certain that USER4 has already been selected into IR.

1 files changed, 7 insertions, 0 deletions

diff --git a/src/target/riscv/riscv.c b/src/target/riscv/riscv.c
index 70c5e2f..1ac7aaf 100644
--- a/src/target/riscv/riscv.c
+++ b/src/target/riscv/riscv.c
@@ -2257,6 +2257,13 @@ COMMAND_HANDLER(riscv_use_bscan_tunnel)
 
 	bscan_tunnel_type = tunnel_type;
 	bscan_tunnel_ir_width = irwidth;
+	/* Set things up to generate another one-time loading of USER4 into IR the first time
+	   a RISCV scan happens from this point,  in case somebody transitioned out of bscan
+	   tunneling mode and did some other activity on the outer JTAG chain after having
+	   been in bscan tunneling mode at an earlier time within the same lifetime of this
+	   process (which may have loaded a different IR value). */
+	bscan_user4_selected = false;  
+
 	return ERROR_OK;
 }