Style: change more files

portable/GCC/ARM_CM23/non_secure/port.c

@@ -74,7 +74,7 @@
 #define portNVIC_SYSTICK_CTRL_REG             ( *( ( volatile uint32_t * ) 0xe000e010 ) )
 #define portNVIC_SYSTICK_LOAD_REG             ( *( ( volatile uint32_t * ) 0xe000e014 ) )
 #define portNVIC_SYSTICK_CURRENT_VALUE_REG    ( *( ( volatile uint32_t * ) 0xe000e018 ) )
-#define portNVIC_SYSPRI2_REG				( * ( ( volatile uint32_t * ) 0xe000ed20 ) )
+#define portNVIC_SHPR3_REG                    ( *( ( volatile uint32_t * ) 0xe000ed20 ) )
 #define portNVIC_SYSTICK_ENABLE_BIT           ( 1UL << 0UL )
 #define portNVIC_SYSTICK_INT_BIT              ( 1UL << 1UL )
 #define portNVIC_SYSTICK_COUNT_FLAG_BIT       ( 1UL << 16UL )
@@ -86,6 +86,7 @@
     /* Ensure the SysTick is clocked at the same frequency as the core. */
     #define portNVIC_SYSTICK_CLK_BIT          ( 1UL << 2UL )
 #else
+
 /* The way the SysTick is clocked is not modified in case it is not the
  * same a the core. */
     #define portNVIC_SYSTICK_CLK_BIT    ( 0 )
@@ -206,6 +207,7 @@
 #define portINITIAL_XPSR    ( 0x01000000 )
 
 #if ( configRUN_FREERTOS_SECURE_ONLY == 1 )
+
 /**
  * @brief Initial EXC_RETURN value.
  *
@@ -222,6 +224,7 @@
  */
     #define portINITIAL_EXC_RETURN    ( 0xfffffffd )
 #else
+
 /**
  * @brief Initial EXC_RETURN value.
  *
@@ -286,6 +289,7 @@
 static void prvTaskExitError( void );
 
 #if ( configENABLE_MPU == 1 )
+
 /**
  * @brief Setup the Memory Protection Unit (MPU).
  */
@@ -293,6 +297,7 @@ static void prvTaskExitError( void );
 #endif /* configENABLE_MPU */
 
 #if ( configENABLE_FPU == 1 )
+
 /**
  * @brief Setup the Floating Point Unit (FPU).
  */
@@ -345,33 +350,35 @@ portDONT_DISCARD void vPortSVCHandler_C( uint32_t *pulCallerStackAddress ) PRIVI
  * @brief Each task maintains its own interrupt status in the critical nesting
  * variable.
  */
-static volatile uint32_t ulCriticalNesting = 0xaaaaaaaaUL;
+PRIVILEGED_DATA static volatile uint32_t ulCriticalNesting = 0xaaaaaaaaUL;
 
 #if ( configENABLE_TRUSTZONE == 1 )
+
 /**
  * @brief Saved as part of the task context to indicate which context the
  * task is using on the secure side.
  */
-	portDONT_DISCARD volatile SecureContextHandle_t xSecureContext = portNO_SECURE_CONTEXT;
+    PRIVILEGED_DATA portDONT_DISCARD volatile SecureContextHandle_t xSecureContext = portNO_SECURE_CONTEXT;
 #endif /* configENABLE_TRUSTZONE */
 
 #if ( configUSE_TICKLESS_IDLE == 1 )
+
 /**
  * @brief The number of SysTick increments that make up one tick period.
  */
-	static uint32_t ulTimerCountsForOneTick = 0;
+    PRIVILEGED_DATA static uint32_t ulTimerCountsForOneTick = 0;
 
 /**
  * @brief The maximum number of tick periods that can be suppressed is
  * limited by the 24 bit resolution of the SysTick timer.
  */
-	static uint32_t xMaximumPossibleSuppressedTicks = 0;
+    PRIVILEGED_DATA static uint32_t xMaximumPossibleSuppressedTicks = 0;
 
 /**
  * @brief Compensate for the CPU cycles that pass while the SysTick is
  * stopped (low power functionality only).
  */
-	static uint32_t ulStoppedTimerCompensation = 0;
+    PRIVILEGED_DATA static uint32_t ulStoppedTimerCompensation = 0;
 #endif /* configUSE_TICKLESS_IDLE */
 /*-----------------------------------------------------------*/
 
