X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm_adi_v5.c;h=41bd26153ffb0df984e90eb1ef595222e074667d;hp=1018ede36c40010d47abb3a7f787111c8da7304b;hb=1338cf60b91c582fa4b27d5226ab4374117be415;hpb=50c93152123feec0f0a063ffb18cd7d91069c115

diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index 1018ede36c..41bd26153f 100644
--- a/src/target/arm_adi_v5.c
+++ b/src/target/arm_adi_v5.c
@@ -10,6 +10,9 @@
  *                                                                         *
  *   Copyright (C) 2009-2010 by David Brownell                             *
  *                                                                         *
+ *   Copyright (C) 2013 by Andreas Fritiofson                              *
+ *   andreas.fritiofson@gmail.com                                          *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -23,7 +26,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.           *
  ***************************************************************************/
 
 /**
@@ -82,7 +85,7 @@
 */
 static uint32_t max_tar_block_size(uint32_t tar_autoincr_block, uint32_t address)
 {
-	return (tar_autoincr_block - ((tar_autoincr_block - 1) & address)) >> 2;
+	return tar_autoincr_block - ((tar_autoincr_block - 1) & address);
 }
 
 /***************************************************************************
@@ -115,6 +118,33 @@ void dap_ap_select(struct adiv5_dap *dap, uint8_t ap)
 	}
 }
 
+static int dap_setup_accessport_csw(struct adiv5_dap *dap, uint32_t csw)
+{
+	csw = csw | CSW_DBGSWENABLE | CSW_MASTER_DEBUG | CSW_HPROT |
+		dap->apcsw[dap->ap_current >> 24];
+
+	if (csw != dap->ap_csw_value) {
+		/* LOG_DEBUG("DAP: Set CSW %x",csw); */
+		int retval = dap_queue_ap_write(dap, AP_REG_CSW, csw);
+		if (retval != ERROR_OK)
+			return retval;
+		dap->ap_csw_value = csw;
+	}
+	return ERROR_OK;
+}
+
+static int dap_setup_accessport_tar(struct adiv5_dap *dap, uint32_t tar)
+{
+	if (tar != dap->ap_tar_value || dap->ap_csw_value & CSW_ADDRINC_MASK) {
+		/* LOG_DEBUG("DAP: Set TAR %x",tar); */
+		int retval = dap_queue_ap_write(dap, AP_REG_TAR, tar);
+		if (retval != ERROR_OK)
+			return retval;
+		dap->ap_tar_value = tar;
+	}
+	return ERROR_OK;
+}
+
 /**
  * Queue transactions setting up transfer parameters for the
  * currently selected MEM-AP.
@@ -137,26 +167,12 @@ void dap_ap_select(struct adiv5_dap *dap, uint8_t ap)
 int dap_setup_accessport(struct adiv5_dap *dap, uint32_t csw, uint32_t tar)
 {
 	int retval;
-	csw = csw | CSW_DBGSWENABLE | CSW_MASTER_DEBUG | CSW_HPROT |
-		dap->apcsw[dap->ap_current >> 24];
-
-	if (csw != dap->ap_csw_value) {
-		/* LOG_DEBUG("DAP: Set CSW %x",csw); */
-		retval = dap_queue_ap_write(dap, AP_REG_CSW, csw);
-		if (retval != ERROR_OK)
-			return retval;
-		dap->ap_csw_value = csw;
-	}
-	if (tar != dap->ap_tar_value) {
-		/* LOG_DEBUG("DAP: Set TAR %x",tar); */
-		retval = dap_queue_ap_write(dap, AP_REG_TAR, tar);
-		if (retval != ERROR_OK)
-			return retval;
-		dap->ap_tar_value = tar;
-	}
-	/* Disable TAR cache when autoincrementing */
-	if (csw & CSW_ADDRINC_MASK)
-		dap->ap_tar_value = -1;
+	retval = dap_setup_accessport_csw(dap, csw);
+	if (retval != ERROR_OK)
+		return retval;
+	retval = dap_setup_accessport_tar(dap, tar);
+	if (retval != ERROR_OK)
+		return retval;
 	return ERROR_OK;
 }
 
@@ -261,552 +277,220 @@ int mem_ap_write_atomic_u32(struct adiv5_dap *dap, uint32_t address,
 	return dap_run(dap);
 }
 
