Synchronous support 5MB/s and 10MB/s working.

Also fixes bug in FPGA interface that caused issues writing large files.

diff --git a/CHANGELOG b/CHANGELOG
index 3bbc3afcc93c750d9e5bdad89d89d4690887ae21..f16e0648dd873edfd16cb6df015d7f40ca5675e3 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
 2016XXXX               6.0.7
+       - Synchronous transfers supported ! 5MB/s and 10MB/s supported.
        - Fix for accessing data via USB with more than 2 devices configured.
 
 20160815               6.0.6

diff --git a/Makefile b/Makefile
index 61c822633ef0d85ce55a8284eaae0c7189dca9bb..0839fcdfaf68ebd068c0445cf2e0bd298dbdc10f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,9 @@ CPPFLAGS=-DSTM32F205xx -DUSE_HAL_DRIVER -Wall -Werror
 CFLAGS=-mcpu=cortex-m3 -mthumb -mslow-flash-data \
        -std=gnu11 \
        -specs=nosys.specs \
-       -Os -g \
+       -g \
 
+#      -Os -g \
 
 LDFLAGS= \
        "-Tsrc/firmware/link.ld" \

diff --git a/rtl/fpga_bitmap.o b/rtl/fpga_bitmap.o
index 53348881e32cbbb16ff37342273e982052852b30..56551b363f91bcb0323785fb79e5b6eab51ae5ad 100644 (file)
Binary files a/rtl/fpga_bitmap.o and b/rtl/fpga_bitmap.o differ

diff --git a/src/firmware/bsp.h b/src/firmware/bsp.h
index 5b9c8d146d5efc68148c4fece8a357243ccab21b..fd1a7108f1747525d462fc00368823f29aebb99a 100644 (file)
--- a/src/firmware/bsp.h
+++ b/src/firmware/bsp.h
@@ -20,7 +20,7 @@
 
 // For the STM32F205, DMA bursts may not cross 1KB address boundaries.
 // The maximum burst is 16 bytes.
-#define S2S_DMA_ALIGN __attribute__((aligned(16)))
+#define S2S_DMA_ALIGN __attribute__((aligned(1024)))
 
 
 #endif

diff --git a/src/firmware/config.c b/src/firmware/config.c
index eb6b3694c66e7fae019b09473988095ffe8d5a7f..897726325ef6aa8c7f99a70075773d48d2935590 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 = 0x0606;\r
+static const uint16_t FIRMWARE_VERSION = 0x0607;\r
 \r
 // 1 flash row\r
 static const uint8_t DEFAULT_CONFIG[128] =\r

diff --git a/src/firmware/diagnostic.c b/src/firmware/diagnostic.c
index 0f92406223efd68783f3aa6765e49bf5676cf71b..faddace105fe5e357b5d53e2fde9868d1d8536a8 100755 (executable)
--- a/src/firmware/diagnostic.c
+++ b/src/firmware/diagnostic.c
@@ -165,6 +165,26 @@ void scsiReadBuffer()
                        (allocLength > MAX_SECTOR_SIZE) ? MAX_SECTOR_SIZE : allocLength;\r
                scsiDev.phase = DATA_IN;\r
        }\r
