Use FIFO mode in SPI flash DMA for better performance.

EdgeTX · Jan 13, 2024 · 1e97478 · 1e97478
1 parent d54cb74
commit 1e97478
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/radio/src/targets/common/arm/stm32/diskio_spi.cpp b/radio/src/targets/common/arm/stm32/diskio_spi.cpp
@@ -46,6 +46,9 @@ static const stm32_spi_t _sd_spi_hw = {
     .txDMA_Stream = SD_SPI_DMA_TX_STREAM,
     .rxDMA_Stream = SD_SPI_DMA_RX_STREAM,
     .DMA_FIFOMode = LL_DMA_FIFOMODE_ENABLE,
+    .DMA_FIFOThreshold = LL_DMA_FIFOTHRESHOLD_FULL,
+    .DMA_MemoryOrM2MDstDataSize = LL_DMA_MDATAALIGN_BYTE,
+    .DMA_MemBurst = LL_DMA_MBURST_SINGLE,
 };
 
 static uint32_t _sdcard_sectors;

diff --git a/radio/src/targets/common/arm/stm32/spi_flash.cpp b/radio/src/targets/common/arm/stm32/spi_flash.cpp
@@ -78,7 +78,10 @@ const stm32_spi_t _flash_spi = {
   .DMA_Channel = FLASH_SPI_DMA_CHANNEL,
   .txDMA_Stream = FLASH_SPI_DMA_TX_STREAM,
   .rxDMA_Stream = FLASH_SPI_DMA_RX_STREAM,
-  .DMA_FIFOMode = LL_DMA_FIFOMODE_DISABLE,
+  .DMA_FIFOMode = LL_DMA_FIFOMODE_ENABLE,
+  .DMA_FIFOThreshold = LL_DMA_FIFOTHRESHOLD_1_2,
+  .DMA_MemoryOrM2MDstDataSize = LL_DMA_MDATAALIGN_HALFWORD,
+  .DMA_MemBurst = LL_DMA_MBURST_INC4,
 };
 
 static SpiFlashDescriptor _flashDescriptor;

diff --git a/radio/src/targets/common/arm/stm32/stm32_spi.cpp b/radio/src/targets/common/arm/stm32/stm32_spi.cpp
@@ -152,7 +152,9 @@ static void _config_dma_streams(const stm32_spi_t* spi)
   dmaInit.MemoryOrM2MDstIncMode = LL_DMA_MEMORY_INCREMENT;
   dmaInit.Priority = LL_DMA_PRIORITY_VERYHIGH;
   dmaInit.FIFOMode = spi->DMA_FIFOMode;
-  dmaInit.FIFOThreshold = LL_DMA_FIFOTHRESHOLD_FULL;
+  dmaInit.FIFOThreshold = spi->DMA_FIFOThreshold;
+  dmaInit.MemoryOrM2MDstDataSize = spi->DMA_MemoryOrM2MDstDataSize;
+  dmaInit.MemBurst = spi->DMA_MemBurst;
 
   dmaInit.Direction = LL_DMA_DIRECTION_PERIPH_TO_MEMORY;
   LL_DMA_Init(spi->DMA, spi->rxDMA_Stream, &dmaInit);

diff --git a/radio/src/targets/common/arm/stm32/stm32_spi.h b/radio/src/targets/common/arm/stm32/stm32_spi.h
@@ -37,6 +37,9 @@ struct stm32_spi_t {
   uint32_t       txDMA_Stream;
   uint32_t       rxDMA_Stream;
   uint32_t       DMA_FIFOMode;
+  uint32_t       DMA_FIFOThreshold;
+  uint32_t       DMA_MemoryOrM2MDstDataSize;
+  uint32_t       DMA_MemBurst;         
 };
 
 void stm32_spi_enable_clock(SPI_TypeDef *SPIx);