@@ -397,6 +404,7 @@ static volatile uint32_t ulCriticalNesting = 0xaaaaaaaaUL;
          * tick periods. -1 is used because this code will execute part way
          * through one of the tick periods. */
         ulReloadValue = portNVIC_SYSTICK_CURRENT_VALUE_REG + ( ulTimerCountsForOneTick * ( xExpectedIdleTime - 1UL ) );
+
         if( ulReloadValue > ulStoppedTimerCompensation )
         {
             ulReloadValue -= ulStoppedTimerCompensation;
@@ -447,12 +455,14 @@ static volatile uint32_t ulCriticalNesting = 0xaaaaaaaaUL;
              * so a copy is taken. */
             xModifiableIdleTime = xExpectedIdleTime;
             configPRE_SLEEP_PROCESSING( xModifiableIdleTime );
+
             if( xModifiableIdleTime > 0 )
             {
                 __asm volatile ( "dsb" ::: "memory" );
                 __asm volatile ( "wfi" );
                 __asm volatile ( "isb" );
             }
+
             configPOST_SLEEP_PROCESSING( xExpectedIdleTime );
 
             /* Re-enable interrupts to allow the interrupt that brought the MCU
@@ -557,7 +567,7 @@ __attribute__(( weak )) void vPortSetupTimerInterrupt( void ) /* PRIVILEGED_FUNC
     portNVIC_SYSTICK_CURRENT_VALUE_REG = 0UL;
 
     /* Configure SysTick to interrupt at the requested rate. */
-	portNVIC_SYSTICK_LOAD_REG = ( configCPU_CLOCK_HZ / configTICK_RATE_HZ ) - 1UL;
+    portNVIC_SYSTICK_LOAD_REG = ( configSYSTICK_CLOCK_HZ / configTICK_RATE_HZ ) - 1UL;
     portNVIC_SYSTICK_CTRL_REG = portNVIC_SYSTICK_CLK_BIT | portNVIC_SYSTICK_INT_BIT | portNVIC_SYSTICK_ENABLE_BIT;
 }
 /*-----------------------------------------------------------*/