+       else if (mode == 0x2 && (scsiDev.cdb[2] == 0))\r
+       {\r
+               // TODO support BUFFER OFFSET fields in CDB\r
+               scsiDev.dataLen =\r
+                       (allocLength > MAX_SECTOR_SIZE) ? MAX_SECTOR_SIZE : allocLength;\r
+               scsiDev.phase = DATA_IN;\r
+       }\r
+       else if (mode == 0x3)\r
+       {\r
+               uint32_t maxSize = MAX_SECTOR_SIZE - 4;\r
+               // 4 byte header\r
+               scsiDev.data[0] = 0;\r
+               scsiDev.data[1] = (maxSize >> 16) & 0xff;\r
+               scsiDev.data[2] = (maxSize >> 8) & 0xff;\r
+               scsiDev.data[3] = maxSize & 0xff;\r
+\r
+               scsiDev.dataLen =\r
+                       (allocLength > 4) ? 4: allocLength;\r
+               scsiDev.phase = DATA_IN;\r
+       }\r
        else\r
        {\r
                // error.\r
@@ -198,7 +218,7 @@ void scsiWriteBuffer()
                (((uint32_t) scsiDev.cdb[7]) << 8) +\r
                scsiDev.cdb[8];\r
 \r
-       if (mode == 0 && allocLength <= sizeof(scsiDev.data))\r
+       if ((mode == 0 || mode == 2) && allocLength <= sizeof(scsiDev.data))\r
        {\r
                scsiDev.dataLen = allocLength;\r
                scsiDev.phase = DATA_OUT;\r

diff --git a/src/firmware/inquiry.c b/src/firmware/inquiry.c
index 549ee4f4732d730d404db266ac32531ae1b425c4..d51b3c0db198e7b0636ce223e1669cc5c14c18df 100755 (executable)
--- a/src/firmware/inquiry.c
+++ b/src/firmware/inquiry.c
@@ -29,7 +29,7 @@ static uint8_t StandardResponse[] =
 0x01, // Response format is compatible with the old CCS format.\r
 0x1f, // standard length.\r
 0, 0, // Reserved\r
-0x08 // Enable linked commands\r
+0x18 // Enable sync and linked commands\r
 };\r
 // Vendor set by config 'c','o','d','e','s','r','c',' ',\r
 // prodId set by config'S','C','S','I','2','S','D',' ',' ',' ',' ',' ',' ',' ',' ',' ',\r

diff --git a/src/firmware/scsi.c b/src/firmware/scsi.c
index bbb3e4843a5572f0e522f936d9f79348e7b8afe0..e43afd2497fe9e2ace67cfd2c771bea9b0c3efff 100755 (executable)
--- a/src/firmware/scsi.c
+++ b/src/firmware/scsi.c
@@ -480,6 +480,13 @@ static void scsiReset()
                scsiDev.target->sense.asc = NO_ADDITIONAL_SENSE_INFORMATION;\r
        }\r
        scsiDev.target = NULL;\r
+\r
+       for (int i = 0; i < S2S_MAX_TARGETS; ++i)\r
+       {\r
+               scsiDev.target[i].syncOffset = 0;\r
+               scsiDev.target[i].syncPeriod = 0;\r
+       }\r
+\r
        scsiDiskReset();\r
 \r
        scsiDev.postDataOutHook = NULL;\r
@@ -516,6 +523,8 @@ static void enter_SelectionPhase()
        transfer.currentBlock = 0;\r
 \r
        scsiDev.postDataOutHook = NULL;\r
+\r
+       scsiDev.needSyncNegotiationAck = 0;\r
 }\r
 \r
 static void process_SelectionPhase()\r
@@ -655,6 +664,11 @@ static void process_MessageOut()
                // ANY initiator can reset the reservation state via this message.\r
                scsiDev.target->reservedId = -1;\r
                scsiDev.target->reserverId = -1;\r
+\r
+               // Cancel any sync negotiation\r
+               scsiDev.target->syncOffset = 0;\r
+               scsiDev.target->syncPeriod = 0;\r
+\r
                enter_BusFree();\r
        }\r
        else if (scsiDev.msgOut == 0x05)\r
