Merge pull request #14469 from jeromecoutant/PR_FLASH_PROGRAM

0xc0170 · web-flow · commit dd1da3da4060 · 2021-04-14T20:15:11.000+02:00
STM32: remove critical sections in flash_program_page
diff --git a/targets/TARGET_STM/TARGET_STM32F0/flash_api.c b/targets/TARGET_STM/TARGET_STM32F0/flash_api.c
@@ -14,7 +14,7 @@
  */
 
 #include "flash_api.h"
-#include "mbed_critical.h"
+#include "platform/mbed_critical.h"
 
 #if DEVICE_FLASH
 #include "mbed_assert.h"
@@ -97,8 +97,6 @@ int32_t flash_program_page(flash_t *obj, uint32_t address, const uint8_t *data,
         return -1;
     }
 
-    core_util_critical_section_enter();
-
     /* Program the user Flash area word by word */
     StartAddress = address;
 
@@ -129,8 +127,6 @@ int32_t flash_program_page(flash_t *obj, uint32_t address, const uint8_t *data,
         }
     }
 
-    core_util_critical_section_exit();
-
     if (HAL_FLASH_Lock() != HAL_OK) {
         return -1;
     }
diff --git a/targets/TARGET_STM/TARGET_STM32F1/flash_api.c b/targets/TARGET_STM/TARGET_STM32F1/flash_api.c
@@ -17,7 +17,7 @@
  */
 
 #include "flash_api.h"
-#include "mbed_critical.h"
+#include "platform/mbed_critical.h"
 
 #if DEVICE_FLASH
 #include "mbed_assert.h"
@@ -100,8 +100,6 @@ int32_t flash_program_page(flash_t *obj, uint32_t address, const uint8_t *data,
         return -1;
     }
 
-    core_util_critical_section_enter();
-
     /* Program the user Flash area word by word */
     StartAddress = address;
 
@@ -132,8 +130,6 @@ int32_t flash_program_page(flash_t *obj, uint32_t address, const uint8_t *data,
         }
     }
 
-    core_util_critical_section_exit();
-
     if (HAL_FLASH_Lock() != HAL_OK) {
         return -1;
     }
diff --git a/targets/TARGET_STM/TARGET_STM32F2/flash_api.c b/targets/TARGET_STM/TARGET_STM32F2/flash_api.c
@@ -86,8 +86,6 @@ int32_t flash_program_page(flash_t *obj, uint32_t address, const uint8_t *data,
         return -1;
     }
 
-    core_util_critical_section_enter();
-
     /* Note: If an erase operation in Flash memory also concerns data in the data or instruction cache,
        you have to make sure that these data are rewritten before they are accessed during code
        execution. If this cannot be done safely, it is recommended to flush the caches by setting the
@@ -111,8 +109,6 @@ int32_t flash_program_page(flash_t *obj, uint32_t address, const uint8_t *data,
         }
     }
 
-    core_util_critical_section_exit();
-
     if (HAL_FLASH_Lock() != HAL_OK) {
         return -1;
     }
diff --git a/targets/TARGET_STM/TARGET_STM32F3/flash_api.c b/targets/TARGET_STM/TARGET_STM32F3/flash_api.c
@@ -17,7 +17,7 @@
  */
 
 #include "flash_api.h"
-#include "mbed_critical.h"
+#include "platform/mbed_critical.h"
 
 #if DEVICE_FLASH
 #include "mbed_assert.h"
@@ -100,8 +100,6 @@ int32_t flash_program_page(flash_t *obj, uint32_t address, const uint8_t *data,
         return -1;
     }
 
-    core_util_critical_section_enter();
-
     /* Program the user Flash area word by word */
     StartAddress = address;
 
@@ -132,8 +130,6 @@ int32_t flash_program_page(flash_t *obj, uint32_t address, const uint8_t *data,
         }
     }
 
-    core_util_critical_section_exit();
-
     if (HAL_FLASH_Lock() != HAL_OK) {
         return -1;
     }
diff --git a/targets/TARGET_STM/TARGET_STM32F4/flash_api.c b/targets/TARGET_STM/TARGET_STM32F4/flash_api.c
@@ -81,8 +81,6 @@ int32_t flash_program_page(flash_t *obj, uint32_t address, const uint8_t *data,
         return -1;
     }
 
