X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Fstlink_usb.c;h=dc2fe8c5a8200bcd8a964443b23c47366995bdf3;hp=8e4493ed89560e245fcee61ec504beca77ac0628;hb=324a45e02982b7c8cba641bab69741b944f1e10b;hpb=7da165a11f971768be8a56ea9fc49662e133a3d5

diff --git a/src/jtag/drivers/stlink_usb.c b/src/jtag/drivers/stlink_usb.c
index 8e4493ed89..dc2fe8c5a8 100644
--- a/src/jtag/drivers/stlink_usb.c
+++ b/src/jtag/drivers/stlink_usb.c
@@ -78,7 +78,7 @@
 /*
  * ST-Link/V1, ST-Link/V2 and ST-Link/V2.1 are full-speed USB devices and
  * this limits the bulk packet size and the 8bit read/writes to max 64 bytes.
- * STLINK-V3 is a high speed USB 2.0 and the limit is 512 bytes.
+ * STLINK-V3 is a high speed USB 2.0 and the limit is 512 bytes from FW V3J6.
  */
 #define STLINK_MAX_RW8		(64)
 #define STLINKV3_MAX_RW8	(512)
@@ -317,6 +317,7 @@ enum stlink_mode {
 #define STLINK_F_QUIRK_JTAG_DP_READ     BIT(6)
 #define STLINK_F_HAS_AP_INIT            BIT(7)
 #define STLINK_F_HAS_DPBANKSEL          BIT(8)
+#define STLINK_F_HAS_RW8_512BYTES       BIT(9)
 
 /* aliases */
 #define STLINK_F_HAS_TARGET_VOLT        STLINK_F_HAS_TRACE
@@ -367,7 +368,7 @@ static unsigned int stlink_usb_block(void *handle)
 
 	assert(handle != NULL);
 
-	if (h->version.stlink == 3)
+	if (h->version.flags & STLINK_F_HAS_RW8_512BYTES)
 		return STLINKV3_MAX_RW8;
 	else
 		return STLINK_MAX_RW8;
@@ -1060,6 +1061,10 @@ static int stlink_usb_version(void *handle)
 		if (h->version.jtag >= 2)
 			flags |= STLINK_F_HAS_DPBANKSEL;
 
+		/* 8bit read/write max packet size 512 bytes from V3J6 */
+		if (h->version.jtag >= 6)
+			flags |= STLINK_F_HAS_RW8_512BYTES;
+
 		break;
 	default:
 		break;