@@ -677,7 +691,13 @@ static void process_MessageOut()
        {\r
                // Message Reject\r
                // Oh well.\r
-               scsiDev.resetFlag = 1;\r
+\r
+               if (scsiDev.needSyncNegotiationAck)\r
+               {\r
+                       scsiDev.target->syncOffset = 0;\r
+                       scsiDev.target->syncPeriod = 0;\r
+                       scsiDev.needSyncNegotiationAck = 0;\r
+               }\r
        }\r
        else if (scsiDev.msgOut == 0x08)\r
        {\r
@@ -737,10 +757,27 @@ static void process_MessageOut()
                }\r
                else if (extmsg[0] == 1 && msgLen == 3) // Synchronous data request\r
                {\r
-                       // Negotiate back to async\r
+                       int transferPeriod = extmsg[3];\r
+                       int offset = extmsg[4];\r
+\r
+                       if (transferPeriod > 50) // 200ns, 5MB/s\r
+                       {\r
+                               scsiDev.target->syncOffset = 0;\r
+                               scsiDev.target->syncPeriod = 0;\r
+                       } else {\r
+                               scsiDev.target->syncOffset = offset < 15 ? offset : 15;\r
+                               if (transferPeriod <= 25)\r
+                               {\r
+                                       scsiDev.target->syncPeriod = 25; // 10MB/s\r
+                               } else {\r
+                                       scsiDev.target->syncPeriod = 50; // 5MB/s\r
+                               }\r
+                       }\r
+\r
                        scsiEnterPhase(MESSAGE_IN);\r
-                       static const uint8_t SDTR[] = {0x01, 0x03, 0x01, 0x00, 0x00};\r
+                       uint8_t SDTR[] = {0x01, 0x03, 0x01, scsiDev.target->syncPeriod, scsiDev.target->syncOffset};\r
                        scsiWrite(SDTR, sizeof(SDTR));\r
+                       scsiDev.needSyncNegotiationAck = 1; // Check if this message is rejected.\r
                }\r
                else\r
                {\r
@@ -755,6 +792,12 @@ static void process_MessageOut()
 \r
        // Re-check the ATN flag in case it stays asserted.\r
        scsiDev.atnFlag |= scsiStatusATN();\r
+\r
+       if (!scsiDev.atnFlag)\r
+       {\r
+               // Message wasn't rejected!\r
+               scsiDev.needSyncNegotiationAck = 0;\r
+       }\r
 }\r
 \r
 void scsiPoll(void)\r
@@ -918,6 +961,9 @@ void scsiInit()
                }\r
                scsiDev.targets[i].sense.code = NO_SENSE;\r
                scsiDev.targets[i].sense.asc = NO_ADDITIONAL_SENSE_INFORMATION;\r
+\r
+               scsiDev.targets[i].syncOffset = 0;\r
+               scsiDev.targets[i].syncPeriod = 0;\r
        }\r
        firstInit = 0;\r
 }\r

diff --git a/src/firmware/scsi.h b/src/firmware/scsi.h
index 2e3a5fa8cab88c29513e16fd68cfcd6f9d9de63b..2ef223ec62a499f9efb96356d05ad66bf4c034bd 100755 (executable)
--- a/src/firmware/scsi.h
+++ b/src/firmware/scsi.h
@@ -93,6 +93,9 @@ typedef struct
        // A 3rd party may be sending the RESERVE/RELEASE commands
        int reservedId; // 0 -> 7 if reserved. -1 if not reserved.
        int reserverId; // 0 -> 7 if reserved. -1 if not reserved.
+
+       uint8_t syncOffset;
+       uint8_t syncPeriod;
 } TargetState;
 
 typedef struct
@@ -148,6 +151,8 @@ typedef struct
        uint8_t lastStatus;
        uint8_t lastSense;
        uint16_t lastSenseASC;
+
+       int needSyncNegotiationAck;
 } ScsiDevice;
 
 extern ScsiDevice scsiDev;

diff --git a/src/firmware/scsiPhy.c b/src/firmware/scsiPhy.c
index 2231089d8bdefb3ef317851a0eda745c6e5b76b3..71640f4ff74b47e30f36df43bf735dc7b185e452 100755 (executable)
--- a/src/firmware/scsiPhy.c
+++ b/src/firmware/scsiPhy.c
@@ -28,6 +28,17 @@
 \r
 #include <string.h>\r
 \r
+// Assumes a 60MHz fpga clock.\r
+// 7:6 Hold count, 45ns\r
+// 5:3 Assertion count, 90ns\r
+// 2:0 Deskew count, 55ns\r
+#define SCSI_DEFAULT_TIMING ((0x3 << 6) | (0x6 << 3) | 0x4)\r
+\r
+// 7:6 Hold count, 10ns\r
+// 5:3 Assertion count, 30ns\r
+// 2:0 Deskew count, 25ns\r
+#define SCSI_FAST_TIMING ((0x1 << 6) | (0x2 << 3) | 0x2)\r
+\r
 // Private DMA variables.\r
 static int dmaInProgress = 0;\r
 \r
@@ -218,17 +229,21 @@ scsiRead(uint8_t* data, uint32_t count)
                        };\r
                }\r
 \r
