From bdb351a6eaf552763556c9ffb5901c7bb8e7aa40 Mon Sep 17 00:00:00 2001
From: Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
Date: Thu, 17 Sep 2020 22:02:54 +0200
Subject: [PATCH] adiv5_swdp: On ACK_FAULT, error() and try again once #731

when writing CSW.
---
 src/target/adiv5_swdp.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/target/adiv5_swdp.c b/src/target/adiv5_swdp.c
index 5097febd..eba7cab5 100644
--- a/src/target/adiv5_swdp.c
+++ b/src/target/adiv5_swdp.c
@@ -146,6 +146,12 @@ uint32_t firmware_swdp_low_access(ADIv5_DP_t *dp, uint8_t RnW,
 	do {
 		swd_proc.swdptap_seq_out(request, 8);
 		ack = swd_proc.swdptap_seq_in(3);
+		if (ack == SWDP_ACK_FAULT) {
+			/* On fault, abort() and repeat the command once.*/
+			firmware_swdp_error(dp);
+			swd_proc.swdptap_seq_out(request, 8);
+			ack = swd_proc.swdptap_seq_in(3);
+		}
 	} while (ack == SWDP_ACK_WAIT && !platform_timeout_is_expired(&timeout));
 
 	if (ack == SWDP_ACK_WAIT)