Abort after timeout

Author: bugadani

src/dap.rs

@@ -1,5 +1,8 @@
 use crate::{
-    jtag::{self, TransferInfo, TransferResult},
+    jtag::{
+        self, TransferInfo, TransferResult, JTAG_IR_ABORT, JTAG_IR_APACC, JTAG_IR_DPACC,
+        JTAG_IR_IDCODE,
+    },
     swd::{self, APnDP, RnW},
     swj, swo, usb,
 };
@@ -306,8 +309,7 @@ where
                     return;
                 }
 
-                const JTAG_ABORT: u32 = 0x08;
-                jtag.shift_ir(JTAG_ABORT);
+                jtag.shift_ir(JTAG_IR_ABORT);
                 jtag.write_abort(word);
 
                 resp.write_ok();
@@ -655,9 +657,7 @@ where
             return;
         }
 
-        const JTAG_IDCODE: u32 = 0x0E;
-
-        jtag.shift_ir(JTAG_IDCODE);
+        jtag.shift_ir(JTAG_IR_IDCODE);
         let data = jtag.shift_dr(0);
 
         resp.write_ok();
@@ -814,8 +814,6 @@ where
             return;
         }
 
-        const JTAG_DPACC: u32 = 0x0A;
-        const JTAG_APACC: u32 = 0x0B;
         const DP_RDBUFF: u8 = 0x0C;
         let read_rdbuff = TransferInfo {
             r_nw: RnW::R,
@@ -834,9 +832,9 @@ where
             let request_value = jtag::TransferInfo::from(req.next_u8());
             ntransfers -= 1;
             let request_ir = if request_value.ap_ndp == APnDP::AP {
-                JTAG_APACC
+                JTAG_IR_APACC
             } else {
-                JTAG_DPACC
+                JTAG_IR_DPACC
             };
             if request_value.r_nw == RnW::R {
                 // Read register
@@ -854,8 +852,8 @@ where
                         );
                     } else {
                         // Select JTAG chain
-                        if ir != JTAG_DPACC {
-                            ir = JTAG_DPACC;
+                        if ir != JTAG_IR_DPACC {
+                            ir = JTAG_IR_DPACC;
                             jtag.shift_ir(ir);
                         }
 
@@ -956,8 +954,8 @@ where
                 // Write register
                 if post_read {
                     // Select JTAG chain
-                    if ir != JTAG_DPACC {
-                        ir = JTAG_DPACC;
+                    if ir != JTAG_IR_DPACC {
+                        ir = JTAG_IR_DPACC;
                         jtag.shift_ir(ir);
                     }
                     // Read previous data
@@ -1017,8 +1015,8 @@ where
 
         if matches!(response_value, TransferResult::Ok(_)) {
             // Select JTAG chain
-            if ir != JTAG_DPACC {
-                jtag.shift_ir(JTAG_DPACC);
+            if ir != JTAG_IR_DPACC {
+                jtag.shift_ir(JTAG_IR_DPACC);
             }
 
             // Check last write, or read previous read's result.
@@ -1131,8 +1129,6 @@ where
         mut req: Request,
         resp: &mut ResponseWriter,
     ) {
-        const JTAG_DPACC: u32 = 0x0A;
-        const JTAG_APACC: u32 = 0x0B;
         const DP_RDBUFF: u8 = 0x0C;
         let read_rdbuff = TransferInfo {
             r_nw: RnW::R,
@@ -1165,9 +1161,9 @@ where
 
         // Select JTAG chain
         let ir = if request_value.ap_ndp == APnDP::AP {
-            JTAG_APACC
+            JTAG_IR_APACC
         } else {
-            JTAG_DPACC
+            JTAG_IR_DPACC
         };
         jtag.shift_ir(ir);
 
@@ -1184,8 +1180,8 @@ where
                     // Read DP/AP register
                     if nrequests == 0 {
                         // Last read
-                        if ir != JTAG_DPACC {
-                            jtag.shift_ir(JTAG_DPACC);
+                        if ir != JTAG_IR_APACC {
+                            jtag.shift_ir(JTAG_IR_APACC);
                         }
                         request_value = read_rdbuff;
                     }
@@ -1219,8 +1215,8 @@ where
 
                 if request_count == 0 {
                     // Check last write
-                    if ir != JTAG_DPACC {
-                        jtag.shift_ir(JTAG_DPACC);
+                    if ir != JTAG_IR_DPACC {
+                        jtag.shift_ir(JTAG_IR_DPACC);
                     }
                     response_value =
                         transfer_with_retry(jtag, read_rdbuff, transfer_config, 0, retry);
@@ -1301,6 +1297,12 @@ fn transfer_with_retry<DEPS>(
         }
         retry -= 1;
     }
+
+    if retry == 0 {
+        jtag.shift_ir(JTAG_IR_ABORT);
+        jtag.write_abort(1);
+    }
+
     response_value
 }
 

src/jtag.rs

@@ -162,6 +162,11 @@ const IDLE_TO_SHIFT_IR: &[bool] = &[true, true, false, false];
 const SHIFT_TO_IDLE: &[bool] = &[true, true, false];
 const EXIT1_TO_IDLE: &[bool] = &[true, false];
 
+pub(crate) const JTAG_IR_ABORT: u32 = 0x08;
+pub(crate) const JTAG_IR_DPACC: u32 = 0x0A;
+pub(crate) const JTAG_IR_APACC: u32 = 0x0B;
+pub(crate) const JTAG_IR_IDCODE: u32 = 0x0E;
+
 // TODO: currently this only supports JTAG DP V0.
 const DAP_TRANSFER_OK_FAULT: u32 = 0x02;