Accelerate QSPI read/write operations by DMA

wdx04 · wdx04 · commit 44a1de26c094 · 2025-04-27T15:38:31.000+08:00
Support all STM32 Families with QSPI/OSPI HAL API
diff --git a/targets/TARGET_STM/TARGET_STM32F4/objects.h b/targets/TARGET_STM/TARGET_STM32F4/objects.h
@@ -28,6 +28,8 @@
 #include "stm32f4xx_ll_rtc.h"
 #include "stm32f4xx_ll_rcc.h"
 
+#include "stm_dma_info.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -150,6 +152,7 @@ struct qspi_s {
     PinName io3;
     PinName sclk;
     PinName ssel;
+    bool dmaInitialized;
 };
 #endif
 
diff --git a/targets/TARGET_STM/TARGET_STM32F4/stm_dma_info.h b/targets/TARGET_STM/TARGET_STM32F4/stm_dma_info.h
@@ -48,4 +48,9 @@ static const DMALinkInfo SPIRxDMALinks[] = {
         {2, 6, 1}, // SPI6 Rx is DMA2 Stream 6 Channel 1
 };
 
+/// Mapping from QSPI index to DMA link info
+static const DMALinkInfo QSPIDMALinks[] = {
+        {2, 7, 3}, // QUADSPI is DMA2 Stream 7 Channel 3
+};
+
 #endif //MBED_OS_STM_DMA_INFO_H
diff --git a/targets/TARGET_STM/TARGET_STM32F7/objects.h b/targets/TARGET_STM/TARGET_STM32F7/objects.h
@@ -42,6 +42,8 @@
 #include "stm32f7xx_ll_pwr.h"
 #include "stm32f7xx_ll_rcc.h"
 
+#include "stm_dma_info.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -124,6 +126,7 @@ struct qspi_s {
     PinName io3;
     PinName sclk;
     PinName ssel;
+    bool dmaInitialized;
 };
 #endif
 
diff --git a/targets/TARGET_STM/TARGET_STM32F7/stm_dma_info.h b/targets/TARGET_STM/TARGET_STM32F7/stm_dma_info.h
@@ -48,4 +48,9 @@ static const DMALinkInfo SPIRxDMALinks[] = {
         {2, 6, 1}, // SPI6 Rx is DMA2 Stream 6 Channel 1
 };
 
+/// Mapping from QSPI index to DMA link info
+static const DMALinkInfo QSPIDMALinks[] = {
+        {2, 7, 3}, // QUADSPI is DMA2 Stream 7 Channel 3
+};
+
 #endif //MBED_OS_STM_DMA_INFO_H
diff --git a/targets/TARGET_STM/TARGET_STM32G4/objects.h b/targets/TARGET_STM/TARGET_STM32G4/objects.h
@@ -26,6 +26,8 @@
 #include "stm32g4xx_ll_rtc.h"
 #include "stm32g4xx_ll_rcc.h"
 
+#include "stm_dma_info.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -106,6 +108,7 @@ struct qspi_s {
     PinName io3;
     PinName sclk;
     PinName ssel;
+    bool dmaInitialized;
 };
 #endif
 
diff --git a/targets/TARGET_STM/TARGET_STM32G4/stm_dma_info.h b/targets/TARGET_STM/TARGET_STM32G4/stm_dma_info.h
@@ -44,5 +44,11 @@ static const DMALinkInfo SPIRxDMALinks[] = {
 #endif
 };
 
+/// Mapping from QSPI index to DMA link info
+static const DMALinkInfo QSPIDMALinks[] = {
+#if defined(QUADSPI)
+        {1, 7, DMA_REQUEST_QUADSPI },
+#endif
+};
 
 #endif //MBED_OS_STM_DMA_INFO_H
diff --git a/targets/TARGET_STM/TARGET_STM32H7/objects.h b/targets/TARGET_STM/TARGET_STM32H7/objects.h
@@ -31,6 +31,8 @@
 #include "stm32h7xx_ll_pwr.h"
 #include "stm32h7xx_ll_system.h"
 
+#include "stm_dma_info.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -94,6 +96,8 @@ struct qspi_s {
     PinName io3;
     PinName sclk;
     PinName ssel;
+    IRQn_Type qspiIRQ;
+    bool dmaInitialized;
 };
 #endif
 
