sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

adiv5_swdp: Changed the low-level access code to retry till timeout (partial revert of 61efe26) 

Proper initialisation of the ack value also fixes a potential use-before-init UB
This commit is contained in:
dragonmux 2022-03-25 05:25:40 -04:00 committed by Piotr Esden-Tempski
parent d9ef3ff147
commit a0c77e216d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/target/adiv5_swdp.c
View File

@ -222,7 +222,7 @@ uint32_t firmware_swdp_low_access(ADIv5_DP_t *dp, uint8_t RnW,
{ {
uint32_t request = make_packet_request(RnW, addr); uint32_t request = make_packet_request(RnW, addr);
uint32_t response = 0; uint32_t response = 0;
uint32_t ack; uint32_t ack = SWDP_ACK_WAIT;
platform_timeout timeout; platform_timeout timeout;
if ((addr & ADIV5_APnDP) && dp->fault) if ((addr & ADIV5_APnDP) && dp->fault)
@ -233,10 +233,10 @@ uint32_t firmware_swdp_low_access(ADIv5_DP_t *dp, uint8_t RnW,
dp->seq_out(request, 8); dp->seq_out(request, 8);
ack = dp->seq_in(3); ack = dp->seq_in(3);
if (ack == SWDP_ACK_FAULT) { if (ack == SWDP_ACK_FAULT) {
dp->fault = 1; /* On fault, abort the request and repeat */
return 0; dp->error(dp);
} }
} while (ack == SWDP_ACK_WAIT && !platform_timeout_is_expired(&timeout)); } while ((ack == SWDP_ACK_WAIT || ack == SWDP_ACK_FAULT) && !platform_timeout_is_expired(&timeout));
if (ack == SWDP_ACK_WAIT) { if (ack == SWDP_ACK_WAIT) {
dp->abort(dp, ADIV5_DP_ABORT_DAPABORT); dp->abort(dp, ADIV5_DP_ABORT_DAPABORT);