-    core_util_critical_section_enter();
-
     /* Note: If an erase operation in Flash memory also concerns data in the data or instruction cache,
        you have to make sure that these data are rewritten before they are accessed during code
        execution. If this cannot be done safely, it is recommended to flush the caches by setting the
@@ -106,8 +104,6 @@ int32_t flash_program_page(flash_t *obj, uint32_t address, const uint8_t *data,
         }
     }
 
-    core_util_critical_section_exit();
-
     if (HAL_FLASH_Lock() != HAL_OK) {
         return -1;
     }
diff --git a/targets/TARGET_STM/TARGET_STM32F7/flash_api.c b/targets/TARGET_STM/TARGET_STM32F7/flash_api.c
@@ -127,8 +127,6 @@ int32_t flash_program_page(flash_t *obj, uint32_t address, const uint8_t *data,
         return -1;
     }
 
-    core_util_critical_section_enter();
-
     /* Note: If an erase operation in Flash memory also concerns data in the data or instruction cache,
        you have to make sure that these data are rewritten before they are accessed during code
        execution. If this cannot be done safely, it is recommended to flush the caches by setting the
@@ -151,8 +149,6 @@ int32_t flash_program_page(flash_t *obj, uint32_t address, const uint8_t *data,
     SCB_CleanInvalidateDCache_by_Addr((uint32_t *)StartAddress, FullSize);
     SCB_InvalidateICache();
 
-    core_util_critical_section_exit();
-
     if (HAL_FLASH_Lock() != HAL_OK) {
         return -1;
     }
diff --git a/targets/TARGET_STM/TARGET_STM32G0/flash_api.c b/targets/TARGET_STM/TARGET_STM32G0/flash_api.c
@@ -17,7 +17,7 @@
  */
 
 #include "flash_api.h"
-#include "mbed_critical.h"
+#include "platform/mbed_critical.h"
 
 #if DEVICE_FLASH
 #include "mbed_assert.h"
@@ -98,8 +98,6 @@ int32_t flash_program_page(flash_t *obj, uint32_t address,
         return -1;
     }
 
-    core_util_critical_section_enter();
-
     /* Program the user Flash area word by word */
     StartAddress = address;
 
@@ -130,8 +128,6 @@ int32_t flash_program_page(flash_t *obj, uint32_t address,
         }
     }
 
-    core_util_critical_section_exit();
-
     if (HAL_FLASH_Lock() != HAL_OK) {
         return -1;
     }
diff --git a/targets/TARGET_STM/TARGET_STM32G4/flash_api.c b/targets/TARGET_STM/TARGET_STM32G4/flash_api.c
@@ -14,7 +14,7 @@
  */
 
 #include "flash_api.h"
-#include "mbed_critical.h"
+#include "platform/mbed_critical.h"
 
 #if DEVICE_FLASH
 #include "mbed_assert.h"
@@ -177,8 +177,6 @@ int32_t flash_program_page(flash_t *obj, uint32_t address,
         return -1;
     }
 
-    core_util_critical_section_enter();
-
     /* Clear error programming flags */
     __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS);
 
@@ -215,8 +213,6 @@ int32_t flash_program_page(flash_t *obj, uint32_t address,
         }
     }
 
-    core_util_critical_section_exit();
-
     if (HAL_FLASH_Lock() != HAL_OK) {
         return -1;
     }
diff --git a/targets/TARGET_STM/TARGET_STM32H7/flash_api.c b/targets/TARGET_STM/TARGET_STM32H7/flash_api.c
@@ -134,8 +134,6 @@ int32_t flash_program_page(flash_t *obj, uint32_t address, const uint8_t *data,
         return -1;
     }
 
-    core_util_critical_section_enter();
-
     StartAddress = address;
     while ((address < (StartAddress + size)) && (status == 0)) {
         if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_FLASHWORD, address, (uint32_t)data) == HAL_OK) {
@@ -156,8 +154,6 @@ int32_t flash_program_page(flash_t *obj, uint32_t address, const uint8_t *data,
     SCB_InvalidateICache();
 #endif /* DUAL_CORE */
 
-    core_util_critical_section_exit();
-
     if (HAL_FLASH_Lock() != HAL_OK) {
         return -1;
     }
diff --git a/targets/TARGET_STM/TARGET_STM32L0/flash_api.c b/targets/TARGET_STM/TARGET_STM32L0/flash_api.c
@@ -17,7 +17,7 @@
  */
 
 #include "flash_api.h"
-#include "mbed_critical.h"
+#include "platform/mbed_critical.h"
 
 #if DEVICE_FLASH
 #include "mbed_assert.h"
@@ -100,8 +100,6 @@ int32_t flash_program_page(flash_t *obj, uint32_t address,
         return -1;
     }
 
-    core_util_critical_section_enter();
-
     /* Program the user Flash area word by word */
     StartAddress = address;
 
@@ -132,8 +130,6 @@ int32_t flash_program_page(flash_t *obj, uint32_t address,
         }
     }
 
-    core_util_critical_section_exit();
-
     if (HAL_FLASH_Lock() != HAL_OK) {
         return -1;
     }
diff --git a/targets/TARGET_STM/TARGET_STM32L1/flash_api.c b/targets/TARGET_STM/TARGET_STM32L1/flash_api.c
@@ -14,7 +14,7 @@
  */
 
 #include "flash_api.h"
-#include "mbed_critical.h"
+#include "platform/mbed_critical.h"
 
 #if DEVICE_FLASH
 #include "mbed_assert.h"
@@ -95,8 +95,6 @@ int32_t flash_program_page(flash_t *obj, uint32_t address,
         return -1;
     }
 
-    core_util_critical_section_enter();
-
     /* Program the user Flash area word by word */
     StartAddress = address;
 
@@ -127,8 +125,6 @@ int32_t flash_program_page(flash_t *obj, uint32_t address,
         }
     }
 
-    core_util_critical_section_exit();
-
     if (HAL_FLASH_Lock() != HAL_OK) {
         return -1;
     }
diff --git a/targets/TARGET_STM/TARGET_STM32L4/flash_api.c b/targets/TARGET_STM/TARGET_STM32L4/flash_api.c
@@ -16,7 +16,7 @@
  */
 
 #include "flash_api.h"
-#include "mbed_critical.h"
+#include "platform/mbed_critical.h"
 
 #if DEVICE_FLASH
 #include "mbed_assert.h"
@@ -181,8 +181,6 @@ int32_t flash_program_page(flash_t *obj, uint32_t address,
         return -1;
     }
 
-    core_util_critical_section_enter();
-
     /* Clear error programming flags */
     __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS);
 
@@ -219,8 +217,6 @@ int32_t flash_program_page(flash_t *obj, uint32_t address,
         }
     }
 
-    core_util_critical_section_exit();
-
     if (HAL_FLASH_Lock() != HAL_OK) {
         return -1;
     }
diff --git a/targets/TARGET_STM/TARGET_STM32L5/flash_api.c b/targets/TARGET_STM/TARGET_STM32L5/flash_api.c
@@ -14,6 +14,7 @@
  */
 
 #include "flash_api.h"
+#include "platform/mbed_critical.h"
 
 #if DEVICE_FLASH
 
@@ -173,8 +174,6 @@ int32_t flash_program_page(flash_t *obj, uint32_t address,
         return -1;
     }
 
-    core_util_critical_section_enter();
-
     /* Clear error programming flags */
     __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS);
 
@@ -215,8 +214,6 @@ int32_t flash_program_page(flash_t *obj, uint32_t address,
         return -1;
     }
 
-    core_util_critical_section_enter();
-
     return status;
 }
 
diff --git a/targets/TARGET_STM/TARGET_STM32WL/flash_api.c b/targets/TARGET_STM/TARGET_STM32WL/flash_api.c

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`*/`
`15`	`15`
`16`	`16`	`#include "flash_api.h"`
`17`		`-#include "mbed_critical.h"`
	`17`	`+#include "platform/mbed_critical.h"`
`18`	`18`
`19`	`19`	`#if DEVICE_FLASH`
`20`	`20`	`#include "mbed_assert.h"`
`@@ -97,8 +97,6 @@ int32_t flash_program_page(flash_t obj, uint32_t address, const uint8_t data,`
`97`	`97`	`return -1;`
`98`	`98`	`}`
`99`	`99`
`100`		`- core_util_critical_section_enter();`
`101`		`-`
`102`	`100`	`/* Program the user Flash area word by word */`
`103`	`101`	`StartAddress = address;`
`104`	`102`
`@@ -129,8 +127,6 @@ int32_t flash_program_page(flash_t obj, uint32_t address, const uint8_t data,`
`129`	`127`	`}`
`130`	`128`	`}`
`131`	`129`
`132`		`- core_util_critical_section_exit();`
`133`		`-`
`134`	`130`	`if (HAL_FLASH_Lock() != HAL_OK) {`
`135`	`131`	`return -1;`
`136`	`132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`*/`
`18`	`18`
`19`	`19`	`#include "flash_api.h"`
`20`		`-#include "mbed_critical.h"`
	`20`	`+#include "platform/mbed_critical.h"`
`21`	`21`
`22`	`22`	`#if DEVICE_FLASH`
`23`	`23`	`#include "mbed_assert.h"`
`@@ -100,8 +100,6 @@ int32_t flash_program_page(flash_t obj, uint32_t address, const uint8_t data,`
`100`	`100`	`return -1;`
`101`	`101`	`}`
`102`	`102`
`103`		`- core_util_critical_section_enter();`
`104`		`-`
`105`	`103`	`/* Program the user Flash area word by word */`
`106`	`104`	`StartAddress = address;`
`107`	`105`
`@@ -132,8 +130,6 @@ int32_t flash_program_page(flash_t obj, uint32_t address, const uint8_t data,`
`132`	`130`	`}`
`133`	`131`	`}`
`134`	`132`
`135`		`- core_util_critical_section_exit();`
`136`		`-`
`137`	`133`	`if (HAL_FLASH_Lock() != HAL_OK) {`
`138`	`134`	`return -1;`
`139`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,8 +86,6 @@ int32_t flash_program_page(flash_t obj, uint32_t address, const uint8_t data,`
`86`	`86`	`return -1;`
`87`	`87`	`}`
`88`	`88`
`89`		`- core_util_critical_section_enter();`
`90`		`-`
`91`	`89`	`/* Note: If an erase operation in Flash memory also concerns data in the data or instruction cache,`
`92`	`90`	`you have to make sure that these data are rewritten before they are accessed during code`
`93`	`91`	`execution. If this cannot be done safely, it is recommended to flush the caches by setting the`
`@@ -111,8 +109,6 @@ int32_t flash_program_page(flash_t obj, uint32_t address, const uint8_t data,`
`111`	`109`	`}`
`112`	`110`	`}`
`113`	`111`
`114`		`- core_util_critical_section_exit();`
`115`		`-`
`116`	`112`	`if (HAL_FLASH_Lock() != HAL_OK) {`
`117`	`113`	`return -1;`
`118`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,6 @@ int32_t flash_program_page(flash_t obj, uint32_t address, const uint8_t data,`
`81`	`81`	`return -1;`
`82`	`82`	`}`
`83`	`83`
`84`		`- core_util_critical_section_enter();`
`85`		`-`
`86`	`84`	`/* Note: If an erase operation in Flash memory also concerns data in the data or instruction cache,`
`87`	`85`	`you have to make sure that these data are rewritten before they are accessed during code`
`88`	`86`	`execution. If this cannot be done safely, it is recommended to flush the caches by setting the`
`@@ -106,8 +104,6 @@ int32_t flash_program_page(flash_t obj, uint32_t address, const uint8_t data,`
`106`	`104`	`}`
`107`	`105`	`}`
`108`	`106`
`109`		`- core_util_critical_section_exit();`
`110`		`-`
`111`	`107`	`if (HAL_FLASH_Lock() != HAL_OK) {`
`112`	`108`	`return -1;`
`113`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`*/`
`17`	`17`
`18`	`18`	`#include "flash_api.h"`
`19`		`-#include "mbed_critical.h"`
	`19`	`+#include "platform/mbed_critical.h"`
`20`	`20`
`21`	`21`	`#if DEVICE_FLASH`
`22`	`22`	`#include "mbed_assert.h"`
`@@ -181,8 +181,6 @@ int32_t flash_program_page(flash_t *obj, uint32_t address,`
`181`	`181`	`return -1;`
`182`	`182`	`}`
`183`	`183`
`184`		`- core_util_critical_section_enter();`
`185`		`-`
`186`	`184`	`/* Clear error programming flags */`
`187`	`185`	`__HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS);`
`188`	`186`
`@@ -219,8 +217,6 @@ int32_t flash_program_page(flash_t *obj, uint32_t address,`
`219`	`217`	`}`
`220`	`218`	`}`
`221`	`219`
`222`		`- core_util_critical_section_exit();`
`223`		`-`
`224`	`220`	`if (HAL_FLASH_Lock() != HAL_OK) {`
`225`	`221`	`return -1;`
`226`	`222`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`*/`
`15`	`15`
`16`	`16`	`#include "flash_api.h"`
	`17`	`+#include "platform/mbed_critical.h"`
`17`	`18`
`18`	`19`	`#if DEVICE_FLASH`
`19`	`20`
`@@ -173,8 +174,6 @@ int32_t flash_program_page(flash_t *obj, uint32_t address,`
`173`	`174`	`return -1;`
`174`	`175`	`}`
`175`	`176`
`176`		`- core_util_critical_section_enter();`
`177`		`-`
`178`	`177`	`/* Clear error programming flags */`
`179`	`178`	`__HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS);`
`180`	`179`
`@@ -215,8 +214,6 @@ int32_t flash_program_page(flash_t *obj, uint32_t address,`
`215`	`214`	`return -1;`
`216`	`215`	`}`
`217`	`216`
`218`		`- core_util_critical_section_enter();`
`219`		`-`
`220`	`217`	`return status;`
`221`	`218`	`}`
`222`	`219`