/*\r
- * FreeRTOS Kernel V10.2.0\r
+ * FreeRTOS Kernel V10.2.1\r
* Copyright (C) 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.\r
*\r
* Permission is hereby granted, free of charge, to any person obtaining a copy of\r
/* Standard includes. */\r
#include <stdint.h>\r
\r
+/* Defining MPU_WRAPPERS_INCLUDED_FROM_API_FILE ensures that PRIVILEGED_FUNCTION\r
+ * is defined correctly and privileged functions are placed in correct sections. */\r
+#define MPU_WRAPPERS_INCLUDED_FROM_API_FILE\r
+\r
/* Portasm includes. */\r
#include "portasm.h"\r
\r
+/* MPU_WRAPPERS_INCLUDED_FROM_API_FILE is needed to be defined only for the\r
+ * header files. */\r
+#undef MPU_WRAPPERS_INCLUDED_FROM_API_FILE\r
+\r
void vRestoreContextOfFirstTask( void ) /* __attribute__ (( naked )) PRIVILEGED_FUNCTION */\r
{\r
__asm volatile\r
" ldr r0, [r3] \n" /* Read top of stack from TCB - The first item in pxCurrentTCB is the task top of stack. */\r
" \n"\r
#if( configENABLE_MPU == 1 )\r
+ " dmb \n" /* Complete outstanding transfers before disabling MPU. */\r
+ " ldr r2, xMPUCTRLConst2 \n" /* r2 = 0xe000ed94 [Location of MPU_CTRL]. */\r
+ " ldr r4, [r2] \n" /* Read the value of MPU_CTRL. */\r
+ " bic r4, #1 \n" /* r4 = r4 & ~1 i.e. Clear the bit 0 in r4. */\r
+ " str r4, [r2] \n" /* Disable MPU. */\r
+ " \n"\r
" adds r3, #4 \n" /* r3 = r3 + 4. r3 now points to MAIR0 in TCB. */\r
" ldr r4, [r3] \n" /* r4 = *r3 i.e. r4 = MAIR0. */\r
" ldr r2, xMAIR0Const2 \n" /* r2 = 0xe000edc0 [Location of MAIR0]. */\r
" ldr r2, xRBARConst2 \n" /* r2 = 0xe000ed9c [Location of RBAR]. */\r
" ldmia r3!, {r4-r11} \n" /* Read 4 set of RBAR/RLAR registers from TCB. */\r
" stmia r2!, {r4-r11} \n" /* Write 4 set of RBAR/RLAR registers using alias registers. */\r
+ " \n"\r
+ " ldr r2, xMPUCTRLConst2 \n" /* r2 = 0xe000ed94 [Location of MPU_CTRL]. */\r
+ " ldr r4, [r2] \n" /* Read the value of MPU_CTRL. */\r
+ " orr r4, #1 \n" /* r4 = r4 | 1 i.e. Set the bit 0 in r4. */\r
+ " str r4, [r2] \n" /* Enable MPU. */\r
+ " dsb \n" /* Force memory writes before continuing. */\r
#endif /* configENABLE_MPU */\r
" \n"\r
#if( configENABLE_MPU == 1 )\r
"pxCurrentTCBConst2: .word pxCurrentTCB \n"\r
"xSecureContextConst2: .word xSecureContext \n"\r
#if( configENABLE_MPU == 1 )\r
+ "xMPUCTRLConst2: .word 0xe000ed94 \n"\r
"xMAIR0Const2: .word 0xe000edc0 \n"\r
"xRNRConst2: .word 0xe000ed98 \n"\r
"xRBARConst2: .word 0xe000ed9c \n"\r
}\r
/*-----------------------------------------------------------*/\r
\r
-uint32_t ulSetInterruptMaskFromISR( void ) /* __attribute__(( naked )) PRIVILEGED_FUNCTION */\r
+uint32_t ulSetInterruptMask( void ) /* __attribute__(( naked )) PRIVILEGED_FUNCTION */\r
{\r
__asm volatile\r
(\r
- " mrs r0, PRIMASK \n"\r
- " cpsid i \n"\r
- " bx lr \n"\r
- ::: "memory"\r
+ " mrs r0, basepri \n" /* r0 = basepri. Return original basepri value. */\r
+ " mov r1, %0 \n" /* r1 = configMAX_SYSCALL_INTERRUPT_PRIORITY. */\r
+ " msr basepri, r1 \n" /* Disable interrupts upto configMAX_SYSCALL_INTERRUPT_PRIORITY. */\r
+ " dsb \n"\r
+ " isb \n"\r
+ " bx lr \n" /* Return. */\r
+ :: "i" ( configMAX_SYSCALL_INTERRUPT_PRIORITY ) : "memory"\r
);\r
-\r
-#if !defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)\r
- /* To avoid compiler warnings. The return statement will never be reached,\r
- * but some compilers warn if it is not included, while others won't compile\r
- * if it is. */\r
- return 0;\r
-#endif\r
}\r
/*-----------------------------------------------------------*/\r
\r
-void vClearInterruptMaskFromISR( __attribute__( ( unused ) ) uint32_t ulMask ) /* __attribute__(( naked )) PRIVILEGED_FUNCTION */\r
+void vClearInterruptMask( __attribute__( ( unused ) ) uint32_t ulMask ) /* __attribute__(( naked )) PRIVILEGED_FUNCTION */\r
{\r
__asm volatile\r
(\r
- " msr PRIMASK, r0 \n"\r
- " bx lr \n"\r
+ " msr basepri, r0 \n" /* basepri = ulMask. */\r
+ " dsb \n"\r
+ " isb \n"\r
+ " bx lr \n" /* Return. */\r
::: "memory"\r
);\r
-\r
-#if !defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)\r
- /* Just to avoid compiler warning. ulMask is used from the asm code but\r
- * the compiler can't see that. Some compilers generate warnings without\r
- * the following line, while others generate warnings if the line is\r
- * included. */\r
- ( void ) ulMask;\r
-#endif\r
}\r
/*-----------------------------------------------------------*/\r
\r
#endif /* configENABLE_MPU */\r
" \n"\r
" select_next_task: \n"\r
- " cpsid i \n"\r
+ " mov r0, %0 \n" /* r0 = configMAX_SYSCALL_INTERRUPT_PRIORITY */\r
+ " msr basepri, r0 \n" /* Disable interrupts upto configMAX_SYSCALL_INTERRUPT_PRIORITY. */\r
+ " dsb \n"\r
+ " isb \n"\r
" bl vTaskSwitchContext \n"\r
- " cpsie i \n"\r
+ " mov r0, #0 \n" /* r0 = 0. */\r
+ " msr basepri, r0 \n" /* Enable interrupts. */\r
" \n"\r
" ldr r2, pxCurrentTCBConst \n" /* Read the location of pxCurrentTCB i.e. &( pxCurrentTCB ). */\r
" ldr r3, [r2] \n" /* Read pxCurrentTCB. */\r
" ldr r1, [r3] \n" /* The first item in pxCurrentTCB is the task top of stack. r1 now points to the top of stack. */\r
" \n"\r
#if( configENABLE_MPU == 1 )\r
+ " dmb \n" /* Complete outstanding transfers before disabling MPU. */\r
+ " ldr r2, xMPUCTRLConst \n" /* r2 = 0xe000ed94 [Location of MPU_CTRL]. */\r
+ " ldr r4, [r2] \n" /* Read the value of MPU_CTRL. */\r
+ " bic r4, #1 \n" /* r4 = r4 & ~1 i.e. Clear the bit 0 in r4. */\r
+ " str r4, [r2] \n" /* Disable MPU. */\r
+ " \n"\r
" adds r3, #4 \n" /* r3 = r3 + 4. r3 now points to MAIR0 in TCB. */\r
" ldr r4, [r3] \n" /* r4 = *r3 i.e. r4 = MAIR0. */\r
" ldr r2, xMAIR0Const \n" /* r2 = 0xe000edc0 [Location of MAIR0]. */\r
" ldr r2, xRBARConst \n" /* r2 = 0xe000ed9c [Location of RBAR]. */\r
" ldmia r3!, {r4-r11} \n" /* Read 4 sets of RBAR/RLAR registers from TCB. */\r
" stmia r2!, {r4-r11} \n" /* Write 4 set of RBAR/RLAR registers using alias registers. */\r
+ " \n"\r
+ " ldr r2, xMPUCTRLConst \n" /* r2 = 0xe000ed94 [Location of MPU_CTRL]. */\r
+ " ldr r4, [r2] \n" /* Read the value of MPU_CTRL. */\r
+ " orr r4, #1 \n" /* r4 = r4 | 1 i.e. Set the bit 0 in r4. */\r
+ " str r4, [r2] \n" /* Enable MPU. */\r
+ " dsb \n" /* Force memory writes before continuing. */\r
#endif /* configENABLE_MPU */\r
" \n"\r
#if( configENABLE_MPU == 1 )\r
"pxCurrentTCBConst: .word pxCurrentTCB \n"\r
"xSecureContextConst: .word xSecureContext \n"\r
#if( configENABLE_MPU == 1 )\r
+ "xMPUCTRLConst: .word 0xe000ed94 \n"\r
"xMAIR0Const: .word 0xe000edc0 \n"\r
"xRNRConst: .word 0xe000ed98 \n"\r
"xRBARConst: .word 0xe000ed9c \n"\r
#endif /* configENABLE_MPU */\r
+ :: "i"( configMAX_SYSCALL_INTERRUPT_PRIORITY )\r
);\r
}\r
/*-----------------------------------------------------------*/\r
projects / freertos / blobdiff