Changeset 590 for trunk/softs

Timestamp:

Dec 5, 2013, 4:40:04 PM (11 years ago)

Author:

bouyer

Message:

Use the SPI controller's DMA if the defs_platform.h defines
IOC_USE_DMA.

Location:

trunk/softs/tsar_boot

Files:

• include/spi.h (modified) (3 diffs)
• src/spi.c (modified) (2 diffs)

trunk/softs/tsar_boot/include/spi.h

@@ -36 +36 @@
      */
     unsigned int ss;
+    unsigned int dma_base;
+    unsigned int dma_baseh;
+    unsigned int dma_count;
 };
 
@@ -130 +133 @@
 #define SPI_CTRL_RXN_EN        ( 1 << 9  ) /**< MISO is latched on neg edge   */
 #define SPI_CTRL_GO_BSY        ( 1 << 8  ) /**< Start the transfer            */
+#define SPI_CTRL_DMA_BSY        (1 << 16)  /***   DMA in progress             */
 #define SPI_CTRL_CHAR_LEN_MASK (  0xFF   ) /**< Bits transmited in 1 transfer */
 #define SPI_RXTX_MASK          (  0xFF   ) /**< Mask for the an RX/TX value   */
+
+#define SPI_DMA_COUNT_READ      (1 << 0) /* operation is a read (else write) */
 
 /** 
@@ -140 +146 @@
  * \brief  Check the GO_BUSY bit of the SPI Controller
  */
-#define SPI_IS_BUSY(x)         ((ioread32(&x->ctrl) & SPI_CTRL_GO_BSY) != 0) ? 1 : 0
+#define SPI_IS_BUSY(x)         ((ioread32(&x->ctrl) & (SPI_CTRL_GO_BSY|SPI_CTRL_DMA_BSY)) != 0) ? 1 : 0
 
 #endif

trunk/softs/tsar_boot/src/spi.c

@@ -5 +5 @@
  */
 #include <spi.h>
+#include <reset_ioc.h>
+#include <reset_utils.h>
 
 /**
@@ -93 +95 @@
     _spi_wait_if_busy(spi);
 
-    /* switch to 128 bits words */
     spi_ctrl0 = ioread32(&spi->ctrl);
-    spi_ctrl = (spi_ctrl0 & ~SPI_CTRL_CHAR_LEN_MASK) | 128;
-    iowrite32(&spi->ctrl, spi_ctrl);
+    if (count == 512 && ((int)buf & 0x3f) == 0) {
+        /* use DMA */
+        spi->dma_base = (int)buf;
+        spi->dma_baseh = 0;
+        spi->dma_count = count | SPI_DMA_COUNT_READ;
+        _spi_wait_if_busy(spi);
+        i = count / 4;
+    } else {
+        /* switch to 128 bits words */
+        spi_ctrl = (spi_ctrl0 & ~SPI_CTRL_CHAR_LEN_MASK) | 128;
+        iowrite32(&spi->ctrl, spi_ctrl);
 
-    /* read data */
-    for (i = 0; i + 3 < count / 4; i += 4) {
-        iowrite32(&spi->rx_tx[0], 0xffffffff);
-        iowrite32(&spi->rx_tx[1], 0xffffffff);
-        iowrite32(&spi->rx_tx[2], 0xffffffff);
-        iowrite32(&spi->rx_tx[3], 0xffffffff);
-        iowrite32(&spi->ctrl,  spi_ctrl | SPI_CTRL_GO_BSY);
+        /* read data */
+        for (i = 0; i + 3 < count / 4; i += 4) {
+            iowrite32(&spi->rx_tx[0], 0xffffffff);
+            iowrite32(&spi->rx_tx[1], 0xffffffff);
+            iowrite32(&spi->rx_tx[2], 0xffffffff);
+            iowrite32(&spi->rx_tx[3], 0xffffffff);
+            iowrite32(&spi->ctrl,  spi_ctrl | SPI_CTRL_GO_BSY);
 
-        _spi_wait_if_busy(spi);
+            _spi_wait_if_busy(spi);
         
-        *data = bswap32(ioread32(&spi->rx_tx[3]));
-        data++;
-        *data = bswap32(ioread32(&spi->rx_tx[2]));
-        data++;
-        *data = bswap32(ioread32(&spi->rx_tx[1]));
-        data++;
-        *data = bswap32(ioread32(&spi->rx_tx[0]));
-        data++;
+            *data = bswap32(ioread32(&spi->rx_tx[3]));
+            data++;
+            *data = bswap32(ioread32(&spi->rx_tx[2]));
+            data++;
+            *data = bswap32(ioread32(&spi->rx_tx[1]));
+            data++;
+            *data = bswap32(ioread32(&spi->rx_tx[0]));
+            data++;
+        }
     }