Fix some cache-related issues with the SAMA5 DMA driver

3 files changed, 39 insertions, 2 deletions

diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index f503656f5..599fedf71 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -5325,4 +5325,9 @@
 	  as well (2013-8-6).
 	* arch/arm/src/sama5/sam_dmac.c and sam34/sam34_dmac.c: Correct
 	  some parameters reversed in function call (2013-8-6).
+	* arch/arm/src/sama5/sam_spi.c:  The SAMA5 SPI driver now supports
+	  DMA transfers (2013-8-9).
+	* arch/arm/src/sama5/sam_dmac.c:  Finally after many bugfixes (the
+	  last being caching issues), the SAMA5 DMA support has been
+	  verified (with SPI) (2013-8-9).
 
diff --git a/nuttx/arch/arm/src/sama5/sam_dmac.c b/nuttx/arch/arm/src/sama5/sam_dmac.c
index 5aa14d188..84e1fb8d0 100644
--- a/nuttx/arch/arm/src/sama5/sam_dmac.c
+++ b/nuttx/arch/arm/src/sama5/sam_dmac.c
@@ -128,11 +128,14 @@ struct sam_dmach_s
 #endif
   uint8_t chan;                   /* DMA channel number (0-6) */
   bool inuse;                     /* TRUE: The DMA channel is in use */
+  bool rx;                        /* TRUE: Peripheral to memory transfer */
   uint32_t flags;                 /* DMA channel flags */
   uint32_t base;                  /* DMA register channel base address */
   uint32_t cfg;                   /* Pre-calculated CFG register for transfer */
   dma_callback_t callback;        /* Callback invoked when the DMA completes */
   void *arg;                      /* Argument passed to callback function */
+  uint32_t rxaddr;                /* RX memory address */
+  size_t rxsize;                  /* Size of RX memory region */
   struct dma_linklist_s *llhead;  /* DMA link list head */
   struct dma_linklist_s *lltail;  /* DMA link list head */
 };
@@ -1431,6 +1434,13 @@ sam_allocdesc(struct sam_dmach_s *dmach, struct dma_linklist_s *prev,
 
               desc->ctrlb  |= DMAC_CH_CTRLB_BOTHDSCR;
               dmach->lltail = desc;
+
+              /* Assume that we will be doing multple buffer transfers and that
+               * that hardware will be accessing the descriptor via DMA.
+               */
+
+              cp15_coherent_dcache((uintptr_t)desc,
+                                   (uintptr_t)desc + sizeof(struct dma_linklist_s));
               break;
             }
         }
@@ -1528,7 +1538,6 @@ static int sam_txbuffer(struct sam_dmach_s *dmach, uint32_t paddr,
    */
 
   dmach->cfg = sam_txcfg(dmach);
-
   return OK;
 }
 
@@ -1737,6 +1746,15 @@ static void sam_dmaterminate(struct sam_dmach_s *dmach, int result)
 
   sam_freelinklist(dmach);
 
+  /* If this was an RX DMA (peripheral-to-memory), then invalidate the cache
+   * to force reloads from memory.
+   */
+
+  if (dmach->rx)
+    {
+      cp15_invalidate_dcache(dmach->rxaddr, dmach->rxaddr + dmach->rxsize);
+    }
+
   /* Perform the DMA complete callback */
 
   if (dmach->callback)
@@ -2158,6 +2176,12 @@ int sam_dmatxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr,
       ret = sam_txbuffer(dmach, paddr, maddr, remaining);
     }
 
+  /* Save an indication so that the DMA interrupt completion logic will know
+   * that this was not an RX transfer.
+   */
+
+  dmach->rx = false;
+
   /* Clean caches associated with the DMA memory */
 
   cp15_coherent_dcache(maddr, maddr + nbytes);
@@ -2231,6 +2255,14 @@ int sam_dmarxsetup(DMA_HANDLE handle, uint32_t paddr, uint32_t maddr,
       ret = sam_rxbuffer(dmach, paddr, maddr, remaining);
     }
 
+  /* Save an indication so that the DMA interrupt completion logic will know
+   * that this was an RX transfer and will invalidate the cache.
+   */
+
+  dmach->rx     = true;
+  dmach->rxaddr = maddr;
+  dmach->rxsize = (dmach->flags & DMACH_FLAG_MEMINCREMENT) != 0 ? nbytes : sizeof(uint32_t);
+
   /* Clean caches associated with the DMA memory */
 
   cp15_coherent_dcache(maddr, maddr + nbytes);
diff --git a/nuttx/fs/fat/fs_fat32util.c b/nuttx/fs/fat/fs_fat32util.c
index d2c74fe14..cfacc643e 100644
--- a/nuttx/fs/fat/fs_fat32util.c
+++ b/nuttx/fs/fat/fs_fat32util.c
@@ -149,7 +149,7 @@ static int fat_checkbootrecord(struct fat_mountpt_s *fs)
   /* Verify the FAT32 file system type. The determination of the file
    * system type is based on the number of clusters on the volume:  FAT12
    * volume has <= FAT_MAXCLUST12 (4084) clusters, a FAT16 volume has <=
-   * FAT_MINCLUST16 (microsfoft says < 65,525) clusters, and any larger
+   * FAT_MINCLUST16 (Microsoft says < 65,525) clusters, and any larger
    * is FAT32.
    *
    * Get the number of 32-bit directory entries in root directory (zero