[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-629-g00d4699d0

[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  00d4699d0b559a0bb3e739a78f3ce1c5731f8dea (commit)
      from  1b716b9d0d42409f5ee8855f084720ff579a7737 (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 00d4699d0b559a0bb3e739a78f3ce1c5731f8dea
Author: Antonio Borneo <bor...@gm...>
Date:   Wed Jun 9 11:27:57 2021 +0200

    arm_tpiu_swo: fix autodetection of SWO pin frequency
    
    While the documentation reports that SWO pin frequency can be
    omitted to let the adapter autodetect the value, the code wrongly
    drops an error when pin frequency is not specified.
    
    Don't require the pin frequency to be set at "enable", but verify
    that the adapter has properly changes it to a valid value.
    
    Change-Id: I3dfbe3256e8887ef4f03512769b06381cdc9db0d
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reported-by: Karl Palsson <ka...@tw...>
    Fixes: 184724d14e12 ("arm_tpiu_swo: add support for independent TPIU and SWO")
    Reviewed-on: https://review.openocd.org/c/openocd/+/6310
    Tested-by: jenkins
    Reviewed-by: zapb <de...@za...>

diff --git a/src/target/arm_tpiu_swo.c b/src/target/arm_tpiu_swo.c
index a0eba6782..fba3fec4f 100644
--- a/src/target/arm_tpiu_swo.c
+++ b/src/target/arm_tpiu_swo.c
@@ -625,10 +625,8 @@ static int jim_arm_tpiu_swo_enable(Jim_Interp *interp, int argc, Jim_Obj *const
 	}
 
 	if (obj->pin_protocol == TPIU_SPPR_PROTOCOL_MANCHESTER || obj->pin_protocol == TPIU_SPPR_PROTOCOL_UART)
-		if (!obj->swo_pin_freq) {
-			LOG_ERROR("SWO pin frequency not set");
-			return JIM_ERR;
-		}
+		if (!obj->swo_pin_freq)
+			LOG_DEBUG("SWO pin frequency not set, will be autodetected by the adapter");
 
 	struct target *target = get_current_target(cmd_ctx);
 
@@ -731,6 +729,17 @@ static int jim_arm_tpiu_swo_enable(Jim_Interp *interp, int argc, Jim_Obj *const
 			return JIM_ERR;
 		}
 
+		if (obj->pin_protocol == TPIU_SPPR_PROTOCOL_MANCHESTER || obj->pin_protocol == TPIU_SPPR_PROTOCOL_UART)
+			if (!swo_pin_freq) {
+				if (obj->swo_pin_freq)
+					LOG_ERROR("Adapter rejected SWO pin frequency %d Hz", obj->swo_pin_freq);
+				else
+					LOG_ERROR("Adapter does not support auto-detection of SWO pin frequency nor a default value");
+
+				arm_tpiu_swo_close_output(obj);
+				return JIM_ERR;
+			}
+
 		if (obj->swo_pin_freq != swo_pin_freq)
 			LOG_INFO("SWO pin data rate adjusted by adapter to %d Hz", swo_pin_freq);
 		obj->swo_pin_freq = swo_pin_freq;

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

Summary of changes:
 src/target/arm_tpiu_swo.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository