diff options
Diffstat (limited to 'cpukit/score/cpu/arm/aarch32-psma-init.c')
-rw-r--r-- | cpukit/score/cpu/arm/aarch32-psma-init.c | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/cpukit/score/cpu/arm/aarch32-psma-init.c b/cpukit/score/cpu/arm/aarch32-psma-init.c index 93a3673a98..b30cb5e308 100644 --- a/cpukit/score/cpu/arm/aarch32-psma-init.c +++ b/cpukit/score/cpu/arm/aarch32-psma-init.c @@ -46,7 +46,7 @@ #include <rtems/score/cpu.h> #define AARCH32_PMSA_REGION_MAX \ - ( ( AARCH32_MPUIR_REGION_MASK >> AARCH32_MPUIR_REGION_SHIFT ) + 1 ) + ((AARCH32_MPUIR_REGION_MASK >> AARCH32_MPUIR_REGION_SHIFT) + 1) static void _AArch32_PMSA_Configure( const AArch32_PMSA_Region *regions, @@ -57,36 +57,36 @@ static void _AArch32_PMSA_Configure( size_t ri; uint32_t sctlr; - for ( ri = 0 ; ri < region_used; ++ri ) { + for ( ri = 0; ri < region_used; ++ri ) { uint32_t prbar; uint32_t prlar; uint32_t attr; - prbar = regions[ ri ].base; - prlar = regions[ ri ].limit; - attr = regions[ ri ].attributes; + prbar = regions[ri].base; + prlar = regions[ri].limit; + attr = regions[ri].attributes; - prbar |= ( attr >> 6 ) & 0x3fU; + prbar |= (attr >> 6) & 0x3fU; prlar |= attr & 0x3fU; - _AArch32_Write_prselr( ri ); + _AArch32_Write_prselr(ri); _ARM_Instruction_synchronization_barrier(); - _AArch32_Write_prbar( prbar ); - _AArch32_Write_prlar( prlar ); + _AArch32_Write_prbar(prbar); + _AArch32_Write_prlar(prlar); } - for ( ri = region_used ; ri < region_max; ++ri ) { - _AArch32_Write_prselr( ri ); + for ( ri = region_used; ri < region_max; ++ri ) { + _AArch32_Write_prselr(ri); _ARM_Instruction_synchronization_barrier(); - _AArch32_Write_prbar( 0 ); - _AArch32_Write_prlar( 0 ); + _AArch32_Write_prbar(0); + _AArch32_Write_prlar(0); } _ARM_Data_synchronization_barrier(); - sctlr = _AArch32_Read_sctlr(); + sctlr = _AArch32_Read_sctlr(); sctlr |= AARCH32_SCTLR_M | AARCH32_SCTLR_I | AARCH32_SCTLR_C; - sctlr &= ~( AARCH32_SCTLR_A | AARCH32_SCTLR_BR ); - _AArch32_Write_sctlr( sctlr ); + sctlr &= ~(AARCH32_SCTLR_A | AARCH32_SCTLR_BR); + _AArch32_Write_sctlr(sctlr); _ARM_Instruction_synchronization_barrier(); } @@ -109,16 +109,16 @@ size_t _AArch32_PMSA_Map_sections_to_regions( uint32_t attr; uint32_t limit; - base = sections[ si ].begin; - end = sections[ si ].end; - attr = sections[ si ].attributes; + base = sections[si].begin; + end = sections[si].end; + attr = sections[si].attributes; if ( base == end ) { continue; } - base = RTEMS_ALIGN_DOWN( base, AARCH32_PMSA_MIN_REGION_ALIGN ); - end = RTEMS_ALIGN_UP( end, AARCH32_PMSA_MIN_REGION_ALIGN ); + base = RTEMS_ALIGN_DOWN(base, AARCH32_PMSA_MIN_REGION_ALIGN); + end = RTEMS_ALIGN_UP(end, AARCH32_PMSA_MIN_REGION_ALIGN); limit = end - AARCH32_PMSA_MIN_REGION_ALIGN; for ( ri = 0; ri < region_used; ++ri ) { @@ -126,16 +126,16 @@ size_t _AArch32_PMSA_Map_sections_to_regions( uint32_t region_limit; uint32_t region_attr; - region_base = regions[ ri ].base; - region_limit = regions[ ri ].limit; - region_attr = regions[ ri ].attributes; + region_base = regions[ri].base; + region_limit = regions[ri].limit; + region_attr = regions[ri].attributes; if ( attr == region_attr ) { uint32_t region_end; if ( end - region_base <= AARCH32_PMSA_MIN_REGION_ALIGN ) { /* Extend the region */ - regions[ ri ].base = base; + regions[ri].base = base; break; } @@ -143,7 +143,7 @@ size_t _AArch32_PMSA_Map_sections_to_regions( if ( region_end - base <= AARCH32_PMSA_MIN_REGION_ALIGN ) { /* Extend the region */ - regions[ ri ].limit = limit; + regions[ri].limit = limit; break; } @@ -161,14 +161,14 @@ size_t _AArch32_PMSA_Map_sections_to_regions( } for ( i = region_used; i > ri; --i ) { - regions[ i ] = regions[ i - 1 ]; + regions[i] = regions[i - 1]; } /* New first region */ ++region_used; - regions[ ri ].base = base; - regions[ ri ].limit = limit; - regions[ ri ].attributes = attr; + regions[ri].base = base; + regions[ri].limit = limit; + regions[ri].attributes = attr; break; } } @@ -180,9 +180,9 @@ size_t _AArch32_PMSA_Map_sections_to_regions( /* New last region */ ++region_used; - regions[ ri ].base = base; - regions[ ri ].limit = limit; - regions[ ri ].attributes = attr; + regions[ri].base = base; + regions[ri].limit = limit; + regions[ri].attributes = attr; } } @@ -196,15 +196,15 @@ void _AArch32_PMSA_Initialize( size_t section_count ) { - AArch32_PMSA_Region regions[ AARCH32_PMSA_REGION_MAX ]; - size_t region_max; - size_t region_used; + AArch32_PMSA_Region regions[AARCH32_PMSA_REGION_MAX]; + size_t region_max; + size_t region_used; - _AArch32_Write_mair0( memory_attributes_0 ); - _AArch32_Write_mair1( memory_attributes_1 ); + _AArch32_Write_mair0(memory_attributes_0); + _AArch32_Write_mair1(memory_attributes_1); - region_max = ( _AArch32_Read_mpuir() & AARCH32_MPUIR_REGION_MASK ) >> - AARCH32_MPUIR_REGION_SHIFT; + region_max = (_AArch32_Read_mpuir() & AARCH32_MPUIR_REGION_MASK) >> + AARCH32_MPUIR_REGION_SHIFT; region_used = _AArch32_PMSA_Map_sections_to_regions( sections, @@ -214,7 +214,7 @@ void _AArch32_PMSA_Initialize( ); if ( region_used > 0 ) { - _AArch32_PMSA_Configure( regions, region_used, region_max ); + _AArch32_PMSA_Configure(regions, region_used, region_max); } } |