-/*****************************************************************************
-*                                                                            *
-* mem_ap_write_buf(struct adiv5_dap *dap, uint8_t *buffer, int count, uint32_t address, bool addr_incr) *
-*                                                                            *
-* Write a buffer in target order (little endian)                             *
-*                                                                            *
-*****************************************************************************/
-int mem_ap_write_buf_u32(struct adiv5_dap *dap, const uint8_t *buffer, int count, uint32_t address, bool addr_incr)
+/**
+ * Synchronous write of a block of memory, using a specific access size.
+ *
+ * @param dap The DAP connected to the MEM-AP.
+ * @param buffer The data buffer to write. No particular alignment is assumed.
+ * @param size Which access size to use, in bytes. 1, 2 or 4.
+ * @param count The number of writes to do (in size units, not bytes).
+ * @param address Address to be written; it must be writable by the currently selected MEM-AP.
+ * @param addrinc Whether the target address should be increased for each write or not. This
+ *  should normally be true, except when writing to e.g. a FIFO.
+ * @return ERROR_OK on success, otherwise an error code.
+ */
+int mem_ap_write(struct adiv5_dap *dap, const uint8_t *buffer, uint32_t size, uint32_t count,
+		uint32_t address, bool addrinc)
 {
-	int wcount, blocksize, writecount, errorcount = 0, retval = ERROR_OK;
-	uint32_t adr = address;
-	const uint8_t *pBuffer = buffer;
-	uint32_t incr_flag = CSW_ADDRINC_OFF;
-
-	count >>= 2;
-	wcount = count;
-
-	/* if we have an unaligned access - reorder data */
-	if (adr & 0x3u) {
-		for (writecount = 0; writecount < count; writecount++) {
-			int i;
-			uint32_t outvalue;
-			memcpy(&outvalue, pBuffer, sizeof(uint32_t));
-
-			for (i = 0; i < 4; i++) {
-				*((uint8_t *)pBuffer + (adr & 0x3)) = outvalue;
-				outvalue >>= 8;
-				adr++;
-			}
-			pBuffer += sizeof(uint32_t);
-		}
-	}
-
-	while (wcount > 0) {
-		/* Adjust to write blocks within boundaries aligned to the TAR autoincremnent size*/
-		blocksize = max_tar_block_size(dap->tar_autoincr_block, address);
-		if (wcount < blocksize)
-			blocksize = wcount;
+	size_t nbytes = size * count;
+	const uint32_t csw_addrincr = addrinc ? CSW_ADDRINC_SINGLE : CSW_ADDRINC_OFF;
+	uint32_t csw_size;
+	int retval;
 
-		/* handle unaligned data at 4k boundary */
-		if (blocksize == 0)
-			blocksize = 1;
+	if (size == 4)
+		csw_size = CSW_32BIT;
+	else if (size == 2)
+		csw_size = CSW_16BIT;
+	else if (size == 1)
+		csw_size = CSW_8BIT;
+	else
+		return ERROR_TARGET_UNALIGNED_ACCESS;
 
-		if (addr_incr)
-			incr_flag = CSW_ADDRINC_SINGLE;
+	retval = dap_setup_accessport_tar(dap, address);
+	if (retval != ERROR_OK)
+		return retval;
 
-		retval = dap_setup_accessport(dap, CSW_32BIT | incr_flag, address);
-		if (retval != ERROR_OK)
-			return retval;
+	while (nbytes > 0) {
+		uint32_t this_size = size;
 
-		for (writecount = 0; writecount < blocksize; writecount++) {
-			uint32_t tmp;
-			tmp = buf_get_u32(buffer + 4 * writecount, 0, 32);
-			retval = dap_queue_ap_write(dap, AP_REG_DRW, tmp);
-			if (retval != ERROR_OK)
-				break;
-		}
-
-		retval = dap_run(dap);
-		if (retval == ERROR_OK) {
-			wcount = wcount - blocksize;
-			if (addr_incr)
-				address = address + 4 * blocksize;
-			buffer = buffer + 4 * blocksize;
-		} else
-			errorcount++;
-
-		if (errorcount > 1) {
-			LOG_WARNING("Block write error address 0x%" PRIx32 ", wcount 0x%x", address, wcount);
-			return retval;
+		/* Select packed transfer if possible */
+		if (addrinc && dap->packed_transfers && nbytes >= 4
+				&& max_tar_block_size(dap->tar_autoincr_block, address) >= 4) {
+			this_size = 4;
+			retval = dap_setup_accessport_csw(dap, csw_size | CSW_ADDRINC_PACKED);
+		} else {
+			retval = dap_setup_accessport_csw(dap, csw_size | csw_addrincr);
 		}
-	}
-
-	return retval;
-}
-
-static int mem_ap_write_buf_packed_u16(struct adiv5_dap *dap,
-		const uint8_t *buffer, int count, uint32_t address)
-{
-	int retval = ERROR_OK;
-	int wcount, blocksize, writecount, i;
-
-	wcount = count >> 1;
-
-	while (wcount > 0) {
-		int nbytes;
 
-		/* Adjust to write blocks within boundaries aligned to the TAR autoincremnent size*/
-		blocksize = max_tar_block_size(dap->tar_autoincr_block, address);
-
-		if (wcount < blocksize)
-			blocksize = wcount;
-
-		/* handle unaligned data at 4k boundary */
-		if (blocksize == 0)
-			blocksize = 1;
-
-		retval = dap_setup_accessport(dap, CSW_16BIT | CSW_ADDRINC_PACKED, address);
 		if (retval != ERROR_OK)
-			return retval;
-		writecount = blocksize;
-
-		do {
-			nbytes = MIN((writecount << 1), 4);
-
-			if (nbytes < 4) {
-				retval = mem_ap_write_buf_u16(dap, buffer,
-						nbytes, address);
-				if (retval != ERROR_OK) {
-					LOG_WARNING("Block write error address "
-						"0x%" PRIx32 ", count 0x%x",
-						address, count);
-					return retval;
-				}
-
-				address += nbytes >> 1;
-			} else {
-				uint32_t outvalue;
-				memcpy(&outvalue, buffer, sizeof(uint32_t));
-
-				for (i = 0; i < nbytes; i++) {
-					*((uint8_t *)buffer + (address & 0x3)) = outvalue;
-					outvalue >>= 8;
-					address++;
-				}
-
-				memcpy(&outvalue, buffer, sizeof(uint32_t));
-				retval = dap_queue_ap_write(dap,
-						AP_REG_DRW, outvalue);
-				if (retval != ERROR_OK)
-					break;
-
-				retval = dap_run(dap);
-				if (retval != ERROR_OK) {
-					LOG_WARNING("Block write error address "
-						"0x%" PRIx32 ", count 0x%x",
-						address, count);
-					return retval;
-				}
-			}
-
-			buffer += nbytes >> 1;
-			writecount -= nbytes >> 1;
-
-		} while (writecount);
-		wcount -= blocksize;
-	}
-
-	return retval;
-}
+			break;
 
-int mem_ap_write_buf_u16(struct adiv5_dap *dap, const uint8_t *buffer, int count, uint32_t address)
-{
-	int retval = ERROR_OK;
+		/* How many source bytes each transfer will consume, and their location in the DRW,
+		 * depends on the type of transfer and alignment. See ARM document IHI0031C. */
+		uint32_t outvalue = 0;
+		switch (this_size) {
+		case 4:
+			outvalue |= (uint32_t)*buffer++ << 8 * (address++ & 3);
+			outvalue |= (uint32_t)*buffer++ << 8 * (address++ & 3);
+		case 2:
+			outvalue |= (uint32_t)*buffer++ << 8 * (address++ & 3);
+		case 1:
+			outvalue |= (uint32_t)*buffer++ << 8 * (address++ & 3);
+		}
 
-	if (count >= 4)
-		return mem_ap_write_buf_packed_u16(dap, buffer, count, address);
+		nbytes -= this_size;
 
-	while (count > 0) {
-		retval = dap_setup_accessport(dap, CSW_16BIT | CSW_ADDRINC_SINGLE, address);
-		if (retval != ERROR_OK)
-			return retval;
-		uint16_t svalue;
-		memcpy(&svalue, buffer, sizeof(uint16_t));
-		uint32_t outvalue = (uint32_t)svalue << 8 * (address & 0x3);
 		retval = dap_queue_ap_write(dap, AP_REG_DRW, outvalue);
 		if (retval != ERROR_OK)
 			break;
 
-		retval = dap_run(dap);
-		if (retval != ERROR_OK)
-			break;
-
-		count -= 2;
-		address += 2;
-		buffer += 2;
-	}
-
-	return retval;
-}
-
-static int mem_ap_write_buf_packed_u8(struct adiv5_dap *dap,
-		const uint8_t *buffer, int count, uint32_t address)
-{
-	int retval = ERROR_OK;
-	int wcount, blocksize, writecount, i;
-
-	wcount = count;
-
-	while (wcount > 0) {
-		int nbytes;
-
-		/* Adjust to write blocks within boundaries aligned to the TAR autoincremnent size*/
-		blocksize = max_tar_block_size(dap->tar_autoincr_block, address);
-
-		if (wcount < blocksize)
-			blocksize = wcount;
-
-		retval = dap_setup_accessport(dap, CSW_8BIT | CSW_ADDRINC_PACKED, address);
-		if (retval != ERROR_OK)
-			return retval;
-		writecount = blocksize;
-
-		do {
-			nbytes = MIN(writecount, 4);
-
-			if (nbytes < 4) {
-				retval = mem_ap_write_buf_u8(dap, buffer, nbytes, address);
-				if (retval != ERROR_OK) {
-					LOG_WARNING("Block write error address "
-						"0x%" PRIx32 ", count 0x%x",
-						address, count);
-					return retval;
-				}
-
-				address += nbytes;
-			} else {
-				uint32_t outvalue;
-				memcpy(&outvalue, buffer, sizeof(uint32_t));
-
-				for (i = 0; i < nbytes; i++) {
-					*((uint8_t *)buffer + (address & 0x3)) = outvalue;
-					outvalue >>= 8;
-					address++;
-				}
-
-				memcpy(&outvalue, buffer, sizeof(uint32_t));
-				retval = dap_queue_ap_write(dap,
-						AP_REG_DRW, outvalue);
-				if (retval != ERROR_OK)
-					break;
-
-				retval = dap_run(dap);
-				if (retval != ERROR_OK) {
-					LOG_WARNING("Block write error address "
-						"0x%" PRIx32 ", count 0x%x",
-						address, count);
-					return retval;
-				}
-			}
-
-			buffer += nbytes;
-			writecount -= nbytes;
-
-		} while (writecount);
-		wcount -= blocksize;
+		/* Rewrite TAR if it wrapped */
+		if (addrinc && address % dap->tar_autoincr_block < size && nbytes > 0) {
+			retval = dap_setup_accessport_tar(dap, address);
+			if (retval != ERROR_OK)
+				break;
+		}
 	}
 
-	return retval;
-}
-
-int mem_ap_write_buf_u8(struct adiv5_dap *dap, const uint8_t *buffer, int count, uint32_t address)
-{
-	int retval = ERROR_OK;
-
-	if (count >= 4)
-		return mem_ap_write_buf_packed_u8(dap, buffer, count, address);
-
-	while (count > 0) {
-		retval = dap_setup_accessport(dap, CSW_8BIT | CSW_ADDRINC_SINGLE, address);
-		if (retval != ERROR_OK)
-			return retval;
-		uint32_t outvalue = (uint32_t)*buffer << 8 * (address & 0x3);
-		retval = dap_queue_ap_write(dap, AP_REG_DRW, outvalue);
-		if (retval != ERROR_OK)
-			break;
-
+	/* REVISIT: Might want to have a queued version of this function that does not run. */
+	if (retval == ERROR_OK)
 		retval = dap_run(dap);
-		if (retval != ERROR_OK)
-			break;
 
-		count--;
-		address++;
-		buffer++;
+	if (retval != ERROR_OK) {
+		uint32_t tar;
+		if (dap_queue_ap_read(dap, AP_REG_TAR, &tar) == ERROR_OK
+				&& dap_run(dap) == ERROR_OK)
+			LOG_ERROR("Failed to write memory at 0x%08"PRIx32, tar);
+		else
+			LOG_ERROR("Failed to write memory and, additionally, failed to find out where");
 	}
 
 	return retval;
 }
 
 /**
- * Synchronously read a block of 32-bit words into a buffer
+ * Synchronous read of a block of memory, using a specific access size.
+ *
  * @param dap The DAP connected to the MEM-AP.
- * @param buffer where the words will be stored (in host byte order).
- * @param count How many words to read.
- * @param address Memory address from which to read words; all the
- * @param addr_incr if true, increment the source address for each u32
- *	words must be readable by the currently selected MEM-AP.
+ * @param buffer The data buffer to receive the data. No particular alignment is assumed.
+ * @param size Which access size to use, in bytes. 1, 2 or 4.
+ * @param count The number of reads to do (in size units, not bytes).
+ * @param address Address to be read; it must be readable by the currently selected MEM-AP.
+ * @param addrinc Whether the target address should be increased after each read or not. This
+ *  should normally be true, except when reading from e.g. a FIFO.
+ * @return ERROR_OK on success, otherwise an error code.
  */
-int mem_ap_read_buf_u32(struct adiv5_dap *dap, uint8_t *buffer,
-		int count, uint32_t address, bool addr_incr)
+int mem_ap_read(struct adiv5_dap *dap, uint8_t *buffer, uint32_t size, uint32_t count,
+		uint32_t adr, bool addrinc)
 {
-	int wcount, blocksize, readcount, errorcount = 0, retval = ERROR_OK;
-	uint32_t adr = address;
-	uint8_t *pBuffer = buffer;
-	uint32_t incr_flag = CSW_ADDRINC_OFF;
-
-	count >>= 2;
-	wcount = count;
-
-	while (wcount > 0) {
-		/* Adjust to read blocks within boundaries aligned to the
-		 * TAR autoincrement size (at least 2^10).  Autoincrement
-		 * mode avoids an extra per-word roundtrip to update TAR.
-		 */
-		blocksize = max_tar_block_size(dap->tar_autoincr_block,
-				address);
-		if (wcount < blocksize)
-			blocksize = wcount;
-
-		/* handle unaligned data at 4k boundary */
-		if (blocksize == 0)
-			blocksize = 1;
-
-		if (addr_incr)
-			incr_flag = CSW_ADDRINC_SINGLE;
-
-		retval = dap_setup_accessport(dap, CSW_32BIT | incr_flag,
-				address);
-		if (retval != ERROR_OK)
-			return retval;
-
-		retval = dap_queue_ap_read_block(dap, AP_REG_DRW, blocksize, buffer);
-
-		retval = dap_run(dap);
-		if (retval != ERROR_OK) {
-			errorcount++;
-			if (errorcount <= 1) {
-				/* try again */
-				continue;
-			}
-			LOG_WARNING("Block read error address 0x%" PRIx32, address);
-			return retval;
-		}
-		wcount = wcount - blocksize;
-		if (addr_incr)
-			address += 4 * blocksize;
-		buffer += 4 * blocksize;
-	}
+	size_t nbytes = size * count;
+	const uint32_t csw_addrincr = addrinc ? CSW_ADDRINC_SINGLE : CSW_ADDRINC_OFF;
+	uint32_t csw_size;
+	uint32_t address = adr;
+	int retval;
 
-	/* if we have an unaligned access - reorder data */
-	if (adr & 0x3u) {
-		for (readcount = 0; readcount < count; readcount++) {
-			int i;
-			uint32_t data;
-			memcpy(&data, pBuffer, sizeof(uint32_t));
-
-			for (i = 0; i < 4; i++) {
-				*((uint8_t *)pBuffer) =
-						(data >> 8 * (adr & 0x3));
-				pBuffer++;
-				adr++;
-			}
-		}
+	if (size == 4)
+		csw_size = CSW_32BIT;
+	else if (size == 2)
+		csw_size = CSW_16BIT;
+	else if (size == 1)
+		csw_size = CSW_8BIT;
+	else
+		return ERROR_TARGET_UNALIGNED_ACCESS;
+
+	/* Allocate buffer to hold the sequence of DRW reads that will be made. This is a significant
+	 * over-allocation if packed transfers are going to be used, but determining the real need at
+	 * this point would be messy. */
+	uint32_t *read_buf = malloc(count * sizeof(uint32_t));
+	uint32_t *read_ptr = read_buf;
+	if (read_buf == NULL) {
+		LOG_ERROR("Failed to allocate read buffer");
+		return ERROR_FAIL;
 	}
 
-	return retval;
-}
-
-static int mem_ap_read_buf_packed_u16(struct adiv5_dap *dap,
-		uint8_t *buffer, int count, uint32_t address)
-{
-	uint32_t invalue;
-	int retval = ERROR_OK;
-	int wcount, blocksize, readcount, i;
-
-	wcount = count >> 1;
-
-	while (wcount > 0) {
-		int nbytes;
+	retval = dap_setup_accessport_tar(dap, address);
+	if (retval != ERROR_OK)
+		return retval;
 
-		/* Adjust to read blocks within boundaries aligned to the TAR autoincremnent size*/
-		blocksize = max_tar_block_size(dap->tar_autoincr_block, address);
-		if (wcount < blocksize)
-			blocksize = wcount;
+	/* Queue up all reads. Each read will store the entire DRW word in the read buffer. How many
+	 * useful bytes it contains, and their location in the word, depends on the type of transfer
+	 * and alignment. */
+	while (nbytes > 0) {
+		uint32_t this_size = size;
+
+		/* Select packed transfer if possible */
+		if (addrinc && dap->packed_transfers && nbytes >= 4
+				&& max_tar_block_size(dap->tar_autoincr_block, address) >= 4) {
+			this_size = 4;
+			retval = dap_setup_accessport_csw(dap, csw_size | CSW_ADDRINC_PACKED);
+		} else {
+			retval = dap_setup_accessport_csw(dap, csw_size | csw_addrincr);
+		}
+		if (retval != ERROR_OK)
+			break;
 
-		retval = dap_setup_accessport(dap, CSW_16BIT | CSW_ADDRINC_PACKED, address);
+		retval = dap_queue_ap_read(dap, AP_REG_DRW, read_ptr++);
 		if (retval != ERROR_OK)
-			return retval;
+			break;
 
-		/* handle unaligned data at 4k boundary */
-		if (blocksize == 0)
-			blocksize = 1;
-		readcount = blocksize;
+		nbytes -= this_size;
+		address += this_size;
 
-		do {
-			retval = dap_queue_ap_read(dap, AP_REG_DRW, &invalue);
+		/* Rewrite TAR if it wrapped */
+		if (addrinc && address % dap->tar_autoincr_block < size && nbytes > 0) {
+			retval = dap_setup_accessport_tar(dap, address);
 			if (retval != ERROR_OK)
-				return retval;
-			retval = dap_run(dap);
-			if (retval != ERROR_OK) {
-				LOG_WARNING("Block read error address 0x%" PRIx32 ", count 0x%x", address, count);
-				return retval;
-			}
-
-			nbytes = MIN((readcount << 1), 4);
-
-			for (i = 0; i < nbytes; i++) {
-				*((uint8_t *)buffer) = (invalue >> 8 * (address & 0x3));
-				buffer++;
-				address++;
-			}
-
-			readcount -= (nbytes >> 1);
-		} while (readcount);
-		wcount -= blocksize;
+				break;
+		}
 	}
 
-	return retval;
-}
-
-/**
- * Synchronously read a block of 16-bit halfwords into a buffer
- * @param dap The DAP connected to the MEM-AP.
- * @param buffer where the halfwords will be stored (in host byte order).
- * @param count How many halfwords to read.
- * @param address Memory address from which to read words; all the
- *	words must be readable by the currently selected MEM-AP.
- */
-int mem_ap_read_buf_u16(struct adiv5_dap *dap, uint8_t *buffer,
-		int count, uint32_t address)
-{
-	uint32_t invalue, i;
-	int retval = ERROR_OK;
-
-	if (count >= 4)
-		return mem_ap_read_buf_packed_u16(dap, buffer, count, address);
-
-	while (count > 0) {
-		retval = dap_setup_accessport(dap, CSW_16BIT | CSW_ADDRINC_SINGLE, address);
-		if (retval != ERROR_OK)
-			return retval;
-		retval = dap_queue_ap_read(dap, AP_REG_DRW, &invalue);
-		if (retval != ERROR_OK)
-			break;
-
+	if (retval == ERROR_OK)
 		retval = dap_run(dap);
-		if (retval != ERROR_OK)
-			break;
 
-		if (address & 0x1) {
-			for (i = 0; i < 2; i++) {
-				*((uint8_t *)buffer) = (invalue >> 8 * (address & 0x3));
-				buffer++;
-				address++;
-			}
+	/* Restore state */
+	address = adr;
+	nbytes = size * count;
+	read_ptr = read_buf;
+
+	/* If something failed, read TAR to find out how much data was successfully read, so we can
+	 * at least give the caller what we have. */
+	if (retval != ERROR_OK) {
+		uint32_t tar;
+		if (dap_queue_ap_read(dap, AP_REG_TAR, &tar) == ERROR_OK
+				&& dap_run(dap) == ERROR_OK) {
+			LOG_ERROR("Failed to read memory at 0x%08"PRIx32, tar);
+			if (nbytes > tar - address)
+				nbytes = tar - address;
 		} else {
-			uint16_t svalue = (invalue >> 8 * (address & 0x3));
-			memcpy(buffer, &svalue, sizeof(uint16_t));
-			address += 2;
-			buffer += 2;
+			LOG_ERROR("Failed to read memory and, additionally, failed to find out where");
+			nbytes = 0;
 		}
-		count -= 2;
 	}
 
-	return retval;
-}
-
-/* FIX!!! is this a potential performance bottleneck w.r.t. requiring too many
- * roundtrips when jtag_execute_queue() has a large overhead(e.g. for USB)s?
- *
- * The solution is to arrange for a large out/in scan in this loop and
- * and convert data afterwards.
- */
-static int mem_ap_read_buf_packed_u8(struct adiv5_dap *dap,
-		uint8_t *buffer, int count, uint32_t address)
-{
-	uint32_t invalue;
-	int retval = ERROR_OK;
-	int wcount, blocksize, readcount, i;
-
-	wcount = count;
-
-	while (wcount > 0) {
-		int nbytes;
-
-		/* Adjust to read blocks within boundaries aligned to the TAR autoincremnent size*/
-		blocksize = max_tar_block_size(dap->tar_autoincr_block, address);
-
-		if (wcount < blocksize)
-			blocksize = wcount;
+	/* Replay loop to populate caller's buffer from the correct word and byte lane */
+	while (nbytes > 0) {
+		uint32_t this_size = size;
 
-		retval = dap_setup_accessport(dap, CSW_8BIT | CSW_ADDRINC_PACKED, address);
-		if (retval != ERROR_OK)
-			return retval;
-		readcount = blocksize;
-
-		do {
-			retval = dap_queue_ap_read(dap, AP_REG_DRW, &invalue);
-			if (retval != ERROR_OK)
-				return retval;
-			retval = dap_run(dap);
-			if (retval != ERROR_OK) {
-				LOG_WARNING("Block read error address 0x%" PRIx32 ", count 0x%x", address, count);
-				return retval;
-			}
-
-			nbytes = MIN(readcount, 4);
-
-			for (i = 0; i < nbytes; i++) {
-				*((uint8_t *)buffer) = (invalue >> 8 * (address & 0x3));
-				buffer++;
-				address++;
-			}
-
-			readcount -= nbytes;
-		} while (readcount);
-		wcount -= blocksize;
-	}
-
-	return retval;
-}
-
-/**
- * Synchronously read a block of bytes into a buffer
- * @param dap The DAP connected to the MEM-AP.
- * @param buffer where the bytes will be stored.
- * @param count How many bytes to read.
- * @param address Memory address from which to read data; all the
- *	data must be readable by the currently selected MEM-AP.
- */
-int mem_ap_read_buf_u8(struct adiv5_dap *dap, uint8_t *buffer,
-		int count, uint32_t address)
-{
-	uint32_t invalue;
-	int retval = ERROR_OK;
-
-	if (count >= 4)
-		return mem_ap_read_buf_packed_u8(dap, buffer, count, address);
+		if (addrinc && dap->packed_transfers && nbytes >= 4
+				&& max_tar_block_size(dap->tar_autoincr_block, address) >= 4) {
+			this_size = 4;
+		}
 
-	while (count > 0) {
-		retval = dap_setup_accessport(dap, CSW_8BIT | CSW_ADDRINC_SINGLE, address);
-		if (retval != ERROR_OK)
-			return retval;
-		retval = dap_queue_ap_read(dap, AP_REG_DRW, &invalue);
-		if (retval != ERROR_OK)
-			return retval;
-		retval = dap_run(dap);
-		if (retval != ERROR_OK)
-			break;
+		switch (this_size) {
+		case 4:
+			*buffer++ = *read_ptr >> 8 * (address++ & 3);
+			*buffer++ = *read_ptr >> 8 * (address++ & 3);
+		case 2:
+			*buffer++ = *read_ptr >> 8 * (address++ & 3);
+		case 1:
+			*buffer++ = *read_ptr >> 8 * (address++ & 3);
+		}
 
-		*((uint8_t *)buffer) = (invalue >> 8 * (address & 0x3));
-		count--;
-		address++;
-		buffer++;
+		read_ptr++;
+		nbytes -= this_size;
 	}
 
+	free(read_buf);
 	return retval;
 }
 
@@ -841,60 +525,32 @@ int mem_ap_sel_write_atomic_u32(struct adiv5_dap *swjdp, uint8_t ap,
 	return mem_ap_write_atomic_u32(swjdp, address, value);
 }
 
-int mem_ap_sel_read_buf_u8(struct adiv5_dap *swjdp, uint8_t ap,
-		uint8_t *buffer, int count, uint32_t address)
+int mem_ap_sel_read_buf(struct adiv5_dap *swjdp, uint8_t ap,
+		uint8_t *buffer, uint32_t size, uint32_t count, uint32_t address)
 {
 	dap_ap_select(swjdp, ap);
-	return mem_ap_read_buf_u8(swjdp, buffer, count, address);
+	return mem_ap_read(swjdp, buffer, size, count, address, true);
 }
 
-int mem_ap_sel_read_buf_u16(struct adiv5_dap *swjdp, uint8_t ap,
-		uint8_t *buffer, int count, uint32_t address)
+int mem_ap_sel_write_buf(struct adiv5_dap *swjdp, uint8_t ap,
+		const uint8_t *buffer, uint32_t size, uint32_t count, uint32_t address)
 {
 	dap_ap_select(swjdp, ap);
-	return mem_ap_read_buf_u16(swjdp, buffer, count, address);
+	return mem_ap_write(swjdp, buffer, size, count, address, true);
 }
 
-int mem_ap_sel_read_buf_u32_noincr(struct adiv5_dap *swjdp, uint8_t ap,
-		uint8_t *buffer, int count, uint32_t address)
+int mem_ap_sel_read_buf_noincr(struct adiv5_dap *swjdp, uint8_t ap,
+		uint8_t *buffer, uint32_t size, uint32_t count, uint32_t address)
 {
 	dap_ap_select(swjdp, ap);
-	return mem_ap_read_buf_u32(swjdp, buffer, count, address, false);
+	return mem_ap_read(swjdp, buffer, size, count, address, false);
 }
 
-int mem_ap_sel_read_buf_u32(struct adiv5_dap *swjdp, uint8_t ap,
-		uint8_t *buffer, int count, uint32_t address)
+int mem_ap_sel_write_buf_noincr(struct adiv5_dap *swjdp, uint8_t ap,
+		const uint8_t *buffer, uint32_t size, uint32_t count, uint32_t address)
 {
 	dap_ap_select(swjdp, ap);
-	return mem_ap_read_buf_u32(swjdp, buffer, count, address, true);
-}
-
-int mem_ap_sel_write_buf_u8(struct adiv5_dap *swjdp, uint8_t ap,
-		const uint8_t *buffer, int count, uint32_t address)
-{
-	dap_ap_select(swjdp, ap);
-	return mem_ap_write_buf_u8(swjdp, buffer, count, address);
-}
-
-int mem_ap_sel_write_buf_u16(struct adiv5_dap *swjdp, uint8_t ap,
-		const uint8_t *buffer, int count, uint32_t address)
-{
-	dap_ap_select(swjdp, ap);
-	return mem_ap_write_buf_u16(swjdp, buffer, count, address);
-}
-
-int mem_ap_sel_write_buf_u32(struct adiv5_dap *swjdp, uint8_t ap,
-		const uint8_t *buffer, int count, uint32_t address)
-{
-	dap_ap_select(swjdp, ap);
-	return mem_ap_write_buf_u32(swjdp, buffer, count, address, true);
-}
-
-int mem_ap_sel_write_buf_u32_noincr(struct adiv5_dap *swjdp, uint8_t ap,
-		const uint8_t *buffer, int count, uint32_t address)
-{
-	dap_ap_select(swjdp, ap);
-	return mem_ap_write_buf_u32(swjdp, buffer, count, address, false);
+	return mem_ap_write(swjdp, buffer, size, count, address, false);
 }
 
 #define MDM_REG_STAT		0x00
@@ -924,6 +580,8 @@ int mem_ap_sel_write_buf_u32_noincr(struct adiv5_dap *swjdp, uint8_t ap,
 #define MEM_CTRL_VLLSX_DBG_ACK	(1<<6)
 #define MEM_CTRL_VLLSX_STAT_ACK	(1<<7)
 
+#define MDM_ACCESS_TIMEOUT	3000 /* ms */
+
 /**
  *
  */
@@ -931,6 +589,7 @@ int dap_syssec_kinetis_mdmap(struct adiv5_dap *dap)
 {
 	uint32_t val;
 	int retval;
+	int timeout = 0;
 	enum reset_types jtag_reset_config = jtag_get_reset_config();
 
 	dap_ap_select(dap, 1);
@@ -942,7 +601,7 @@ int dap_syssec_kinetis_mdmap(struct adiv5_dap *dap)
 	dap_run(dap);
 
 	if (val != 0x001C0000) {
-		LOG_DEBUG("id doesn't match %08X != 0x001C0000", val);
+		LOG_DEBUG("id doesn't match %08" PRIX32 " != 0x001C0000", val);
 		dap_ap_select(dap, 0);
 		return ERROR_FAIL;
 	}
@@ -951,14 +610,23 @@ int dap_syssec_kinetis_mdmap(struct adiv5_dap *dap)
 	 * it's important that the device is out of
 	 * reset here
 	 */
-	retval = dap_queue_ap_read(dap, MDM_REG_STAT, &val);
-	if (retval != ERROR_OK)
-		return retval;
-	dap_run(dap);
+	while (1) {
+		if (timeout++ > MDM_ACCESS_TIMEOUT) {
+			LOG_DEBUG("MDMAP : flash ready timeout");
+			return ERROR_FAIL;
+		}
+		retval = dap_queue_ap_read(dap, MDM_REG_STAT, &val);
+		if (retval != ERROR_OK)
+			return retval;
+		dap_run(dap);
 
-	LOG_DEBUG("MDM_REG_STAT %08X", val);
+		LOG_DEBUG("MDM_REG_STAT %08" PRIX32, val);
+		if (val & MDM_STAT_FREADY)
+			break;
+		alive_sleep(1);
+	}
 
-	if ((val & (MDM_STAT_SYSSEC|MDM_STAT_FREADY)) != (MDM_STAT_FREADY)) {
+	if ((val & MDM_STAT_SYSSEC)) {
 		LOG_DEBUG("MDMAP: system is secured, masserase needed");
 
 		if (!(val & MDM_STAT_FMEEN))
@@ -973,8 +641,12 @@ int dap_syssec_kinetis_mdmap(struct adiv5_dap *dap)
 				dap_ap_select(dap, 0);
 				return ERROR_FAIL;
 			}
-
+			timeout = 0;
 			while (1) {
+				if (timeout++ > MDM_ACCESS_TIMEOUT) {
+					LOG_DEBUG("MDMAP : flash ready timeout");
+					return ERROR_FAIL;
+				}
 				retval = dap_queue_ap_write(dap, MDM_REG_CTRL, MEM_CTRL_FMEIP);
 				if (retval != ERROR_OK)
 					return retval;
@@ -984,13 +656,18 @@ int dap_syssec_kinetis_mdmap(struct adiv5_dap *dap)
 				if (retval != ERROR_OK)
 					return retval;
 				dap_run(dap);
-				LOG_DEBUG("MDM_REG_STAT %08X", val);
+				LOG_DEBUG("MDM_REG_STAT %08" PRIX32, val);
 
 				if ((val & 1))
 					break;
+				alive_sleep(1);
 			}
-
+			timeout = 0;
 			while (1) {
+				if (timeout++ > MDM_ACCESS_TIMEOUT) {
+					LOG_DEBUG("MDMAP : flash ready timeout");
+					return ERROR_FAIL;
+				}
 				retval = dap_queue_ap_write(dap, MDM_REG_CTRL, 0);
 				if (retval != ERROR_OK)
 					return retval;
@@ -1000,16 +677,17 @@ int dap_syssec_kinetis_mdmap(struct adiv5_dap *dap)
 				if (retval != ERROR_OK)
 					return retval;
 				dap_run(dap);
-				LOG_DEBUG("MDM_REG_STAT %08X", val);
+				LOG_DEBUG("MDM_REG_STAT %08" PRIX32, val);
 				/* read control register and wait for ready */
 				retval = dap_queue_ap_read(dap, MDM_REG_CTRL, &val);
 				if (retval != ERROR_OK)
 					return retval;
 				dap_run(dap);
-				LOG_DEBUG("MDM_REG_CTRL %08X", val);
+				LOG_DEBUG("MDM_REG_CTRL %08" PRIX32, val);
 
 				if (val == 0x00)
 					break;
+				alive_sleep(1);
 			}
 		}
 	}
@@ -1045,7 +723,7 @@ int dap_syssec(struct adiv5_dap *dap)
 
 		while (tap != NULL) {
 			if (tap->hasidcode && (dap_syssec_filter_data[i].idcode == tap->idcode)) {
-				LOG_DEBUG("DAP: mdmap_init for idcode: %08x", tap->idcode);
+				LOG_DEBUG("DAP: mdmap_init for idcode: %08" PRIx32, tap->idcode);
 				dap_syssec_filter_data[i].dap_init(dap);
 			}
 			tap = tap->next_tap;
@@ -1164,6 +842,29 @@ int ahbap_debugport_init(struct adiv5_dap *dap)
 
 	dap_syssec(dap);
 
+	/* check that we support packed transfers */
+	uint32_t csw;
+
+	retval = dap_setup_accessport(dap, CSW_8BIT | CSW_ADDRINC_PACKED, 0);
+	if (retval != ERROR_OK)
+		return retval;
+
+	retval = dap_queue_ap_read(dap, AP_REG_CSW, &csw);
+	if (retval != ERROR_OK)
+		return retval;
+
+	retval = dap_run(dap);
+	if (retval != ERROR_OK)
+		return retval;
+
+	if (csw & CSW_ADDRINC_PACKED)
+		dap->packed_transfers = true;
+	else
+		dap->packed_transfers = false;
+
+	LOG_DEBUG("MEM_AP Packed Transfers: %s",
+			dap->packed_transfers ? "enabled" : "disabled");
+
 	return ERROR_OK;
 }
 
@@ -1220,7 +921,7 @@ int dap_find_ap(struct adiv5_dap *dap, enum ap_type type_to_find, uint8_t *ap_nu
 			((id_val & 0x0FFF0000) == 0x04770000) && /* Jedec codes match */
 			((id_val & 0xFF) == type_to_find)) {     /* type matches*/
 
-			LOG_DEBUG("Found %s at AP index: %d (IDR=0x%08X)",
+			LOG_DEBUG("Found %s at AP index: %d (IDR=0x%08" PRIX32 ")",
 						(type_to_find == AP_TYPE_AHB_AP)  ? "AHB-AP"  :
 						(type_to_find == AP_TYPE_APB_AP)  ? "APB-AP"  :
 						(type_to_find == AP_TYPE_JTAG_AP) ? "JTAG-AP" : "Unknown",