Fix for large writes and data corruption over 64k

diff --git a/CHANGELOG b/CHANGELOG
index ef65698aad560ad38c993408f424fd35733ce558..3e76dc95fd463f9914c4ff36a05fb74d9ed7c46b 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+20200130               6.2.15
+       - Fix issue writing more than 512kb of data in one write command
+       (bug introduced 6.2.7)
+       - Fix possible data corruption bug when reading or writing more than
+       64kb per command (fixed in most cases by 6.2.14)
+
 20200101               6.2.14
        - Fix for invalid CDROM READ TOC responses (Thanks Simon Gander)
        - Fix for data corruption for hosts that transfer more than 64k per

diff --git a/rtl/fpga_bitmap.o b/rtl/fpga_bitmap.o
index e423f33392b4c62d3c09cd4ee966950fe67cd5d9..e351fea819d27606e2891c06738a8318bda2b372 100644 (file)
Binary files a/rtl/fpga_bitmap.o and b/rtl/fpga_bitmap.o differ

diff --git a/src/firmware/config.c b/src/firmware/config.c
index f2e6d1e7ff6ba63e66bafdc7317ac660e838ea77..929921a9c3db853a7792778c0c4225aba35484b2 100755 (executable)
--- a/src/firmware/config.c
+++ b/src/firmware/config.c
@@ -37,7 +37,7 @@
 \r
 #include <string.h>\r
 \r
-static const uint16_t FIRMWARE_VERSION = 0x062E;\r
+static const uint16_t FIRMWARE_VERSION = 0x062F;\r
 \r
 // Optional static config\r
 extern uint8_t* __fixed_config;\r

diff --git a/src/firmware/disk.c b/src/firmware/disk.c
index 3c562e30ee5c7f58a31a2d241918a5cf31395b37..f79842f0469cbb7a39b9e6620296729db8e91d68 100755 (executable)
--- a/src/firmware/disk.c
+++ b/src/firmware/disk.c
@@ -736,8 +736,17 @@ void scsiDiskPoll()
                static_assert(SCSI_XFER_MAX >= sizeof(scsiDev.data), "Assumes SCSI_XFER_MAX >= sizeof(scsiDev.data)");\r
 \r
                // Start reading and filling fifos as soon as possible.\r
-               DWT->CYCCNT = 0; // Start counting cycles\r
-               scsiSetDataCount(transfer.blocks * bytesPerSector);\r
+               // It's highly unlikely that someone is going to use huge transfers\r
+               // per scsi command, but if they do it'll be slower than usual.\r
+               // Note: Happens in Macintosh FWB HDD Toolkit benchmarks which default\r
+               // to 768kb\r
+               uint32_t totalTransferBytes = transfer.blocks * bytesPerSector;\r
+               int useSlowDataCount = totalTransferBytes >= SCSI_XFER_MAX;\r
+               if (!useSlowDataCount)\r
+               {\r
+                       DWT->CYCCNT = 0; // Start counting cycles\r
+                       scsiSetDataCount(totalTransferBytes);\r
+               }\r
 \r
                while ((i < totalSDSectors) &&\r
                        likely(scsiDev.phase == DATA_OUT) &&\r
@@ -762,6 +771,12 @@ void scsiDiskPoll()
                                        sdSpeedKBs,\r
                                        scsiDev.hostSpeedKBs);\r
 \r
+                               if (useSlowDataCount)\r
+                               {\r
+                                       DWT->CYCCNT = 0; // Start counting cycles\r
+                                       scsiSetDataCount(totalBytes);\r
+                               }\r
+\r
                                uint32_t scsiBytesRead = 0;\r
                                if (readAheadBytes > 0)\r
                                {\r
@@ -771,7 +786,7 @@ void scsiDiskPoll()
                                                &parityError);\r
                                        scsiBytesRead += readAheadBytes;\r
 \r
-                                       if (i == 0)\r
+                                       if (i == 0 && !useSlowDataCount)\r
                                        {\r
                                                uint32_t elapsedCycles = DWT->CYCCNT;\r
 \r
@@ -864,6 +879,12 @@ void scsiDiskPoll()
                                // do this in a half-duplex fashion. We need to write as much as\r
                                // possible in each SD card transaction.\r
                                // use sg_dd from sg_utils3 tools to test.\r
+\r
+                               if (useSlowDataCount)\r
+                               {\r
+                                       scsiSetDataCount(sectors * bytesPerSector);\r
+                               }\r
+\r
                                for (int scsiSector = i; scsiSector < i + sectors; ++scsiSector)\r
                                {\r
                                        int dmaBytes = SD_SECTOR_SIZE;\r