-#if FIFODEBUG\r
-               if (!scsiPhyFifoEmpty()) {\r
+\r
+               i += chunk;\r
+               chunk = nextChunk;\r
+       }\r
+#if 1\r
+               if (!scsiPhyFifoEmpty() || !scsiPhyFifoAltEmpty()) {\r
                        int j = 0;\r
                        while (!scsiPhyFifoEmpty()) { scsiPhyRx(); ++j; }\r
+                       scsiPhyFifoFlip();\r
+                       int k = 0;\r
+                       while (!scsiPhyFifoEmpty()) { scsiPhyRx(); ++k; }\r
                        // Force a lock-up.\r
                        assertFail();\r
                }\r
 #endif\r
-               i += chunk;\r
-               chunk = nextChunk;\r
-       }\r
 }\r
 \r
 void\r
@@ -382,12 +397,29 @@ void scsiEnterPhase(int phase)
        int newPhase = phase > 0 ? phase : 0;\r
        int oldPhase = *SCSI_CTRL_PHASE;\r
 \r
-       if (!scsiPhyFifoEmpty() || !scsiPhyFifoAltEmpty()) {\r
+       if (!scsiDev.resetFlag && (!scsiPhyFifoEmpty() || !scsiPhyFifoAltEmpty())) {\r
                // Force a lock-up.\r
                assertFail();\r
        }\r
        if (newPhase != oldPhase)\r
        {\r
+               if ((newPhase == DATA_IN || newPhase == DATA_OUT) &&\r
+                       scsiDev.target->syncOffset)\r
+               {\r
+                       if (scsiDev.target->syncPeriod == 25)\r
+                       {\r
+                               // SCSI2 FAST Timing. 10MB/s.\r
+                               *SCSI_CTRL_TIMING = SCSI_FAST_TIMING;\r
+                       } else {\r
+                               // 5MB/s Timing\r
+                               *SCSI_CTRL_TIMING = SCSI_DEFAULT_TIMING;\r
+                       }\r
+                       *SCSI_CTRL_SYNC_OFFSET = scsiDev.target->syncOffset;\r
+               } else {\r
+                       *SCSI_CTRL_SYNC_OFFSET = 0;\r
+                       *SCSI_CTRL_TIMING = SCSI_DEFAULT_TIMING;\r
+               }\r
+\r
                *SCSI_CTRL_PHASE = newPhase;\r
                busSettleDelay();\r
 \r
@@ -446,6 +478,9 @@ void scsiPhyReset()
        *SCSI_FIFO_SEL = 0;\r
        *SCSI_CTRL_DBX = 0;\r
 \r
+       *SCSI_CTRL_SYNC_OFFSET = 0;\r
+       *SCSI_CTRL_TIMING = SCSI_DEFAULT_TIMING;\r
+\r
        // DMA Benchmark code\r
        // Currently 10MB/s. Assume 20MB/s is achievable with 16 bits.\r
        #ifdef DMA_BENCHMARK\r
@@ -609,6 +644,9 @@ void scsiPhyInit()
        *SCSI_FIFO_SEL = 0;\r
        *SCSI_CTRL_DBX = 0;\r
 \r
+       *SCSI_CTRL_SYNC_OFFSET = 0;\r
+       *SCSI_CTRL_TIMING = SCSI_DEFAULT_TIMING;\r
+\r
 }\r
 \r
 void scsiPhyConfig()\r

diff --git a/src/firmware/scsiPhy.h b/src/firmware/scsiPhy.h
index fcdf3e45486e8ed2cd1bf9528a8c5988ed650e5d..b70ff7bc25247227a606c6948d6e6f53409c1aff 100755 (executable)
--- a/src/firmware/scsiPhy.h
+++ b/src/firmware/scsiPhy.h
@@ -25,6 +25,8 @@
 #define SCSI_DATA_CNT_LO ((volatile uint8_t*)0x60000005)
 #define SCSI_DATA_CNT_SET ((volatile uint8_t*)0x60000006)
 #define SCSI_CTRL_DBX ((volatile uint8_t*)0x60000007)
+#define SCSI_CTRL_SYNC_OFFSET ((volatile uint8_t*)0x60000008)
+#define SCSI_CTRL_TIMING ((volatile uint8_t*)0x60000009)
 
 #define SCSI_STS_FIFO ((volatile uint8_t*)0x60000010)
 #define SCSI_STS_ALTFIFO ((volatile uint8_t*)0x60000011)