WIP

Revert "cmsis: Use correct CPPWR definitions for v8m-main"

This reverts commit 1e555c0.

And add back the core_ext.h from current main.

Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>

Author: Vge0rge

platform/ext/common/core_ext.h

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2021, Arm Limited. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ */
+
+#ifndef __CORE_EXT_H__
+#define __CORE_EXT_H__
+
+/* Coprocessor Power Control Register Definitions */
+#define SCnSCB_CPPWR_SUS11_Pos              23U                                        /*!< CPPWR: SUS11 Position */
+#define SCnSCB_CPPWR_SUS11_Msk              (1UL << SCnSCB_CPPWR_SUS11_Pos)            /*!< CPPWR: SUS11 Mask */
+
+#define SCnSCB_CPPWR_SU11_Pos               22U                                        /*!< CPPWR: SU11 Position */
+#define SCnSCB_CPPWR_SU11_Msk               (1UL << SCnSCB_CPPWR_SU11_Pos)             /*!< CPPWR: SU11 Mask */
+
+#define SCnSCB_CPPWR_SUS10_Pos              21U                                        /*!< CPPWR: SUS10 Position */
+#define SCnSCB_CPPWR_SUS10_Msk              (1UL << SCnSCB_CPPWR_SUS10_Pos)            /*!< CPPWR: SUS10 Mask */
+
+#define SCnSCB_CPPWR_SU10_Pos               20U                                        /*!< CPPWR: SU10 Position */
+#define SCnSCB_CPPWR_SU10_Msk               (1UL << SCnSCB_CPPWR_SU10_Pos)             /*!< CPPWR: SU10 Mask */
+
+#endif /* __CORE_EXT_H__ */

secure_fw/spm/core/arch/tfm_arch_v8m_main.c

@@ -322,6 +322,7 @@ void tfm_arch_config_extensions(void)
 #endif /* defined(CONFIG_TFM_ENABLE_CP10CP11) */
 
 #if (CONFIG_TFM_FLOAT_ABI >= 1)
+
 #ifdef CONFIG_TFM_LAZY_STACKING
     /* Enable lazy stacking. */
     FPU->FPCCR |= FPU_FPCCR_LSPEN_Msk;
@@ -347,10 +348,12 @@ void tfm_arch_config_extensions(void)
 
     /* Prevent non-secure from modifying FPU’s power setting. */
 #if defined(__ARM_ARCH_8_1M_MAIN__) && (__ARM_ARCH_8_1M_MAIN__ == 1)
-    ICB->CPPWR |= ICB_CPPWR_SUS11_Msk | ICB_CPPWR_SUS10_Msk;
+    ICB->CPPWR |=
 #else
-    SCnSCB->CPPWR |= SCnSCB_CPPWR_SUS11_Msk | SCnSCB_CPPWR_SUS10_Msk;
+    SCnSCB->CPPWR |=
 #endif
+        ICB_CPPWR_SUS11_Msk | ICB_CPPWR_SUS10_Msk;
+
 #endif /* CONFIG_TFM_FLOAT_ABI >= 1 */
 
 #if defined(__ARM_ARCH_8_1M_MAIN__) && (__ARM_ARCH_8_1M_MAIN__ == 1) && \