len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-12-09 21:25:15 -05:00
Code Issues Projects Releases Packages Wiki Activity

Clang format port.c with slight tweaks to the format options

Browse source
This commit is contained in:
Soren Ptak 2024-01-02 11:48:21 -05:00
parent 89227494cf
commit 4f65931294
1 changed files with 113 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

207
portable/GCC/ARM_CRx_MPU/port.c
View file

@ -239,8 +239,8 @@ StackType_t * pxPortInitialiseStack(
/* Fill the System Call Stack with known values for debugging. */ /* Fill the System Call Stack with known values for debugging. */
for( ulStackIndex = 0x0; ulStackIndex < configSYSTEM_CALL_STACK_SIZE; ulStackIndex++ ) for( ulStackIndex = 0x0; ulStackIndex < configSYSTEM_CALL_STACK_SIZE; ulStackIndex++ )
{ {
xMPUSettings->xSystemCallStackInfo.ulSystemCallStackBuffer[ ulStackIndex ] = xMPUSettings->xSystemCallStackInfo
0x575B | ulStackIndex; .ulSystemCallStackBuffer[ ulStackIndex ] = 0x575B | ulStackIndex;
} }
/* Return the address where the context of this task should be restored from*/ /* Return the address where the context of this task should be restored from*/
@ -260,8 +260,8 @@ PRIVILEGED_FUNCTION static uint32_t prvGetMPURegionSizeSetting(
uint32_t ulActualSizeInBytes uint32_t ulActualSizeInBytes
); );
static uint32_t prvGetMPURegionSizeSetting( uint32_t ulActualSizeInBytes static uint32_t prvGetMPURegionSizeSetting( uint32_t ulActualSizeInBytes ) /* PRIVILEGED_FUNCTION
) /* PRIVILEGED_FUNCTION */ */
{ {
uint32_t ulRegionSize, ulReturnValue = 4U; uint32_t ulRegionSize, ulReturnValue = 4U;
@ -328,13 +328,13 @@ void vPortStoreTaskMPUSettings(
/* No MPU regions are specified so allow access to all of the RAM. */ /* No MPU regions are specified so allow access to all of the RAM. */
xMPUSettings->xRegion[ 0 ].ulRegionBaseAddress = ( uint32_t xMPUSettings->xRegion[ 0 ].ulRegionBaseAddress = ( uint32_t
) __SRAM_segment_start__; ) __SRAM_segment_start__;
xMPUSettings->xRegion[ 0 ].ulRegionSize = xMPUSettings->xRegion[ 0 ].ulRegionSize = ( prvGetMPURegionSizeSetting(
( prvGetMPURegionSizeSetting( ( uint32_t ) __SRAM_segment_end__ -
( uint32_t ) __SRAM_segment_end__ - ( uint32_t ) __SRAM_segment_start__ ( uint32_t ) __SRAM_segment_start__
) ) | ) ) |
portMPU_REGION_ENABLE; portMPU_REGION_ENABLE;
xMPUSettings->xRegion[ 0 ].ulRegionAttribute = xMPUSettings->xRegion[ 0 ].ulRegionAttribute = portMPU_PRIV_RW_USER_RW_NOEXEC |
portMPU_PRIV_RW_USER_RW_NOEXEC | portMPU_NORMAL_OIWTNOWA_SHARED; portMPU_NORMAL_OIWTNOWA_SHARED;
/* Invalidate all other regions. */ /* Invalidate all other regions. */
for( ul = 1; ul <= portNUM_CONFIGURABLE_REGIONS; ul++ ) for( ul = 1; ul <= portNUM_CONFIGURABLE_REGIONS; ul++ )
@ -356,10 +356,10 @@ void vPortStoreTaskMPUSettings(
uint32_t ulSmallestRegion = prvGetMPURegionSizeSetting( ulStackDepth * 0x4 ); uint32_t ulSmallestRegion = prvGetMPURegionSizeSetting( ulStackDepth * 0x4 );
/* Define the region that allows access to the stack. */ /* Define the region that allows access to the stack. */
xMPUSettings->xRegion[ 0 ].ulRegionBaseAddress = ( uint32_t ) pxBottomOfStack; xMPUSettings->xRegion[ 0 ].ulRegionBaseAddress = ( uint32_t ) pxBottomOfStack;
xMPUSettings->xRegion[ 0 ].ulRegionSize = xMPUSettings->xRegion[ 0 ].ulRegionSize = ulSmallestRegion |
ulSmallestRegion | portMPU_REGION_ENABLE; portMPU_REGION_ENABLE;
xMPUSettings->xRegion[ 0 ].ulRegionAttribute = xMPUSettings->xRegion[ 0 ].ulRegionAttribute = portMPU_PRIV_RW_USER_RW_NOEXEC |
portMPU_PRIV_RW_USER_RW_NOEXEC | portMPU_NORMAL_OIWTNOWA_SHARED; portMPU_NORMAL_OIWTNOWA_SHARED;
} }
for( ul = 1; ul <= portNUM_CONFIGURABLE_REGIONS; ul++ ) for( ul = 1; ul <= portNUM_CONFIGURABLE_REGIONS; ul++ )
@ -369,13 +369,15 @@ void vPortStoreTaskMPUSettings(
/* Translate the generic region definition contained in /* Translate the generic region definition contained in
* xRegions into the R4 specific MPU settings that are then * xRegions into the R4 specific MPU settings that are then
* stored in xMPUSettings. */ * stored in xMPUSettings. */
xMPUSettings->xRegion[ ul ].ulRegionBaseAddress = xMPUSettings->xRegion[ ul ]
( uint32_t ) xRegions[ lIndex ].pvBaseAddress; .ulRegionBaseAddress = ( uint32_t ) xRegions[ lIndex ].pvBaseAddress;
xMPUSettings->xRegion[ ul ].ulRegionSize = xMPUSettings->xRegion[ ul ]
prvGetMPURegionSizeSetting( xRegions[ lIndex ].ulLengthInBytes ) | .ulRegionSize = prvGetMPURegionSizeSetting(
portMPU_REGION_ENABLE; xRegions[ lIndex ].ulLengthInBytes
xMPUSettings->xRegion[ ul ].ulRegionAttribute = ) |
xRegions[ lIndex ].ulParameters; portMPU_REGION_ENABLE;
xMPUSettings->xRegion[ ul ].ulRegionAttribute = xRegions[ lIndex ]
.ulParameters;
} }
else else
{ {
@ -513,10 +515,11 @@ PRIVILEGED_FUNCTION static void prvSetupDefaultMPU( void )
* @ingroup MPU Control * @ingroup MPU Control
*/ */
PRIVILEGED_FUNCTION static BaseType_t prvTaskCanAccessRegion( PRIVILEGED_FUNCTION static BaseType_t prvTaskCanAccessRegion(
const xMPU_REGION_REGISTERS * xTaskMPURegion, const xMPU_REGION_REGISTERS * xTaskMPURegion,
const uint32_t ulRegionStart, const uint32_t ulRegionStart,
const uint32_t ulRegionLength, const uint32_t ulRegionLength,
const uint32_t ulAccessRequested ) const uint32_t ulAccessRequested
)
{ {
BaseType_t xAccessGranted; BaseType_t xAccessGranted;
uint32_t ulRegionEnd = ulRegionStart + ulRegionLength; uint32_t ulRegionEnd = ulRegionStart + ulRegionLength;
@ -525,13 +528,12 @@ PRIVILEGED_FUNCTION static BaseType_t prvTaskCanAccessRegion(
uint32_t ulTaskRegionLength = 1 << ( ( xTaskMPURegion->ulRegionSize >> 1 ) + 1U ); uint32_t ulTaskRegionLength = 1 << ( ( xTaskMPURegion->ulRegionSize >> 1 ) + 1U );
// uint32_t ulTaskRegionLength = 2 << ( xTaskMPURegion->ulRegionSize >> 1 ); // uint32_t ulTaskRegionLength = 2 << ( xTaskMPURegion->ulRegionSize >> 1 );
uint32_t ulTaskRegionEnd = xTaskMPURegion->ulRegionBaseAddress + ulTaskRegionLength; uint32_t ulTaskRegionEnd = xTaskMPURegion->ulRegionBaseAddress + ulTaskRegionLength;
if( ( ulRegionStart >= xTaskMPURegion->ulRegionBaseAddress ) if( ( ulRegionStart >= xTaskMPURegion->ulRegionBaseAddress ) &&
&& ( ulRegionEnd <= ulTaskRegionEnd ) ) ( ulRegionEnd <= ulTaskRegionEnd ) )
{ {
/* Unprivileged read is MPU Ctrl Access Bit Value bX1X */ /* Unprivileged read is MPU Ctrl Access Bit Value bX1X */
if( ( tskMPU_READ_PERMISSION == ulAccessRequested ) && if( ( tskMPU_READ_PERMISSION == ulAccessRequested ) &&
( ( portMPU_PRIV_RW_USER_RO_NOEXEC ) ( ( portMPU_PRIV_RW_USER_RO_NOEXEC ) &xTaskMPURegion->ulRegionAttribute ) )
& xTaskMPURegion->ulRegionAttribute ) )
{ {
xAccessGranted = pdTRUE; xAccessGranted = pdTRUE;
} }
@ -559,10 +561,11 @@ PRIVILEGED_FUNCTION static BaseType_t prvTaskCanAccessRegion(
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
BaseType_t xPortIsAuthorizedToAccessBuffer(
BaseType_t xPortIsAuthorizedToAccessBuffer( const void * pvBuffer, const void * pvBuffer,
uint32_t ulBufferLength, uint32_t ulBufferLength,
uint32_t ulAccessRequested ) /* PRIVILEGED_FUNCTION */ uint32_t ulAccessRequested
) /* PRIVILEGED_FUNCTION */
{ {
BaseType_t xAccessGranted; BaseType_t xAccessGranted;
@ -595,10 +598,12 @@ BaseType_t xPortIsAuthorizedToAccessBuffer( const void * pvBuffer,
do do
{ {
xTaskMPURegion = &( xTaskMPUSettings->xRegion[ ulRegionIndex++ ] ); xTaskMPURegion = &( xTaskMPUSettings->xRegion[ ulRegionIndex++ ] );
xAccessGranted = prvTaskCanAccessRegion( xTaskMPURegion, xAccessGranted = prvTaskCanAccessRegion(
( uint32_t ) pvBuffer, xTaskMPURegion,
ulBufferLength, ( uint32_t ) pvBuffer,
ulAccessRequested ); ulBufferLength,
ulAccessRequested
);
} while( ( pdFALSE == xAccessGranted ) && } while( ( pdFALSE == xAccessGranted ) &&
( ulRegionIndex < portTOTAL_NUM_REGIONS_IN_TCB ) ); ( ulRegionIndex < portTOTAL_NUM_REGIONS_IN_TCB ) );
} }
@ -606,7 +611,6 @@ BaseType_t xPortIsAuthorizedToAccessBuffer( const void * pvBuffer,
return xAccessGranted; return xAccessGranted;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** @brief Determine if the FreeRTOS Task was created as a privileged task /** @brief Determine if the FreeRTOS Task was created as a privileged task
@ -669,71 +673,86 @@ BaseType_t xPortStartScheduler( void )
#if( configENABLE_ACCESS_CONTROL_LIST == 1 ) #if( configENABLE_ACCESS_CONTROL_LIST == 1 )
BaseType_t xPortIsAuthorizedToAccessKernelObject( int32_t lInternalIndexOfKernelObject ) /* PRIVILEGED_FUNCTION */ BaseType_t xPortIsAuthorizedToAccessKernelObject( int32_t lInternalIndexOfKernelObject
{ ) /* PRIVILEGED_FUNCTION */
uint32_t ulAccessControlListEntryIndex, ulAccessControlListEntryBit; {
BaseType_t xAccessGranted = pdFALSE; uint32_t ulAccessControlListEntryIndex, ulAccessControlListEntryBit;
const xMPU_SETTINGS * xTaskMpuSettings; BaseType_t xAccessGranted = pdFALSE;
const xMPU_SETTINGS * xTaskMpuSettings;
if( xSchedulerRunning == pdFALSE ) if( xSchedulerRunning == pdFALSE )
{
/* Grant access to all the kernel objects before the scheduler
* is started. It is necessary because there is no task running
* yet and therefore, we cannot use the permissions of any
* task. */
xAccessGranted = pdTRUE;
}
else
{
xTaskMpuSettings = xTaskGetMPUSettings( NULL ); /* Calling task's MPU settings. */
ulAccessControlListEntryIndex =
( ( uint32_t ) lInternalIndexOfKernelObject / portACL_ENTRY_SIZE_BITS );
ulAccessControlListEntryBit =
( ( uint32_t ) lInternalIndexOfKernelObject % portACL_ENTRY_SIZE_BITS );
if( ( xTaskMpuSettings->ulTaskFlags & portTASK_IS_PRIVILEGED_FLAG ) ==
portTASK_IS_PRIVILEGED_FLAG )
{
xAccessGranted = pdTRUE;
}
else
{
if( ( xTaskMpuSettings->ulAccessControlList[ ulAccessControlListEntryIndex ] &
( 1U << ulAccessControlListEntryBit ) ) != 0 )
{ {
/* Grant access to all the kernel objects before the scheduler
* is started. It is necessary because there is no task running
* yet and therefore, we cannot use the permissions of any
* task. */
xAccessGranted = pdTRUE; xAccessGranted = pdTRUE;
} }
else
{
xTaskMpuSettings = xTaskGetMPUSettings( NULL ); /* Calling task's MPU settings. */
ulAccessControlListEntryIndex = ( ( uint32_t ) lInternalIndexOfKernelObject / portACL_ENTRY_SIZE_BITS );
ulAccessControlListEntryBit = ( ( uint32_t ) lInternalIndexOfKernelObject % portACL_ENTRY_SIZE_BITS );
if( ( xTaskMpuSettings->ulTaskFlags & portTASK_IS_PRIVILEGED_FLAG ) == portTASK_IS_PRIVILEGED_FLAG )
{
xAccessGranted = pdTRUE;
}
else
{
if( ( xTaskMpuSettings->ulAccessControlList[ ulAccessControlListEntryIndex ] & ( 1U << ulAccessControlListEntryBit ) ) != 0 )
{
xAccessGranted = pdTRUE;
}
}
}
return xAccessGranted;
} }
void vPortGrantAccessToKernelObject( TaskHandle_t xInternalTaskHandle,
int32_t lInternalIndexOfKernelObject ) /* PRIVILEGED_FUNCTION */
{
uint32_t ulAccessControlListEntryIndex, ulAccessControlListEntryBit;
xMPU_SETTINGS * xTaskMpuSettings;
ulAccessControlListEntryIndex = ( ( uint32_t ) lInternalIndexOfKernelObject / portACL_ENTRY_SIZE_BITS );
ulAccessControlListEntryBit = ( ( uint32_t ) lInternalIndexOfKernelObject % portACL_ENTRY_SIZE_BITS );
xTaskMpuSettings = xTaskGetMPUSettings( xInternalTaskHandle );
xTaskMpuSettings->ulAccessControlList[ ulAccessControlListEntryIndex ] |= ( 1U << ulAccessControlListEntryBit );
} }
void vPortRevokeAccessToKernelObject( TaskHandle_t xInternalTaskHandle, return xAccessGranted;
int32_t lInternalIndexOfKernelObject ) /* PRIVILEGED_FUNCTION */ }
{
uint32_t ulAccessControlListEntryIndex, ulAccessControlListEntryBit;
xMPU_SETTINGS * xTaskMpuSettings;
ulAccessControlListEntryIndex = ( ( uint32_t ) lInternalIndexOfKernelObject / portACL_ENTRY_SIZE_BITS ); void vPortGrantAccessToKernelObject(
ulAccessControlListEntryBit = ( ( uint32_t ) lInternalIndexOfKernelObject % portACL_ENTRY_SIZE_BITS ); TaskHandle_t xInternalTaskHandle,
int32_t lInternalIndexOfKernelObject
) /* PRIVILEGED_FUNCTION */
{
uint32_t ulAccessControlListEntryIndex, ulAccessControlListEntryBit;
xMPU_SETTINGS * xTaskMpuSettings;
xTaskMpuSettings = xTaskGetMPUSettings( xInternalTaskHandle ); ulAccessControlListEntryIndex =
( ( uint32_t ) lInternalIndexOfKernelObject / portACL_ENTRY_SIZE_BITS );
ulAccessControlListEntryBit =
( ( uint32_t ) lInternalIndexOfKernelObject % portACL_ENTRY_SIZE_BITS );
xTaskMpuSettings->ulAccessControlList[ ulAccessControlListEntryIndex ] &= ~( 1U << ulAccessControlListEntryBit ); xTaskMpuSettings = xTaskGetMPUSettings( xInternalTaskHandle );
}
xTaskMpuSettings->ulAccessControlList
[ ulAccessControlListEntryIndex ] |= ( 1U << ulAccessControlListEntryBit );
}
void vPortRevokeAccessToKernelObject(
TaskHandle_t xInternalTaskHandle,
int32_t lInternalIndexOfKernelObject
) /* PRIVILEGED_FUNCTION */
{
uint32_t ulAccessControlListEntryIndex, ulAccessControlListEntryBit;
xMPU_SETTINGS * xTaskMpuSettings;
ulAccessControlListEntryIndex =
( ( uint32_t ) lInternalIndexOfKernelObject / portACL_ENTRY_SIZE_BITS );
ulAccessControlListEntryBit =
( ( uint32_t ) lInternalIndexOfKernelObject % portACL_ENTRY_SIZE_BITS );
xTaskMpuSettings = xTaskGetMPUSettings( xInternalTaskHandle );
xTaskMpuSettings->ulAccessControlList[ ulAccessControlListEntryIndex ] &= ~(
1U << ulAccessControlListEntryBit
);
}
#else #else