michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arch: arm: remove redundant flag

Browse source 
This commit removes the arm_mpu_enabled status flag in the ARM
MPU driver. This flag is not needed, because the value of the
MPU_CTRL register stays the same while the MPU is enabled, and
is cleared to 0 when the MPU is disabled. Therefore, we do not
need to prevent from having the enable or the disable operation
to be called multiple times.

Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
This commit is contained in:
Ioannis Glaropoulos 2018-05-29 21:18:39 +02:00 • committed by Anas Nashif
commit 61439b01c2
1 changed files with 6 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

25
arch/arm/core/cortex_m/mpu/arm_mpu.c
View file

@ -16,9 +16,6 @@
#define ARM_MPU_DEV ((volatile struct arm_mpu *) ARM_MPU_BASE)
/* ARM MPU Enabled state */
static u8_t arm_mpu_enabled;
/**
* The attributes referenced in this function are described at:
* https://goo.gl/hMry3r
@ -248,14 +245,10 @@ static inline int _is_user_accessible_region(u32_t r_index, int write)
*/
void arm_core_mpu_enable(void)
{
if (arm_mpu_enabled == 0) {
/* Enable MPU and use the default memory map as a
* background region for privileged software access.
*/
ARM_MPU_DEV->ctrl = ARM_MPU_ENABLE | ARM_MPU_PRIVDEFENA;
arm_mpu_enabled = 1;
}
/* Enable MPU and use the default memory map as a
* background region for privileged software access.
*/
ARM_MPU_DEV->ctrl = ARM_MPU_ENABLE | ARM_MPU_PRIVDEFENA;
}
/**
@ -263,12 +256,8 @@ void arm_core_mpu_enable(void)
*/
void arm_core_mpu_disable(void)
{
if (arm_mpu_enabled == 1) {
/* Disable MPU */
ARM_MPU_DEV->ctrl = 0;
arm_mpu_enabled = 0;
}
/* Disable MPU */
ARM_MPU_DEV->ctrl = 0;
}
/**
@ -488,8 +477,6 @@ static void _arm_mpu_config(void)
*/
ARM_MPU_DEV->ctrl = ARM_MPU_ENABLE | ARM_MPU_PRIVDEFENA;
arm_mpu_enabled = 1;
/* Make sure that all the registers are set before proceeding */
__DSB();
__ISB();