michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arch: arm: remove num-mpu-regions

Browse source 
Remove this property presumably unused.

Signed-off-by: Wilfried Chauveau <wilfried.chauveau@arm.com>
This commit is contained in:
Wilfried Chauveau 2023-09-29 23:15:38 +01:00 • committed by Fabio Baltieri
commit 85af32e16e
8 changed files with 0 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

9
arch/arm/core/mpu/arm_mpu.c
View file

@ -30,10 +30,6 @@ LOG_MODULE_DECLARE(mpu);
#define MPU_NODEID DT_INST(0, arm_armv6m_mpu) #define MPU_NODEID DT_INST(0, arm_armv6m_mpu)
#endif #endif
#if DT_NODE_HAS_PROP(MPU_NODEID, arm_num_mpu_regions)
#define NUM_MPU_REGIONS DT_PROP(MPU_NODEID, arm_num_mpu_regions)
#endif
#define NODE_HAS_PROP_AND_OR(node_id, prop) \ #define NODE_HAS_PROP_AND_OR(node_id, prop) \
DT_NODE_HAS_PROP(node_id, prop) || DT_NODE_HAS_PROP(node_id, prop) ||
@ -527,11 +523,6 @@ int z_arm_mpu_init(void)
__ASSERT( __ASSERT(
(MPU->TYPE & MPU_TYPE_DREGION_Msk) >> MPU_TYPE_DREGION_Pos == 8, (MPU->TYPE & MPU_TYPE_DREGION_Msk) >> MPU_TYPE_DREGION_Pos == 8,
"Invalid number of MPU regions\n"); "Invalid number of MPU regions\n");
#elif defined(NUM_MPU_REGIONS)
__ASSERT(
(MPU->TYPE & MPU_TYPE_DREGION_Msk) >> MPU_TYPE_DREGION_Pos ==
NUM_MPU_REGIONS,
"Invalid number of MPU regions\n");
#endif /* CORTEX_M0PLUS || CPU_CORTEX_M3 || CPU_CORTEX_M4 */ #endif /* CORTEX_M0PLUS || CPU_CORTEX_M3 || CPU_CORTEX_M4 */
return 0; return 0;

5
arch/arm/core/mpu/arm_mpu_v8_internal.h
View file

@ -720,12 +720,7 @@ static int mpu_mark_areas_for_dynamic_regions(
*/ */
static inline uint8_t get_num_regions(void) static inline uint8_t get_num_regions(void)
{ {
#if defined(NUM_MPU_REGIONS)
/* Retrieve the number of regions from DTS configuration. */
return NUM_MPU_REGIONS;
#else
return mpu_get_num_regions(); return mpu_get_num_regions();
#endif /* NUM_MPU_REGIONS */
} }
/* This internal function programs the dynamic MPU regions. /* This internal function programs the dynamic MPU regions.

5
arch/arm/core/mpu/cortex_a_r/arm_mpu_internal.h
View file

@ -10,10 +10,6 @@
*/ */
static inline uint8_t get_num_regions(void) static inline uint8_t get_num_regions(void)
{ {
#if defined(NUM_MPU_REGIONS)
/* Retrieve the number of regions from DTS configuration. */
return NUM_MPU_REGIONS;
#else
uint32_t type; uint32_t type;
__asm__ volatile("mrc p15, 0, %0, c0, c0, 4" : "=r" (type) ::); __asm__ volatile("mrc p15, 0, %0, c0, c0, 4" : "=r" (type) ::);
@ -21,7 +17,6 @@ static inline uint8_t get_num_regions(void)
type = (type & MPU_TYPE_DREGION_Msk) >> MPU_TYPE_DREGION_Pos; type = (type & MPU_TYPE_DREGION_Msk) >> MPU_TYPE_DREGION_Pos;
return (uint8_t)type; return (uint8_t)type;
#endif /* NUM_MPU_REGIONS */
} }
static inline uint32_t get_region_attributes(void) static inline uint32_t get_region_attributes(void)

12
arch/arm/core/mpu/cortex_m/arm_mpu_internal.h
View file

@ -10,23 +10,11 @@
*/ */
static inline uint8_t get_num_regions(void) static inline uint8_t get_num_regions(void)
{ {
#if defined(CONFIG_CPU_CORTEX_M0PLUS) || \
defined(CONFIG_CPU_CORTEX_M3) || \
defined(CONFIG_CPU_CORTEX_M4)
/* Cortex-M0+, Cortex-M3, and Cortex-M4 MCUs may
* have a fixed number of 8 MPU regions.
*/
return 8;
#elif defined(NUM_MPU_REGIONS)
/* Retrieve the number of regions from DTS configuration. */
return NUM_MPU_REGIONS;
#else
uint32_t type = MPU->TYPE; uint32_t type = MPU->TYPE;
type = (type & MPU_TYPE_DREGION_Msk) >> MPU_TYPE_DREGION_Pos; type = (type & MPU_TYPE_DREGION_Msk) >> MPU_TYPE_DREGION_Pos;
return (uint8_t)type; return (uint8_t)type;
#endif /* CPU_CORTEX_M0PLUS | CPU_CORTEX_M3 | CPU_CORTEX_M4 */
} }
static inline void set_region_number(uint32_t index) static inline void set_region_number(uint32_t index)

5
dts/bindings/mmu_mpu/arm,armv6m-mpu.yaml
View file

@ -10,8 +10,3 @@ include: base.yaml
properties: properties:
reg: reg:
required: true required: true
arm,num-mpu-regions:
type: int
const: 8
description: number of MPU regions supported by hardware

4
dts/bindings/mmu_mpu/arm,armv7m-mpu.yaml
View file

@ -7,7 +7,3 @@ include: base.yaml
properties: properties:
reg: reg:
required: true required: true
arm,num-mpu-regions:
type: int
description: number of MPU regions supported by hardware

4
dts/bindings/mmu_mpu/arm,armv8.1m-mpu.yaml
View file

@ -7,7 +7,3 @@ include: base.yaml
properties: properties:
reg: reg:
required: true required: true
arm,num-mpu-regions:
type: int
description: number of MPU regions supported by hardware

4
dts/bindings/mmu_mpu/arm,armv8m-mpu.yaml
View file

@ -7,7 +7,3 @@ include: base.yaml
properties: properties:
reg: reg:
required: true required: true
arm,num-mpu-regions:
type: int
description: number of MPU regions supported by hardware