@@ -591,6 +601,7 @@ volatile uint32_t ulDummy = 0UL;
     static void prvSetupMPU( void ) /* PRIVILEGED_FUNCTION */
     {
         #if defined( __ARMCC_VERSION )
+
             /* Declaration when these variable are defined in code instead of being
              * exported from linker scripts. */
             extern uint32_t * __privileged_functions_start__;
@@ -601,7 +612,7 @@ volatile uint32_t ulDummy = 0UL;
             extern uint32_t * __unprivileged_flash_end__;
             extern uint32_t * __privileged_sram_start__;
             extern uint32_t * __privileged_sram_end__;
-	#else
+        #else  /* if defined( __ARMCC_VERSION ) */
             /* Declaration when these variable are exported from linker scripts. */
             extern uint32_t __privileged_functions_start__[];
             extern uint32_t __privileged_functions_end__[];
@@ -754,6 +765,7 @@ void vPortSVCHandler_C( uint32_t *pulCallerStackAddress ) /* PRIVILEGED_FUNCTION
 {
     #if ( configENABLE_MPU == 1 )
         #if defined( __ARMCC_VERSION )
+
             /* Declaration when these variable are defined in code instead of being
              * exported from linker scripts. */
             extern uint32_t * __syscalls_flash_start__;
@@ -784,7 +796,7 @@ uint8_t ucSVCNumber;
     {
         #if ( configENABLE_TRUSTZONE == 1 )
             case portSVC_ALLOCATE_SECURE_CONTEXT:
-			{
+
                 /* R0 contains the stack size passed as parameter to the
                  * vPortAllocateSecureContext function. */
                 ulR0 = pulCallerStackAddress[ 0 ];
@@ -801,7 +813,7 @@ uint8_t ucSVCNumber;
                     /* Allocate and load a context for the secure task. */
                     xSecureContext = SecureContext_AllocateContext( ulR0, ulIsTaskPrivileged );
                 }
-				#else
+                #else  /* if ( configENABLE_MPU == 1 ) */
                 {
                     /* Allocate and load a context for the secure task. */
                     xSecureContext = SecureContext_AllocateContext( ulR0 );
@@ -810,22 +822,18 @@ uint8_t ucSVCNumber;
 
                 configASSERT( xSecureContext != NULL );
                 SecureContext_LoadContext( xSecureContext );
-			}
                 break;
 
             case portSVC_FREE_SECURE_CONTEXT:
-			{
                 /* R0 contains the secure context handle to be freed. */
                 ulR0 = pulCallerStackAddress[ 0 ];
 
                 /* Free the secure context. */
                 SecureContext_FreeContext( ( SecureContextHandle_t ) ulR0 );
-			}
                 break;
         #endif /* configENABLE_TRUSTZONE */
 
         case portSVC_START_SCHEDULER:
-		{
             #if ( configENABLE_TRUSTZONE == 1 )
             {
                 /* De-prioritize the non-secure exceptions so that the
@@ -847,36 +855,39 @@ uint8_t ucSVCNumber;
             /* Setup the context of the first task so that the first task starts
              * executing. */
             vRestoreContextOfFirstTask();
-		}
             break;
 
             #if ( configENABLE_MPU == 1 )
                 case portSVC_RAISE_PRIVILEGE:
-			{
+
                     /* Only raise the privilege, if the svc was raised from any of
                      * the system calls. */
-				if( ulPC >= ( uint32_t ) __syscalls_flash_start__ &&
+                    if( ( ulPC >= ( uint32_t ) __syscalls_flash_start__ ) &&
-					ulPC <= ( uint32_t ) __syscalls_flash_end__ )
+                        ( ulPC <= ( uint32_t ) __syscalls_flash_end__ ) )
                     {
                         vRaisePrivilege();
                     }
-			}
                     break;
             #endif /* configENABLE_MPU */
 
         default:
-		{
             /* Incorrect SVC call. */
             configASSERT( pdFALSE );
     }
 }
-}
 /*-----------------------------------------------------------*/
 
 #if ( configENABLE_MPU == 1 )
-	StackType_t *pxPortInitialiseStack( StackType_t *pxTopOfStack, StackType_t *pxEndOfStack, TaskFunction_t pxCode, void *pvParameters, BaseType_t xRunPrivileged ) /* PRIVILEGED_FUNCTION */
+    StackType_t * pxPortInitialiseStack( StackType_t * pxTopOfStack,
+                                         StackType_t * pxEndOfStack,
+                                         TaskFunction_t pxCode,
+                                         void * pvParameters,
+                                         BaseType_t xRunPrivileged )                                                                                                 /* PRIVILEGED_FUNCTION */
 #else
-	StackType_t *pxPortInitialiseStack( StackType_t *pxTopOfStack, StackType_t *pxEndOfStack, TaskFunction_t pxCode, void *pvParameters ) /* PRIVILEGED_FUNCTION */
+    StackType_t * pxPortInitialiseStack( StackType_t * pxTopOfStack,
+                                         StackType_t * pxEndOfStack,
+                                         TaskFunction_t pxCode,
+                                         void * pvParameters )                                                                            /* PRIVILEGED_FUNCTION */
 #endif /* configENABLE_MPU */
 {
     /* Simulate the stack frame as it would be created by a context switch
@@ -897,6 +908,7 @@ uint8_t ucSVCNumber;
             #if ( configENABLE_MPU == 1 )
                 {
                     pxTopOfStack--;
+
                     if( xRunPrivileged == pdTRUE )
                     {
                         *pxTopOfStack = portINITIAL_CONTROL_PRIVILEGED; /* Slot used to hold this task's CONTROL value. */
@@ -958,6 +970,7 @@ uint8_t ucSVCNumber;
             #if ( configENABLE_MPU == 1 )
                 {
                     pxTopOfStack--;
+
                     if( xRunPrivileged == pdTRUE )
                     {
                         *pxTopOfStack = portINITIAL_CONTROL_PRIVILEGED; /* Slot used to hold this task's CONTROL value. */
@@ -988,8 +1001,8 @@ uint8_t ucSVCNumber;
 BaseType_t xPortStartScheduler( void ) /* PRIVILEGED_FUNCTION */
 {
     /* Make PendSV, CallSV and SysTick the same priority as the kernel. */
-	portNVIC_SYSPRI2_REG |= portNVIC_PENDSV_PRI;
+    portNVIC_SHPR3_REG |= portNVIC_PENDSV_PRI;
-	portNVIC_SYSPRI2_REG |= portNVIC_SYSTICK_PRI;
+    portNVIC_SHPR3_REG |= portNVIC_SYSTICK_PRI;
 
     #if ( configENABLE_MPU == 1 )
         {
@@ -1031,10 +1044,23 @@ void vPortEndScheduler( void ) /* PRIVILEGED_FUNCTION */
 /*-----------------------------------------------------------*/
 
 #if ( configENABLE_MPU == 1 )
-	void vPortStoreTaskMPUSettings( xMPU_SETTINGS *xMPUSettings, const struct xMEMORY_REGION * const xRegions, StackType_t *pxBottomOfStack, uint32_t ulStackDepth )
+    void vPortStoreTaskMPUSettings( xMPU_SETTINGS * xMPUSettings,
+                                    const struct xMEMORY_REGION * const xRegions,
+                                    StackType_t * pxBottomOfStack,
+                                    uint32_t ulStackDepth )
     {
         uint32_t ulRegionStartAddress, ulRegionEndAddress, ulRegionNumber;
         int32_t lIndex = 0;
+        #if defined( __ARMCC_VERSION )
+            /* Declaration when these variable are defined in code instead of being
+             * exported from linker scripts. */
+            extern uint32_t * __privileged_sram_start__;
+            extern uint32_t * __privileged_sram_end__;
+        #else
+            /* Declaration when these variable are exported from linker scripts. */
+            extern uint32_t __privileged_sram_start__[];
+            extern uint32_t __privileged_sram_end__[];
+        #endif /* defined( __ARMCC_VERSION ) */
 
         /* Setup MAIR0. */
         xMPUSettings->ulMAIR0 = ( ( portMPU_NORMAL_MEMORY_BUFFERABLE_CACHEABLE << portMPU_MAIR_ATTR0_POS ) & portMPU_MAIR_ATTR0_MASK );
@@ -1046,9 +1072,23 @@ void vPortEndScheduler( void ) /* PRIVILEGED_FUNCTION */
          * the stack region has already been configured. */
         if( ulStackDepth > 0 )
         {
-			/* Define the region that allows access to the stack. */
+            ulRegionStartAddress = ( uint32_t ) pxBottomOfStack;
-			ulRegionStartAddress = ( ( uint32_t ) pxBottomOfStack ) & portMPU_RBAR_ADDRESS_MASK;
             ulRegionEndAddress = ( uint32_t ) pxBottomOfStack + ( ulStackDepth * ( uint32_t ) sizeof( StackType_t ) ) - 1;
+
+            /* If the stack is within the privileged SRAM, do not protect it
+             * using a separate MPU region. This is needed because privileged
+             * SRAM is already protected using an MPU region and ARMv8-M does
+             * not allow overlapping MPU regions. */
+            if( ulRegionStartAddress >= ( uint32_t ) __privileged_sram_start__ &&
+                ulRegionEndAddress <= ( uint32_t ) __privileged_sram_end__ )
+            {
+                xMPUSettings->xRegionsSettings[ 0 ].ulRBAR = 0;
+                xMPUSettings->xRegionsSettings[ 0 ].ulRLAR = 0;
+            }
+            else
+            {
+                /* Define the region that allows access to the stack. */
+                ulRegionStartAddress &= portMPU_RBAR_ADDRESS_MASK;
                 ulRegionEndAddress  &= portMPU_RLAR_ADDRESS_MASK;
 
                 xMPUSettings->xRegionsSettings[ 0 ].ulRBAR = ( ulRegionStartAddress ) |
@@ -1060,6 +1100,7 @@ void vPortEndScheduler( void ) /* PRIVILEGED_FUNCTION */
                                                              ( portMPU_RLAR_ATTR_INDEX0 ) |
                                                              ( portMPU_RLAR_REGION_ENABLE );
             }
+        }
 
         /* User supplied configurable regions. */
         for( ulRegionNumber = 1; ulRegionNumber <= portNUM_CONFIGURABLE_REGIONS; ulRegionNumber++ )

portable/RVDS/ARM_CM7/r0p1/port.c

@@ -22,7 +22,6 @@
  * http://www.FreeRTOS.org
  * http://aws.amazon.com/freertos
  *
- * 1 tab == 4 spaces!
  */
 
 /*-----------------------------------------------------------

portable/RVDS/ARM_CM7/r0p1/portmacro.h

@@ -22,7 +22,6 @@
  * http://www.FreeRTOS.org
  * http://aws.amazon.com/freertos
  *
- * 1 tab == 4 spaces!
  */