changed sourceinc/destinationinc settings for MDMA

wdx04 · wdx04 · commit 59be34a246f4 · 2025-05-10T21:11:41.000+08:00
wait on a sempahore for QSPI DMA operations
changed FATFileSystem to use 32byte-aligned allocation
enhanced D-Cache consistency for STM32F7/H7 families
diff --git a/storage/filesystem/fat/source/FATFileSystem.cpp b/storage/filesystem/fat/source/FATFileSystem.cpp
@@ -155,7 +155,11 @@ extern "C" DWORD get_fattime(void)
 
 extern "C" void *ff_memalloc(UINT size)
 {
+#if defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U)
+    return aligned_alloc(32U, size);
+#else
     return malloc(size);
+#endif
 }
 
 extern "C" void ff_memfree(void *p)
diff --git a/targets/TARGET_STM/TARGET_STM32F4/objects.h b/targets/TARGET_STM/TARGET_STM32F4/objects.h
@@ -29,6 +29,8 @@
 #include "stm32f4xx_ll_rcc.h"
 
 #include "stm_dma_info.h"
+#include "cmsis_os.h"
+#include "cmsis_os2.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -153,6 +155,8 @@ struct qspi_s {
     PinName sclk;
     PinName ssel;
     bool dmaInitialized;
+    osSemaphoreId_t semaphoreId;
+    osRtxSemaphore_t semaphoreMem;
 };
 #endif
 
diff --git a/targets/TARGET_STM/TARGET_STM32F7/objects.h b/targets/TARGET_STM/TARGET_STM32F7/objects.h
@@ -43,6 +43,8 @@
 #include "stm32f7xx_ll_rcc.h"
 
 #include "stm_dma_info.h"
+#include "cmsis_os.h"
+#include "cmsis_os2.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -127,6 +129,8 @@ struct qspi_s {
     PinName sclk;
     PinName ssel;
     bool dmaInitialized;
+    osSemaphoreId_t semaphoreId;
+    osRtxSemaphore_t semaphoreMem;
 };
 #endif
 
diff --git a/targets/TARGET_STM/TARGET_STM32G4/objects.h b/targets/TARGET_STM/TARGET_STM32G4/objects.h
@@ -27,6 +27,8 @@
 #include "stm32g4xx_ll_rcc.h"
 
 #include "stm_dma_info.h"
+#include "cmsis_os.h"
+#include "cmsis_os2.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -109,6 +111,8 @@ struct qspi_s {
     PinName sclk;
     PinName ssel;
     bool dmaInitialized;
+    osSemaphoreId_t semaphoreId;
+    osRtxSemaphore_t semaphoreMem;
 };
 #endif
 
diff --git a/targets/TARGET_STM/TARGET_STM32H7/objects.h b/targets/TARGET_STM/TARGET_STM32H7/objects.h
@@ -32,6 +32,8 @@
 #include "stm32h7xx_ll_system.h"
 
 #include "stm_dma_info.h"