@@ -112,6 +116,8 @@ struct ospi_s {
     PinName sclk;
     PinName ssel;
     PinName dqs;
+    IRQn_Type ospiIRQ;
+    bool dmaInitialized;
 };
 #endif
 
diff --git a/targets/TARGET_STM/TARGET_STM32H7/stm_dma_info.h b/targets/TARGET_STM/TARGET_STM32H7/stm_dma_info.h
@@ -42,5 +42,17 @@ static const DMALinkInfo SPIRxDMALinks[] = {
         {2, 0, DMA_REQUEST_SPI5_RX},
 };
 
+/// Mapping from QSPI/OSPI index to DMA link info
+#if defined(OCTOSPI1)
+static const DMALinkInfo OSPIDMALinks[] = {
+        {4, 0, MDMA_REQUEST_OCTOSPI1_FIFO_TH},
+        {4, 1, MDMA_REQUEST_OCTOSPI2_FIFO_TH}
+};
+#else
+static const DMALinkInfo QSPIDMALinks[] = {
+        {4, 0, MDMA_REQUEST_QUADSPI_FIFO_TH},
+};
+#endif
+
 
 #endif //MBED_OS_STM_DMA_INFO_H
diff --git a/targets/TARGET_STM/TARGET_STM32L4/objects.h b/targets/TARGET_STM/TARGET_STM32L4/objects.h
@@ -31,6 +31,8 @@
 #include "stm32l4xx_ll_pwr.h"
 #include "stm32l4xx_ll_rcc.h"
 
+#include "stm_dma_utils.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -106,6 +108,7 @@ struct can_s {
 struct qspi_s {
 #if defined(OCTOSPI1)
     OSPI_HandleTypeDef handle;
+    IRQn_Type qspiIRQ;
 #else
     QSPI_HandleTypeDef handle;
 #endif
@@ -116,6 +119,7 @@ struct qspi_s {
     PinName io3;
     PinName sclk;
     PinName ssel;
+    bool dmaInitialized;
 };
 #endif
 
@@ -134,6 +138,8 @@ struct ospi_s {
     PinName sclk;
     PinName ssel;
     PinName dqs;
+    IRQn_Type ospiIRQ;
+    bool dmaInitialized;    
 };
 #endif
 
diff --git a/targets/TARGET_STM/TARGET_STM32L4/stm_dma_info.h b/targets/TARGET_STM/TARGET_STM32L4/stm_dma_info.h
@@ -40,6 +40,12 @@ static const DMALinkInfo SPIRxDMALinks[] = {
         {1, 6, DMA_REQUEST_SPI3_RX}
 };
 
+/// Mapping from OSPI index to DMA link info
+static const DMALinkInfo OSPIDMALinks[] = {
+        {1, 7, DMA_REQUEST_OCTOSPI1},
+        {2, 1, DMA_REQUEST_OCTOSPI2},
+};
+
 #else
 
 
@@ -60,6 +66,11 @@ static const DMALinkInfo SPIRxDMALinks[] = {
         {2, 1, 3}  // SPI3 Rx is DMA2 Ch1 Request 3
 };
 
+/// Mapping from QSPI index to DMA link info
+static const DMALinkInfo QSPIDMALinks[] = {
+        {2, 7, 3}, // QUADSPI is DMA2 Ch7 Request 3
+};
+
 #endif
 
 #endif //MBED_OS_STM_DMA_INFO_H
diff --git a/targets/TARGET_STM/TARGET_STM32L5/objects.h b/targets/TARGET_STM/TARGET_STM32L5/objects.h
@@ -27,6 +27,8 @@
 #include "stm32l5xx_ll_pwr.h"
 #include "stm32l5xx_ll_rcc.h"
 
+#include "stm_dma_info.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -112,6 +114,8 @@ struct qspi_s {
     PinName io3;
     PinName sclk;
     PinName ssel;
+    IRQn_Type qspiIRQ;
+    bool dmaInitialized;
 };
 
 struct ospi_s {
@@ -128,6 +132,8 @@ struct ospi_s {
     PinName sclk;
     PinName ssel;
     PinName dqs;
+    IRQn_Type ospiIRQ;
+    bool dmaInitialized;
 };
 
 #ifdef __cplusplus
diff --git a/targets/TARGET_STM/TARGET_STM32L5/stm_dma_info.h b/targets/TARGET_STM/TARGET_STM32L5/stm_dma_info.h
@@ -38,5 +38,9 @@ static const DMALinkInfo SPIRxDMALinks[] = {
         {1, 6, DMA_REQUEST_SPI3_RX},
 };
 
+/// Mapping from OSPI index to DMA link info
+static const DMALinkInfo OSPIDMALinks[] = {
+        {1, 7, DMA_REQUEST_OCTOSPI1},
+};
 
 #endif //MBED_OS_STM_DMA_INFO_H
diff --git a/targets/TARGET_STM/TARGET_STM32U5/objects.h b/targets/TARGET_STM/TARGET_STM32U5/objects.h
@@ -27,6 +27,8 @@
 #include "stm32u5xx_ll_pwr.h"
 #include "stm32u5xx_ll_rcc.h"
 
+#include "stm_dma_info.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -112,6 +114,8 @@ struct qspi_s {
     PinName io3;
     PinName sclk;
     PinName ssel;
+    IRQn_Type qspiIRQ;
+    bool dmaInitialized;
 };
 
 struct ospi_s {
@@ -128,6 +132,8 @@ struct ospi_s {
     PinName sclk;
     PinName ssel;
     PinName dqs;
+    IRQn_Type ospiIRQ;
+    bool dmaInitialized;
 };
 
 #ifdef __cplusplus
diff --git a/targets/TARGET_STM/TARGET_STM32U5/stm_dma_info.h b/targets/TARGET_STM/TARGET_STM32U5/stm_dma_info.h
@@ -38,5 +38,10 @@ static const DMALinkInfo SPIRxDMALinks[] = {
         {1, 5, GPDMA1_REQUEST_SPI3_TX}
 };
 
+/// Mapping from OSPI index to DMA link info
+static const DMALinkInfo OSPIDMALinks[] = {
+        {1, 6, GPDMA1_REQUEST_OCTOSPI1},
+        {1, 7, GPDMA1_REQUEST_OCTOSPI2}
+};
 
 #endif //MBED_OS_STM_DMA_INFO_H
diff --git a/targets/TARGET_STM/TARGET_STM32WB/objects.h b/targets/TARGET_STM/TARGET_STM32WB/objects.h
@@ -33,6 +33,8 @@
 #error "BLE FEATURE CANNOT BE REMOVED"
 #endif
 
+#include "stm_dma_info.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -98,6 +100,7 @@ struct qspi_s {
     PinName io3;
     PinName sclk;
     PinName ssel;
+    bool dmaInitialized;
 };
 #endif
 
