Update version number in readiness for V10.3.0 release. Sync SVN with reviewed releas...

[freertos] / FreeRTOS / Source / portable / RVDS / ARM_CM4_MPU / portmacro.h

diff --git a/FreeRTOS/Source/portable/RVDS/ARM_CM4_MPU/portmacro.h b/FreeRTOS/Source/portable/RVDS/ARM_CM4_MPU/portmacro.h
index 82fb249b9217b3f612a26a514ee4b9a496312a82..44be29807ccbc9ea6e816bd7ac9fca0a20face74 100644 (file)
--- a/FreeRTOS/Source/portable/RVDS/ARM_CM4_MPU/portmacro.h
+++ b/FreeRTOS/Source/portable/RVDS/ARM_CM4_MPU/portmacro.h
@@ -1,6 +1,6 @@
 /*\r
- * FreeRTOS Kernel V10.1.1\r
- * Copyright (C) 2018 Amazon.com, Inc. or its affiliates.  All Rights Reserved.\r
+ * FreeRTOS Kernel V10.3.0\r
+ * Copyright (C) 2020 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
  * this software and associated documentation files (the "Software"), to deal in\r
@@ -73,19 +73,20 @@ typedef unsigned long UBaseType_t;
 #define portUSING_MPU_WRAPPERS         1\r
 #define portPRIVILEGE_BIT                      ( 0x80000000UL )\r
 \r
-#define portMPU_REGION_READ_WRITE                              ( 0x03UL << 24UL )\r
-#define portMPU_REGION_PRIVILEGED_READ_ONLY            ( 0x05UL << 24UL )\r
-#define portMPU_REGION_READ_ONLY                               ( 0x06UL << 24UL )\r
-#define portMPU_REGION_PRIVILEGED_READ_WRITE   ( 0x01UL << 24UL )\r
-#define portMPU_REGION_CACHEABLE_BUFFERABLE            ( 0x07UL << 16UL )\r
-#define portMPU_REGION_EXECUTE_NEVER                   ( 0x01UL << 28UL )\r
+#define portMPU_REGION_READ_WRITE                                                              ( 0x03UL << 24UL )\r
+#define portMPU_REGION_PRIVILEGED_READ_ONLY                                            ( 0x05UL << 24UL )\r
+#define portMPU_REGION_READ_ONLY                                                               ( 0x06UL << 24UL )\r
+#define portMPU_REGION_PRIVILEGED_READ_WRITE                                   ( 0x01UL << 24UL )\r
+#define portMPU_REGION_PRIVILEGED_READ_WRITE_UNPRIV_READ_ONLY  ( 0x02UL << 24UL )\r
+#define portMPU_REGION_CACHEABLE_BUFFERABLE                                            ( 0x07UL << 16UL )\r
+#define portMPU_REGION_EXECUTE_NEVER                                                   ( 0x01UL << 28UL )\r
 \r
 #define portUNPRIVILEGED_FLASH_REGION          ( 0UL )\r
 #define portPRIVILEGED_FLASH_REGION                    ( 1UL )\r
 #define portPRIVILEGED_RAM_REGION                      ( 2UL )\r
 #define portGENERAL_PERIPHERALS_REGION         ( 3UL )\r
 #define portSTACK_REGION                                       ( 4UL )\r
-#define portFIRST_CONFIGURABLE_REGION      ( 5UL )\r
+#define portFIRST_CONFIGURABLE_REGION          ( 5UL )\r
 #define portLAST_CONFIGURABLE_REGION           ( 7UL )\r
 #define portNUM_CONFIGURABLE_REGIONS           ( ( portLAST_CONFIGURABLE_REGION - portFIRST_CONFIGURABLE_REGION ) + 1 )\r
 #define portTOTAL_NUM_REGIONS                          ( portNUM_CONFIGURABLE_REGIONS + 1 ) /* Plus one to make space for the stack region. */\r
@@ -197,7 +198,28 @@ not necessary for to use this port.  They are defined so the common demo files
 #ifndef portFORCE_INLINE\r
        #define portFORCE_INLINE __forceinline\r
 #endif\r
+/*-----------------------------------------------------------*/\r
+\r
+extern BaseType_t xIsPrivileged( void );\r
+extern void vResetPrivilege( void );\r
+\r
+/**\r
+ * @brief Checks whether or not the processor is privileged.\r
+ *\r
+ * @return 1 if the processor is already privileged, 0 otherwise.\r
+ */\r
+#define portIS_PRIVILEGED()                    xIsPrivileged()\r
+\r
+/**\r
+ * @brief Raise an SVC request to raise privilege.\r
+ */\r
+#define portRAISE_PRIVILEGE()          __asm { svc portSVC_RAISE_PRIVILEGE }\r
 \r
+/**\r
+ * @brief Lowers the privilege level by setting the bit 0 of the CONTROL\r
+ * register.\r
+ */\r
+#define portRESET_PRIVILEGE()          vResetPrivilege()\r
 /*-----------------------------------------------------------*/\r
 \r
 static portFORCE_INLINE void vPortSetBASEPRI( uint32_t ulBASEPRI )\r
@@ -280,24 +302,12 @@ BaseType_t xReturn;
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-/* Set the privilege level to user mode if xRunningPrivileged is false. */\r
-portFORCE_INLINE static void vPortResetPrivilege( BaseType_t xRunningPrivileged )\r
-{\r
-uint32_t ulReg;\r
-\r
-       if( xRunningPrivileged != pdTRUE )\r
-       {\r
-               __asm\r
-               {\r
-                       mrs ulReg, control\r
-                       orr ulReg, #1\r
-                       msr control, ulReg\r
-               }\r
-       }\r
-}\r
+#ifndef configENFORCE_SYSTEM_CALLS_FROM_KERNEL_ONLY\r
+       #warning "configENFORCE_SYSTEM_CALLS_FROM_KERNEL_ONLY is not defined. We recommend defining it to 1 in FreeRTOSConfig.h for better security. https://www.freertos.org/FreeRTOS-V10.3.x.html"\r
+       #define configENFORCE_SYSTEM_CALLS_FROM_KERNEL_ONLY 0\r
+#endif\r
 /*-----------------------------------------------------------*/\r
 \r
-\r
 #ifdef __cplusplus\r
 }\r
 #endif\r