auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drivers/ch347: fix SWD log messages

Browse Source 
Remove annoying and not too informative error message `ack != SWD_ACK_OK`.
Fix copy&paste error in message `SWD Read data parity mismatch` logged
in case of a write returning bad ack.
Raise log level of read/write descriptive message to DEBUG when reg
read/writes returns bad ack.

Change-Id: Ic3433ae8bd02472756adf269658bfba0ba34dc26
Signed-off-by: Tomas Vanek <vanekt@fbl.cz>
Reviewed-on: https://review.openocd.org/c/openocd/+/8747
Reviewed-by: ZhiYuanNJ <871238103@qq.com>
Tested-by: jenkins
This commit is contained in:
Tomas Vanek
2025-02-09 11:35:11 +01:00
parent fe50eceaff
commit b4a1976886
1 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/jtag/drivers/ch347.c
View File

@@ -2153,13 +2153,25 @@ static int ch347_swd_run_queue_inner(void)
/* Devices do not reply to DP_TARGETSEL write /* Devices do not reply to DP_TARGETSEL write
cmd, ignore received ack */ cmd, ignore received ack */
check_ack = swd_cmd_returns_ack(pswd_io->cmd); check_ack = swd_cmd_returns_ack(pswd_io->cmd);
if (ack != SWD_ACK_OK && check_ack) {
ch347_swd_context.queued_retval = swd_ack_to_error_code(ack);
LOG_ERROR("ack != SWD_ACK_OK");
goto skip;
}
if (pswd_io->cmd & SWD_CMD_RNW) { if (pswd_io->cmd & SWD_CMD_RNW) {
uint32_t data = buf_get_u32(&recv_buf[recv_len], 0, 32); uint32_t data = buf_get_u32(&recv_buf[recv_len], 0, 32);
LOG_CUSTOM_LEVEL((check_ack && ack != SWD_ACK_OK)
? LOG_LVL_DEBUG : LOG_LVL_DEBUG_IO,
"%s%s %s read reg %X = %08" PRIx32,
check_ack ? "" : "ack ignored ",
ack == SWD_ACK_OK ? "OK" :
ack == SWD_ACK_WAIT ? "WAIT" :
ack == SWD_ACK_FAULT ? "FAULT" : "JUNK",
pswd_io->cmd & SWD_CMD_APNDP ? "AP" : "DP",
(pswd_io->cmd & SWD_CMD_A32) >> 1,
data);
if (ack != SWD_ACK_OK && check_ack) {
ch347_swd_context.queued_retval = swd_ack_to_error_code(ack);
goto skip;
}
uint32_t parity = buf_get_u32(&recv_buf[recv_len], 32, 1); uint32_t parity = buf_get_u32(&recv_buf[recv_len], 32, 1);
if (parity != (uint32_t)parity_u32(data)) { if (parity != (uint32_t)parity_u32(data)) {
LOG_ERROR("SWD Read data parity mismatch"); LOG_ERROR("SWD Read data parity mismatch");
@@ -2167,15 +2179,6 @@ static int ch347_swd_run_queue_inner(void)
goto skip; goto skip;
} }
LOG_DEBUG_IO("%s%s %s %s reg %X = %08X - " PRIx32,
check_ack ? "" : "ack ignored ",
ack == SWD_ACK_OK ? "OK" : ack == SWD_ACK_WAIT ? "WAIT" :
ack == SWD_ACK_FAULT ? "FAULT" : "JUNK",
pswd_io->cmd & SWD_CMD_APNDP ? "AP" : "DP",
pswd_io->cmd & SWD_CMD_RNW ? "read" : "write",
(pswd_io->cmd & SWD_CMD_A32) >> 1,
data);
if (pswd_io->dst) if (pswd_io->dst)
*pswd_io->dst = data; *pswd_io->dst = data;
} else { } else {
@@ -2190,19 +2193,22 @@ static int ch347_swd_run_queue_inner(void)
/* Devices do not reply to DP_TARGETSEL write /* Devices do not reply to DP_TARGETSEL write
cmd, ignore received ack */ cmd, ignore received ack */
check_ack = swd_cmd_returns_ack(pswd_io->cmd); check_ack = swd_cmd_returns_ack(pswd_io->cmd);
LOG_CUSTOM_LEVEL((check_ack && ack != SWD_ACK_OK)
? LOG_LVL_DEBUG : LOG_LVL_DEBUG_IO,
"%s%s %s write reg %X = %08" PRIx32,
check_ack ? "" : "ack ignored ",
ack == SWD_ACK_OK ? "OK" :
ack == SWD_ACK_WAIT ? "WAIT" :
ack == SWD_ACK_FAULT ? "FAULT" : "JUNK",
pswd_io->cmd & SWD_CMD_APNDP ? "AP" : "DP",
(pswd_io->cmd & SWD_CMD_A32) >> 1,
pswd_io->value);
if (ack != SWD_ACK_OK && check_ack) { if (ack != SWD_ACK_OK && check_ack) {
ch347_swd_context.queued_retval = swd_ack_to_error_code(ack); ch347_swd_context.queued_retval = swd_ack_to_error_code(ack);
LOG_ERROR("SWD Read data parity mismatch");
goto skip; goto skip;
} }
LOG_DEBUG_IO("%s%s %s %s reg %X = %08X - " PRIx32,
check_ack ? "" : "ack ignored ",
ack == SWD_ACK_OK ? "OK" : ack == SWD_ACK_WAIT ? "WAIT" :
ack == SWD_ACK_FAULT ? "FAULT" : "JUNK",
pswd_io->cmd & SWD_CMD_APNDP ? "AP" : "DP",
pswd_io->cmd & SWD_CMD_RNW ? "read" : "write",
(pswd_io->cmd & SWD_CMD_A32) >> 1,
pswd_io->value);
} else { } else {
ch347_swd_context.queued_retval = ERROR_FAIL; ch347_swd_context.queued_retval = ERROR_FAIL;
LOG_ERROR("CH347 usb write/read failed recv_len = %d", recv_len); LOG_ERROR("CH347 usb write/read failed recv_len = %d", recv_len);