diff --git a/targets/TARGET_STM/TARGET_STM32WB/stm_dma_info.h b/targets/TARGET_STM/TARGET_STM32WB/stm_dma_info.h
@@ -40,5 +40,10 @@ static const DMALinkInfo SPIRxDMALinks[] = {
 #endif
 };
 
+static const DMALinkInfo QSPIDMALinks[] = {
+#if defined(QUADSPI)
+        {1, 5, DMA_REQUEST_QUADSPI},
+#endif
+};
 
 #endif //MBED_OS_STM_DMA_INFO_H
diff --git a/targets/TARGET_STM/ospi_api.c b/targets/TARGET_STM/ospi_api.c
@@ -483,6 +483,7 @@ ospi_status_t ospi_frequency(ospi_t *obj, int hz)
 
     obj->handle.Init.ClockPrescaler = div;
 
+    HAL_OSPI_DeInit(&obj->handle);
     if (HAL_OSPI_Init(&obj->handle) != HAL_OK) {
         tr_error("HAL_OSPI_Init error");
         status = OSPI_STATUS_ERROR;
diff --git a/targets/TARGET_STM/qspi_api.c b/targets/TARGET_STM/qspi_api.c
diff --git a/targets/TARGET_STM/stm_dma_ip_v1.h b/targets/TARGET_STM/stm_dma_ip_v1.h
diff --git a/targets/TARGET_STM/stm_dma_utils.c b/targets/TARGET_STM/stm_dma_utils.c
diff --git a/targets/TARGET_STM/stm_dma_utils.h b/targets/TARGET_STM/stm_dma_utils.h
diff --git a/targets/TARGET_STM/stm_spi_api.c b/targets/TARGET_STM/stm_spi_api.c