+#include "cmsis_os.h"
+#include "cmsis_os2.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -86,6 +88,7 @@ struct analogin_s {
 struct qspi_s {
 #if defined(OCTOSPI1)
     OSPI_HandleTypeDef handle;
+    IRQn_Type qspiIRQ;
 #else
     QSPI_HandleTypeDef handle;
 #endif
@@ -96,14 +99,16 @@ struct qspi_s {
     PinName io3;
     PinName sclk;
     PinName ssel;
-    IRQn_Type qspiIRQ;
     bool dmaInitialized;
+    osSemaphoreId_t semaphoreId;
+    osRtxSemaphore_t semaphoreMem;
 };
 #endif
 
 #if DEVICE_OSPI
 struct ospi_s {
     OSPI_HandleTypeDef handle;
+    IRQn_Type ospiIRQ;
     OSPIName ospi;
     PinName io0;
     PinName io1;
@@ -116,8 +121,9 @@ struct ospi_s {
     PinName sclk;
     PinName ssel;
     PinName dqs;
-    IRQn_Type ospiIRQ;
     bool dmaInitialized;
+    osSemaphoreId_t semaphoreId;
+    osRtxSemaphore_t semaphoreMem;
 };
 #endif
 
diff --git a/targets/TARGET_STM/TARGET_STM32H7/stm_dma_info.h b/targets/TARGET_STM/TARGET_STM32H7/stm_dma_info.h
@@ -45,12 +45,12 @@ static const DMALinkInfo SPIRxDMALinks[] = {
 /// 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}
+        {MDMA_IDX, 0, MDMA_REQUEST_OCTOSPI1_FIFO_TH},
+        {MDMA_IDX, 1, MDMA_REQUEST_OCTOSPI2_FIFO_TH}
 };
 #else
 static const DMALinkInfo QSPIDMALinks[] = {
-        {4, 0, MDMA_REQUEST_QUADSPI_FIFO_TH},
+        {MDMA_IDX, 0, MDMA_REQUEST_QUADSPI_FIFO_TH},
 };
 #endif
 
diff --git a/targets/TARGET_STM/TARGET_STM32L4/objects.h b/targets/TARGET_STM/TARGET_STM32L4/objects.h
@@ -32,6 +32,8 @@
 #include "stm32l4xx_ll_rcc.h"
 
 #include "stm_dma_utils.h"
+#include "cmsis_os.h"
+#include "cmsis_os2.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -120,12 +122,15 @@ struct qspi_s {
     PinName sclk;
     PinName ssel;
     bool dmaInitialized;
+    osSemaphoreId_t semaphoreId;
+    osRtxSemaphore_t semaphoreMem;
 };
 #endif
 
 #if DEVICE_OSPI
 struct ospi_s {
     OSPI_HandleTypeDef handle;
+    IRQn_Type ospiIRQ;
     OSPIName ospi;
     PinName io0;
     PinName io1;
@@ -138,8 +143,9 @@ struct ospi_s {
     PinName sclk;
     PinName ssel;
     PinName dqs;
-    IRQn_Type ospiIRQ;
-    bool dmaInitialized;    
+    bool dmaInitialized;
+    osSemaphoreId_t semaphoreId;
+    osRtxSemaphore_t semaphoreMem;
 };
 #endif
 
diff --git a/targets/TARGET_STM/TARGET_STM32L5/objects.h b/targets/TARGET_STM/TARGET_STM32L5/objects.h
@@ -28,6 +28,8 @@
 #include "stm32l5xx_ll_rcc.h"
 
 #include "stm_dma_info.h"
+#include "cmsis_os.h"
+#include "cmsis_os2.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -107,19 +109,22 @@ struct can_s {
 
 struct qspi_s {
     OSPI_HandleTypeDef handle;
+    IRQn_Type qspiIRQ;
     QSPIName qspi;
     PinName io0;
     PinName io1;
     PinName io2;
     PinName io3;
     PinName sclk;
     PinName ssel;
-    IRQn_Type qspiIRQ;
     bool dmaInitialized;
+    osSemaphoreId_t semaphoreId;
+    osRtxSemaphore_t semaphoreMem;
 };
 
 struct ospi_s {
     OSPI_HandleTypeDef handle;
+    IRQn_Type ospiIRQ;
     OSPIName ospi;
     PinName io0;
     PinName io1;
@@ -132,8 +137,9 @@ struct ospi_s {
     PinName sclk;
     PinName ssel;
     PinName dqs;
-    IRQn_Type ospiIRQ;
     bool dmaInitialized;
+    osSemaphoreId_t semaphoreId;
+    osRtxSemaphore_t semaphoreMem;
 };
 
 #ifdef __cplusplus
diff --git a/targets/TARGET_STM/TARGET_STM32U5/objects.h b/targets/TARGET_STM/TARGET_STM32U5/objects.h
@@ -28,6 +28,8 @@
 #include "stm32u5xx_ll_rcc.h"
 
 #include "stm_dma_info.h"
+#include "cmsis_os.h"
+#include "cmsis_os2.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -107,19 +109,22 @@ struct can_s {
 
 struct qspi_s {
     OSPI_HandleTypeDef handle;
+    IRQn_Type qspiIRQ;
     QSPIName qspi;
     PinName io0;
     PinName io1;
     PinName io2;
     PinName io3;
     PinName sclk;
     PinName ssel;
-    IRQn_Type qspiIRQ;
     bool dmaInitialized;
+    osSemaphoreId_t semaphoreId;
+    osRtxSemaphore_t semaphoreMem;
 };
 
 struct ospi_s {
     OSPI_HandleTypeDef handle;
+    IRQn_Type ospiIRQ;
     OSPIName ospi;
     PinName io0;
     PinName io1;
@@ -132,8 +137,9 @@ struct ospi_s {
     PinName sclk;
     PinName ssel;
     PinName dqs;
-    IRQn_Type ospiIRQ;
     bool dmaInitialized;
+    osSemaphoreId_t semaphoreId;
+    osRtxSemaphore_t semaphoreMem;
 };
 
 #ifdef __cplusplus
diff --git a/targets/TARGET_STM/TARGET_STM32WB/objects.h b/targets/TARGET_STM/TARGET_STM32WB/objects.h
@@ -34,6 +34,8 @@
 #endif
 
 #include "stm_dma_info.h"
+#include "cmsis_os.h"
+#include "cmsis_os2.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -101,6 +103,8 @@ struct qspi_s {
     PinName sclk;
     PinName ssel;
     bool dmaInitialized;
+    osSemaphoreId_t semaphoreId;
+    osRtxSemaphore_t semaphoreMem;
 };
 #endif
 
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

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,11 @@ extern "C" DWORD get_fattime(void)`
`155`	`155`
`156`	`156`	`extern "C" void *ff_memalloc(UINT size)`
`157`	`157`	`{`
	`158`	`+#if defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U)`
	`159`	`+ return aligned_alloc(32U, size);`
	`160`	`+#else`
`158`	`161`	`return malloc(size);`
	`162`	`+#endif`
`159`	`163`	`}`
`160`	`164`
`161`	`165`	`extern "C" void ff_memfree(void *p)`