X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fadi_v5_jtag.c;h=7f61563f4e45aa15e6a18879bd3ad38b90530512;hb=13f6c889ab9b6e5b1c4f48fca9807fdc1fb83f42;hp=b6473b01bf5c5a9851e7775f89929ad134ec4af1;hpb=374127301ec1d72033b9d573b72c7abdfd61990d;p=openocd.git

diff --git a/src/target/adi_v5_jtag.c b/src/target/adi_v5_jtag.c
index b6473b01bf..7f61563f4e 100644
--- a/src/target/adi_v5_jtag.c
+++ b/src/target/adi_v5_jtag.c
@@ -23,7 +23,7 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the
  *   Free Software Foundation, Inc.,
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  ***************************************************************************/
 
 /**
@@ -50,6 +50,8 @@
 #define JTAG_ACK_OK_FAULT	0x2
 #define JTAG_ACK_WAIT		0x1
 
+static int jtag_ap_q_abort(struct adiv5_dap *dap, uint8_t *ack);
+
 /***************************************************************************
  *
  * DPACC and APACC scanchain access through JTAG-DP (or SWJ-DP)
@@ -75,10 +77,7 @@
  * @param ack points to where the three bit JTAG_ACK_* code will be stored
  */
 
-/* FIXME don't export ... this is a temporary workaround for the
- * mem_ap_read_buf_u32() mess, until it's no longer JTAG-specific.
- */
-int adi_jtag_dp_scan(struct adiv5_dap *dap,
+static int adi_jtag_dp_scan(struct adiv5_dap *dap,
 		uint8_t instr, uint8_t reg_addr, uint8_t RnW,
 		uint8_t *outvalue, uint8_t *invalue, uint8_t *ack)
 {
@@ -235,12 +234,16 @@ static int jtagdp_transaction_endcheck(struct adiv5_dap *dap)
 		while (dap->ack != JTAG_ACK_OK_FAULT) {
 			if (dap->ack == JTAG_ACK_WAIT) {
 				if ((timeval_ms()-then) > 1000) {
-					/* NOTE:  this would be a good spot
-					 * to use JTAG_DP_ABORT.
-					 */
 					LOG_WARNING("Timeout (1000ms) waiting "
 						"for ACK=OK/FAULT "
-						"in JTAG-DP transaction");
+						"in JTAG-DP transaction - aborting");
+
+					uint8_t ack;
+					int abort_ret = jtag_ap_q_abort(dap, &ack);
+
+					if (abort_ret != 0)
+						LOG_WARNING("Abort failed : return=%d ack=%d", abort_ret, ack);
+
 					return ERROR_JTAG_DEVICE_ERROR;
 				}
 			} else {
@@ -254,7 +257,7 @@ static int jtagdp_transaction_endcheck(struct adiv5_dap *dap)
 					DP_CTRL_STAT, DPAP_READ, 0, &ctrlstat);
 			if (retval != ERROR_OK)
 				return retval;
-			retval = dap_run(dap);
+			retval = jtag_execute_queue();
 			if (retval != ERROR_OK)
 				return retval;
 			dap->ack = dap->ack & 0x7;
@@ -305,7 +308,7 @@ static int jtagdp_transaction_endcheck(struct adiv5_dap *dap)
 					DP_CTRL_STAT, DPAP_READ, 0, &ctrlstat);
 			if (retval != ERROR_OK)
 				return retval;
-			retval = dap_run(dap);
+			retval = jtag_execute_queue();
 			if (retval != ERROR_OK)
 				return retval;
 
@@ -321,14 +324,14 @@ static int jtagdp_transaction_endcheck(struct adiv5_dap *dap)
 			if (retval != ERROR_OK)
 				return retval;
 
-			retval = dap_run(dap);
+			retval = jtag_execute_queue();
 			if (retval != ERROR_OK)
 				return retval;
 			LOG_ERROR("MEM_AP_CSW 0x%" PRIx32 ", MEM_AP_TAR 0x%"
 					PRIx32, mem_ap_csw, mem_ap_tar);
 
 		}
-		retval = dap_run(dap);
+		retval = jtag_execute_queue();
 		if (retval != ERROR_OK)
 			return retval;
 		return ERROR_JTAG_DEVICE_ERROR;
@@ -353,7 +356,7 @@ static int jtag_idcode_q_read(struct adiv5_dap *dap,
 
 	fields[0].num_bits = 32;
 	fields[0].out_value = NULL;
-	fields[0].in_value = (void *) data;
+	fields[0].in_value = (uint8_t *) data;
 
 	jtag_add_dr_scan(jtag_info->tap, 1, fields, TAP_IDLE);
 
@@ -417,6 +420,40 @@ static int jtag_ap_q_write(struct adiv5_dap *dap, unsigned reg,
 	return adi_jtag_ap_write_check(dap, reg, out_value_buf);
 }
 
+static int jtag_ap_q_read_block(struct adiv5_dap *dap, unsigned reg,
+		uint32_t blocksize, uint8_t *buffer)
+{
+	uint32_t readcount;
+	int retval = ERROR_OK;
+
+	/* Scan out first read */
+	retval = adi_jtag_dp_scan(dap, JTAG_DP_APACC, reg,
+			DPAP_READ, 0, NULL, NULL);
+	if (retval != ERROR_OK)
+		return retval;
+
+	for (readcount = 0; readcount < blocksize - 1; readcount++) {
+		/* Scan out next read; scan in posted value for the
+		 * previous one.  Assumes read is acked "OK/FAULT",
+		 * and CTRL_STAT says that meant "OK".
+		 */
+		retval = adi_jtag_dp_scan(dap, JTAG_DP_APACC, reg,
+				DPAP_READ, 0, buffer + 4 * readcount,
+				&dap->ack);
+		if (retval != ERROR_OK)
+			return retval;
+	}
+
+	/* Scan in last posted value; RDBUFF has no other effect,
+	 * assuming ack is OK/FAULT and CTRL_STAT says "OK".
+	 */
+	retval = adi_jtag_dp_scan(dap, JTAG_DP_DPACC, DP_RDBUFF,
+			DPAP_READ, 0, buffer + 4 * readcount,
+			&dap->ack);
+
+	return retval;
+}
+
 static int jtag_ap_q_abort(struct adiv5_dap *dap, uint8_t *ack)
 {
 	/* for JTAG, this is the only valid ABORT register operation */
@@ -433,13 +470,14 @@ static int jtag_dp_run(struct adiv5_dap *dap)
  * part of DAP setup
 */
 const struct dap_ops jtag_dp_ops = {
-	.queue_idcode_read =	jtag_idcode_q_read,
-	.queue_dp_read =	jtag_dp_q_read,
-	.queue_dp_write =	jtag_dp_q_write,
-	.queue_ap_read =	jtag_ap_q_read,
-	.queue_ap_write =	jtag_ap_q_write,
-	.queue_ap_abort =	jtag_ap_q_abort,
-	.run =			jtag_dp_run,
+	.queue_idcode_read   = jtag_idcode_q_read,
+	.queue_dp_read       = jtag_dp_q_read,
+	.queue_dp_write      = jtag_dp_q_write,
+	.queue_ap_read       = jtag_ap_q_read,
+	.queue_ap_write      = jtag_ap_q_write,
+	.queue_ap_read_block = jtag_ap_q_read_block,
+	.queue_ap_abort      = jtag_ap_q_abort,
+	.run                 = jtag_dp_run,
 };