mirror of
https://github.com/FreeRTOS/FreeRTOS-Kernel.git
synced 2025-04-24 07:21:57 -04:00
Enable ARMv7-M MPU ports to place FreeRTOS kernel code outside of flash (#46)
Problem Description ------------------- The current flash organization in ARMv7-M MPU ports looks as follows: __FLASH_segment_start__ ------->+-----------+<----- __FLASH_segment_start__ | Vector | | Table | | + | | Kernel | | Code | +-----------+<----- __privileged_functions_end__ | | | | | | | Other | | Code | | | | | | | __FLASH_segment_end__ ------>+-----------+ The FreeRTOS kernel sets up the following MPU regions: * Unprivileged Code - __FLASH_segment_start__ to __FLASH_segment_end__. * Privileged Code - __FLASH_segment_start__ to __privileged_functions_end__. The above setup assumes that the FreeRTOS kernel code (i.e. privileged_functions) is placed at the beginning of the flash and, therefore, uses __FLASH_segment_start__ as the starting location of the privileged code. This prevents a user from placing the FreeRTOS kernel code outside of flash (say to an external RAM) and still have vector table at the beginning of flash (which is many times a hardware requirement). Solution -------- This commit addresses the above limitation by using a new variable __privileged_functions_start__ as the starting location of the privileged code. This enables users to place the FreeRTOS kernel code wherever they choose. The FreeRTOS kernel now sets up the following MPU regions: * Unprivileged Code - __FLASH_segment_start__ to __FLASH_segment_end__. * Privileged Code - __privileged_functions_start__ to __privileged_functions_end__. As a result, a user can now place the kernel code to an external RAM. A possible organization is: Flash External RAM +------------+ +-----------+<------ __privileged_functions_start__ | Vector | | | | Table | | | | | | | __FLASH_segment_start__ ----->+------------+ | Kernel | | | | Code | | | | | | | | | | | | | | Other | | | | Code | +-----------+<------ __privileged_functions_end__ | | | | | | __FLASH_segment_end__ ----->+------------+ Note that the above configuration places the vector table in an unmapped region. This is okay because we enable the background region, and so the vector table will still be accessible to the privileged code and not accessible to the unprivileged code (vector table is only needed by the privileged code). Backward Compatibility ---------------------- The FreeRTOS kernel code now uses a new variable, namely __privileged_functions_start__, which needs to be exported from linker script to indicate the starting location of the privileged code. All of our existing demos already export this variable and therefore, they will continue to work. If a user has created a project which does not export this variable, they will get a linker error for unresolved symbol __privileged_functions_start__. They need to export a variable __privileged_functions_start__ with the value equal to __FLASH_segment_start__. Issue ----- https://sourceforge.net/p/freertos/feature-requests/56/ Signed-off-by: Gaurav Aggarwal <aggarg@amazon.com>
This commit is contained in:
parent
464695a4f2
commit
334de5d8ab
|
@ -584,6 +584,7 @@ __attribute__(( weak )) void vPortSetupTimerInterrupt( void )
|
||||||
|
|
||||||
static void prvSetupMPU( void )
|
static void prvSetupMPU( void )
|
||||||
{
|
{
|
||||||
|
extern uint32_t __privileged_functions_start__[];
|
||||||
extern uint32_t __privileged_functions_end__[];
|
extern uint32_t __privileged_functions_end__[];
|
||||||
extern uint32_t __FLASH_segment_start__[];
|
extern uint32_t __FLASH_segment_start__[];
|
||||||
extern uint32_t __FLASH_segment_end__[];
|
extern uint32_t __FLASH_segment_end__[];
|
||||||
|
@ -593,7 +594,7 @@ extern uint32_t __privileged_data_end__[];
|
||||||
/* Check the expected MPU is present. */
|
/* Check the expected MPU is present. */
|
||||||
if( portMPU_TYPE_REG == portEXPECTED_MPU_TYPE_VALUE )
|
if( portMPU_TYPE_REG == portEXPECTED_MPU_TYPE_VALUE )
|
||||||
{
|
{
|
||||||
/* First setup the entire flash for unprivileged read only access. */
|
/* First setup the unprivileged flash for unprivileged read only access. */
|
||||||
portMPU_REGION_BASE_ADDRESS_REG = ( ( uint32_t ) __FLASH_segment_start__ ) | /* Base address. */
|
portMPU_REGION_BASE_ADDRESS_REG = ( ( uint32_t ) __FLASH_segment_start__ ) | /* Base address. */
|
||||||
( portMPU_REGION_VALID ) |
|
( portMPU_REGION_VALID ) |
|
||||||
( portUNPRIVILEGED_FLASH_REGION );
|
( portUNPRIVILEGED_FLASH_REGION );
|
||||||
|
@ -603,16 +604,15 @@ extern uint32_t __privileged_data_end__[];
|
||||||
( prvGetMPURegionSizeSetting( ( uint32_t ) __FLASH_segment_end__ - ( uint32_t ) __FLASH_segment_start__ ) ) |
|
( prvGetMPURegionSizeSetting( ( uint32_t ) __FLASH_segment_end__ - ( uint32_t ) __FLASH_segment_start__ ) ) |
|
||||||
( portMPU_REGION_ENABLE );
|
( portMPU_REGION_ENABLE );
|
||||||
|
|
||||||
/* Setup the first 16K for privileged only access (even though less
|
/* Setup the privileged flash for privileged only access. This is where
|
||||||
* than 10K is actually being used). This is where the kernel code is
|
* the kernel code is * placed. */
|
||||||
* placed. */
|
portMPU_REGION_BASE_ADDRESS_REG = ( ( uint32_t ) __privileged_functions_start__ ) | /* Base address. */
|
||||||
portMPU_REGION_BASE_ADDRESS_REG = ( ( uint32_t ) __FLASH_segment_start__ ) | /* Base address. */
|
|
||||||
( portMPU_REGION_VALID ) |
|
( portMPU_REGION_VALID ) |
|
||||||
( portPRIVILEGED_FLASH_REGION );
|
( portPRIVILEGED_FLASH_REGION );
|
||||||
|
|
||||||
portMPU_REGION_ATTRIBUTE_REG = ( portMPU_REGION_PRIVILEGED_READ_ONLY ) |
|
portMPU_REGION_ATTRIBUTE_REG = ( portMPU_REGION_PRIVILEGED_READ_ONLY ) |
|
||||||
( portMPU_REGION_CACHEABLE_BUFFERABLE ) |
|
( portMPU_REGION_CACHEABLE_BUFFERABLE ) |
|
||||||
( prvGetMPURegionSizeSetting( ( uint32_t ) __privileged_functions_end__ - ( uint32_t ) __FLASH_segment_start__ ) ) |
|
( prvGetMPURegionSizeSetting( ( uint32_t ) __privileged_functions_end__ - ( uint32_t ) __privileged_functions_start__ ) ) |
|
||||||
( portMPU_REGION_ENABLE );
|
( portMPU_REGION_ENABLE );
|
||||||
|
|
||||||
/* Setup the privileged data RAM region. This is where the kernel data
|
/* Setup the privileged data RAM region. This is where the kernel data
|
||||||
|
|
|
@ -640,6 +640,7 @@ static void prvSetupMPU( void )
|
||||||
#if defined( __ARMCC_VERSION )
|
#if defined( __ARMCC_VERSION )
|
||||||
/* Declaration when these variable are defined in code instead of being
|
/* Declaration when these variable are defined in code instead of being
|
||||||
* exported from linker scripts. */
|
* exported from linker scripts. */
|
||||||
|
extern uint32_t * __privileged_functions_start__;
|
||||||
extern uint32_t * __privileged_functions_end__;
|
extern uint32_t * __privileged_functions_end__;
|
||||||
extern uint32_t * __FLASH_segment_start__;
|
extern uint32_t * __FLASH_segment_start__;
|
||||||
extern uint32_t * __FLASH_segment_end__;
|
extern uint32_t * __FLASH_segment_end__;
|
||||||
|
@ -647,6 +648,7 @@ static void prvSetupMPU( void )
|
||||||
extern uint32_t * __privileged_data_end__;
|
extern uint32_t * __privileged_data_end__;
|
||||||
#else
|
#else
|
||||||
/* Declaration when these variable are exported from linker scripts. */
|
/* Declaration when these variable are exported from linker scripts. */
|
||||||
|
extern uint32_t __privileged_functions_start__[];
|
||||||
extern uint32_t __privileged_functions_end__[];
|
extern uint32_t __privileged_functions_end__[];
|
||||||
extern uint32_t __FLASH_segment_start__[];
|
extern uint32_t __FLASH_segment_start__[];
|
||||||
extern uint32_t __FLASH_segment_end__[];
|
extern uint32_t __FLASH_segment_end__[];
|
||||||
|
@ -656,7 +658,7 @@ static void prvSetupMPU( void )
|
||||||
/* Check the expected MPU is present. */
|
/* Check the expected MPU is present. */
|
||||||
if( portMPU_TYPE_REG == portEXPECTED_MPU_TYPE_VALUE )
|
if( portMPU_TYPE_REG == portEXPECTED_MPU_TYPE_VALUE )
|
||||||
{
|
{
|
||||||
/* First setup the entire flash for unprivileged read only access. */
|
/* First setup the unprivileged flash for unprivileged read only access. */
|
||||||
portMPU_REGION_BASE_ADDRESS_REG = ( ( uint32_t ) __FLASH_segment_start__ ) | /* Base address. */
|
portMPU_REGION_BASE_ADDRESS_REG = ( ( uint32_t ) __FLASH_segment_start__ ) | /* Base address. */
|
||||||
( portMPU_REGION_VALID ) |
|
( portMPU_REGION_VALID ) |
|
||||||
( portUNPRIVILEGED_FLASH_REGION );
|
( portUNPRIVILEGED_FLASH_REGION );
|
||||||
|
@ -666,16 +668,15 @@ static void prvSetupMPU( void )
|
||||||
( prvGetMPURegionSizeSetting( ( uint32_t ) __FLASH_segment_end__ - ( uint32_t ) __FLASH_segment_start__ ) ) |
|
( prvGetMPURegionSizeSetting( ( uint32_t ) __FLASH_segment_end__ - ( uint32_t ) __FLASH_segment_start__ ) ) |
|
||||||
( portMPU_REGION_ENABLE );
|
( portMPU_REGION_ENABLE );
|
||||||
|
|
||||||
/* Setup the first nK for privileged only access (even though less
|
/* Setup the privileged flash for privileged only access. This is where
|
||||||
than 10K is actually being used). This is where the kernel code is
|
the kernel code is placed. */
|
||||||
placed. */
|
portMPU_REGION_BASE_ADDRESS_REG = ( ( uint32_t ) __privileged_functions_start__ ) | /* Base address. */
|
||||||
portMPU_REGION_BASE_ADDRESS_REG = ( ( uint32_t ) __FLASH_segment_start__ ) | /* Base address. */
|
|
||||||
( portMPU_REGION_VALID ) |
|
( portMPU_REGION_VALID ) |
|
||||||
( portPRIVILEGED_FLASH_REGION );
|
( portPRIVILEGED_FLASH_REGION );
|
||||||
|
|
||||||
portMPU_REGION_ATTRIBUTE_REG = ( portMPU_REGION_PRIVILEGED_READ_ONLY ) |
|
portMPU_REGION_ATTRIBUTE_REG = ( portMPU_REGION_PRIVILEGED_READ_ONLY ) |
|
||||||
( portMPU_REGION_CACHEABLE_BUFFERABLE ) |
|
( portMPU_REGION_CACHEABLE_BUFFERABLE ) |
|
||||||
( prvGetMPURegionSizeSetting( ( uint32_t ) __privileged_functions_end__ - ( uint32_t ) __FLASH_segment_start__ ) ) |
|
( prvGetMPURegionSizeSetting( ( uint32_t ) __privileged_functions_end__ - ( uint32_t ) __privileged_functions_start__ ) ) |
|
||||||
( portMPU_REGION_ENABLE );
|
( portMPU_REGION_ENABLE );
|
||||||
|
|
||||||
/* Setup the privileged data RAM region. This is where the kernel data
|
/* Setup the privileged data RAM region. This is where the kernel data
|
||||||
|
|
|
@ -506,6 +506,7 @@ __weak void vPortSetupTimerInterrupt( void )
|
||||||
|
|
||||||
static void prvSetupMPU( void )
|
static void prvSetupMPU( void )
|
||||||
{
|
{
|
||||||
|
extern uint32_t __privileged_functions_start__[];
|
||||||
extern uint32_t __privileged_functions_end__[];
|
extern uint32_t __privileged_functions_end__[];
|
||||||
extern uint32_t __FLASH_segment_start__[];
|
extern uint32_t __FLASH_segment_start__[];
|
||||||
extern uint32_t __FLASH_segment_end__[];
|
extern uint32_t __FLASH_segment_end__[];
|
||||||
|
@ -515,7 +516,7 @@ extern uint32_t __privileged_data_end__[];
|
||||||
/* Check the expected MPU is present. */
|
/* Check the expected MPU is present. */
|
||||||
if( portMPU_TYPE_REG == portEXPECTED_MPU_TYPE_VALUE )
|
if( portMPU_TYPE_REG == portEXPECTED_MPU_TYPE_VALUE )
|
||||||
{
|
{
|
||||||
/* First setup the entire flash for unprivileged read only access. */
|
/* First setup the unprivileged flash for unprivileged read only access. */
|
||||||
portMPU_REGION_BASE_ADDRESS_REG = ( ( uint32_t ) __FLASH_segment_start__ ) | /* Base address. */
|
portMPU_REGION_BASE_ADDRESS_REG = ( ( uint32_t ) __FLASH_segment_start__ ) | /* Base address. */
|
||||||
( portMPU_REGION_VALID ) |
|
( portMPU_REGION_VALID ) |
|
||||||
( portUNPRIVILEGED_FLASH_REGION );
|
( portUNPRIVILEGED_FLASH_REGION );
|
||||||
|
@ -525,16 +526,15 @@ extern uint32_t __privileged_data_end__[];
|
||||||
( prvGetMPURegionSizeSetting( ( uint32_t ) __FLASH_segment_end__ - ( uint32_t ) __FLASH_segment_start__ ) ) |
|
( prvGetMPURegionSizeSetting( ( uint32_t ) __FLASH_segment_end__ - ( uint32_t ) __FLASH_segment_start__ ) ) |
|
||||||
( portMPU_REGION_ENABLE );
|
( portMPU_REGION_ENABLE );
|
||||||
|
|
||||||
/* Setup the first 16K for privileged only access (even though less
|
/* Setup the privileged flash for privileged only access. This is where
|
||||||
* than 10K is actually being used). This is where the kernel code is
|
* the kernel code is placed. */
|
||||||
* placed. */
|
portMPU_REGION_BASE_ADDRESS_REG = ( ( uint32_t ) __privileged_functions_start__ ) | /* Base address. */
|
||||||
portMPU_REGION_BASE_ADDRESS_REG = ( ( uint32_t ) __FLASH_segment_start__ ) | /* Base address. */
|
|
||||||
( portMPU_REGION_VALID ) |
|
( portMPU_REGION_VALID ) |
|
||||||
( portPRIVILEGED_FLASH_REGION );
|
( portPRIVILEGED_FLASH_REGION );
|
||||||
|
|
||||||
portMPU_REGION_ATTRIBUTE_REG = ( portMPU_REGION_PRIVILEGED_READ_ONLY ) |
|
portMPU_REGION_ATTRIBUTE_REG = ( portMPU_REGION_PRIVILEGED_READ_ONLY ) |
|
||||||
( portMPU_REGION_CACHEABLE_BUFFERABLE ) |
|
( portMPU_REGION_CACHEABLE_BUFFERABLE ) |
|
||||||
( prvGetMPURegionSizeSetting( ( uint32_t ) __privileged_functions_end__ - ( uint32_t ) __FLASH_segment_start__ ) ) |
|
( prvGetMPURegionSizeSetting( ( uint32_t ) __privileged_functions_end__ - ( uint32_t ) __privileged_functions_start__ ) ) |
|
||||||
( portMPU_REGION_ENABLE );
|
( portMPU_REGION_ENABLE );
|
||||||
|
|
||||||
/* Setup the privileged data RAM region. This is where the kernel data
|
/* Setup the privileged data RAM region. This is where the kernel data
|
||||||
|
|
|
@ -638,6 +638,7 @@ __asm void vPortEnableVFP( void )
|
||||||
|
|
||||||
static void prvSetupMPU( void )
|
static void prvSetupMPU( void )
|
||||||
{
|
{
|
||||||
|
extern uint32_t __privileged_functions_start__;
|
||||||
extern uint32_t __privileged_functions_end__;
|
extern uint32_t __privileged_functions_end__;
|
||||||
extern uint32_t __FLASH_segment_start__;
|
extern uint32_t __FLASH_segment_start__;
|
||||||
extern uint32_t __FLASH_segment_end__;
|
extern uint32_t __FLASH_segment_end__;
|
||||||
|
@ -647,7 +648,7 @@ extern uint32_t __privileged_data_end__;
|
||||||
/* Check the expected MPU is present. */
|
/* Check the expected MPU is present. */
|
||||||
if( portMPU_TYPE_REG == portEXPECTED_MPU_TYPE_VALUE )
|
if( portMPU_TYPE_REG == portEXPECTED_MPU_TYPE_VALUE )
|
||||||
{
|
{
|
||||||
/* First setup the entire flash for unprivileged read only access. */
|
/* First setup the unprivileged flash for unprivileged read only access. */
|
||||||
portMPU_REGION_BASE_ADDRESS_REG = ( ( uint32_t ) __FLASH_segment_start__ ) | /* Base address. */
|
portMPU_REGION_BASE_ADDRESS_REG = ( ( uint32_t ) __FLASH_segment_start__ ) | /* Base address. */
|
||||||
( portMPU_REGION_VALID ) |
|
( portMPU_REGION_VALID ) |
|
||||||
( portUNPRIVILEGED_FLASH_REGION );
|
( portUNPRIVILEGED_FLASH_REGION );
|
||||||
|
@ -657,16 +658,15 @@ extern uint32_t __privileged_data_end__;
|
||||||
( prvGetMPURegionSizeSetting( ( uint32_t ) __FLASH_segment_end__ - ( uint32_t ) __FLASH_segment_start__ ) ) |
|
( prvGetMPURegionSizeSetting( ( uint32_t ) __FLASH_segment_end__ - ( uint32_t ) __FLASH_segment_start__ ) ) |
|
||||||
( portMPU_REGION_ENABLE );
|
( portMPU_REGION_ENABLE );
|
||||||
|
|
||||||
/* Setup the first 16K for privileged only access (even though less
|
/* Setup the privileged flash for privileged only access. This is where
|
||||||
* than 10K is actually being used). This is where the kernel code is
|
* the kernel code is placed. */
|
||||||
* placed. */
|
portMPU_REGION_BASE_ADDRESS_REG = ( ( uint32_t ) __privileged_functions_start__ ) | /* Base address. */
|
||||||
portMPU_REGION_BASE_ADDRESS_REG = ( ( uint32_t ) __FLASH_segment_start__ ) | /* Base address. */
|
|
||||||
( portMPU_REGION_VALID ) |
|
( portMPU_REGION_VALID ) |
|
||||||
( portPRIVILEGED_FLASH_REGION );
|
( portPRIVILEGED_FLASH_REGION );
|
||||||
|
|
||||||
portMPU_REGION_ATTRIBUTE_REG = ( portMPU_REGION_PRIVILEGED_READ_ONLY ) |
|
portMPU_REGION_ATTRIBUTE_REG = ( portMPU_REGION_PRIVILEGED_READ_ONLY ) |
|
||||||
( portMPU_REGION_CACHEABLE_BUFFERABLE ) |
|
( portMPU_REGION_CACHEABLE_BUFFERABLE ) |
|
||||||
( prvGetMPURegionSizeSetting( ( uint32_t ) __privileged_functions_end__ - ( uint32_t ) __FLASH_segment_start__ ) ) |
|
( prvGetMPURegionSizeSetting( ( uint32_t ) __privileged_functions_end__ - ( uint32_t ) __privileged_functions_start__ ) ) |
|
||||||
( portMPU_REGION_ENABLE );
|
( portMPU_REGION_ENABLE );
|
||||||
|
|
||||||
/* Setup the privileged data RAM region. This is where the kernel data
|
/* Setup the privileged data RAM region. This is where the kernel data
|
||||||
|
|
Loading…
Reference in a new issue