arm_mpu:Fix mpu_initialize not taking effect

crafcat7 · xiaoxiang781216 · commit 054c564a2d26 · 2024-08-22T01:58:46.000+08:00
Modified the input parameters of mpu_initialize to require the caller to provide the number of entries in the table

Signed-off-by: chenrun1 &lt;chenrun1@xiaomi.com&gt;
diff --git a/arch/arm/src/armv7-m/arm_mpu.c b/arch/arm/src/armv7-m/arm_mpu.c
@@ -558,6 +558,7 @@ unsigned int mpu_configure_region(uintptr_t base, size_t size,
  *
  * Input Parameters:
  *   table      - MPU initialization table.
+ *   count      - Initialize the number of entries in the region table.
  *   hfnmiena   - A boolean indicating whether the MPU should enable the
  *                HFNMIENA bit.
  *   privdefena - A boolean indicating whether the MPU should enable the
@@ -568,14 +569,14 @@ unsigned int mpu_configure_region(uintptr_t base, size_t size,
  *
  ****************************************************************************/
 
-void mpu_initialize(const struct mpu_region_s *table, bool hfnmiena,
-                    bool privdefena)
+void mpu_initialize(const struct mpu_region_s *table, size_t count,
+                    bool hfnmiena, bool privdefena)
 {
   const struct mpu_region_s *conf;
-  int index;
+  size_t index;
 
   mpu_control(false, false, false);
-  for (index = 0; index < nitems(table); index++)
+  for (index = 0; index < count; index++)
     {
       conf = &table[index];
       mpu_configure_region(conf->base, conf->size, conf->flags);
diff --git a/arch/arm/src/armv7-m/mpu.h b/arch/arm/src/armv7-m/mpu.h
@@ -380,6 +380,7 @@ unsigned int mpu_configure_region(uintptr_t base, size_t size,
  *
  * Input Parameters:
  *   table      - MPU initialization table.
+ *   count      - Initialize the number of entries in the region table.
  *   hfnmiena   - A boolean indicating whether the MPU should enable the
  *                HFNMIENA bit.
  *   privdefena - A boolean indicating whether the MPU should enable the
@@ -390,8 +391,8 @@ unsigned int mpu_configure_region(uintptr_t base, size_t size,
  *
  ****************************************************************************/
 
-void mpu_initialize(const struct mpu_region_s *table, bool hfnmiena,
-                    bool privdefena);
+void mpu_initialize(const struct mpu_region_s *table, size_t count,
+                    bool hfnmiena, bool privdefena);
 
 /****************************************************************************
  * Inline Functions
diff --git a/arch/arm/src/armv7-r/arm_mpu.c b/arch/arm/src/armv7-r/arm_mpu.c
@@ -486,19 +486,20 @@ unsigned int mpu_configure_region(uintptr_t base, size_t size,
  *
  * Input Parameters:
  *   table - MPU Initiaze table.
+ *   count - Initialize the number of entries in the region table.
  *
  * Returned Value:
  *   NULL.
  *
  ****************************************************************************/
 
-void mpu_initialize(const struct mpu_region_s *table)
+void mpu_initialize(const struct mpu_region_s *table, size_t count)
 {
   const struct mpu_region_s *conf;
-  int index;
+  size_t index;
 
   mpu_control(false);
-  for (index = 0; index < nitems(table); index++)
+  for (index = 0; index < count; index++)
     {
       conf = &table[index];
       mpu_configure_region(conf->base, conf->size, conf->flags);
diff --git a/arch/arm/src/armv7-r/mpu.h b/arch/arm/src/armv7-r/mpu.h
@@ -318,13 +318,14 @@ unsigned int mpu_configure_region(uintptr_t base, size_t size,
  *
  * Input Parameters:
  *   table - MPU Initiaze table.
+ *   count - Initialize the number of entries in the region table.
  *
  * Returned Value:
  *   NULL.
  *
  ****************************************************************************/
 
-void mpu_initialize(const struct mpu_region_s *table);
+void mpu_initialize(const struct mpu_region_s *table, size_t count);
 
 /****************************************************************************
  * Inline Functions
diff --git a/arch/arm/src/armv8-m/arm_mpu.c b/arch/arm/src/armv8-m/arm_mpu.c
@@ -289,6 +289,7 @@ unsigned int mpu_configure_region(uintptr_t base, size_t size,
  *
  * Input Parameters:
  *   table      - MPU initialization table.
+ *   count      - Initialize the number of entries in the region table.
  *   hfnmiena   - A boolean indicating whether the MPU should enable the
  *                HFNMIENA bit.
  *   privdefena - A boolean indicating whether the MPU should enable the
@@ -299,14 +300,14 @@ unsigned int mpu_configure_region(uintptr_t base, size_t size,
  *
  ****************************************************************************/
 
-void mpu_initialize(const struct mpu_region_s *table, bool hfnmiena,
-                    bool privdefena)
+void mpu_initialize(const struct mpu_region_s *table, size_t count,
+                    bool hfnmiena, bool privdefena)
 {
   const struct mpu_region_s *conf;
-  int index;
+  size_t index;
 
   mpu_control(false, false, false);
-  for (index = 0; index < nitems(table); index++)
+  for (index = 0; index < count; index++)
     {
       conf = &table[index];
       mpu_configure_region(conf->base, conf->size, conf->flags1,
diff --git a/arch/arm/src/armv8-m/mpu.h b/arch/arm/src/armv8-m/mpu.h
@@ -347,6 +347,7 @@ unsigned int mpu_configure_region(uintptr_t base, size_t size,
  *
  * Input Parameters:
  *   table      - MPU initialization table.
+ *   count      - Initialize the number of entries in the region table.
  *   hfnmiena   - A boolean indicating whether the MPU should enable the
  *                HFNMIENA bit.
  *   privdefena - A boolean indicating whether the MPU should enable the
@@ -357,8 +358,8 @@ unsigned int mpu_configure_region(uintptr_t base, size_t size,
  *
  ****************************************************************************/
 
-void mpu_initialize(const struct mpu_region_s *table, bool hfnmiena,
-                    bool privdefena);
+void mpu_initialize(const struct mpu_region_s *table, size_t count,
+                    bool hfnmiena, bool privdefena);
 
 /****************************************************************************
  * Inline Functions

Original file line number	Diff line number	Diff line change
`@@ -558,6 +558,7 @@ unsigned int mpu_configure_region(uintptr_t base, size_t size,`
`558`	`558`	`*`
`559`	`559`	`* Input Parameters:`
`560`	`560`	`* table - MPU initialization table.`
	`561`	`+ * count - Initialize the number of entries in the region table.`
`561`	`562`	`* hfnmiena - A boolean indicating whether the MPU should enable the`
`562`	`563`	`* HFNMIENA bit.`
`563`	`564`	`* privdefena - A boolean indicating whether the MPU should enable the`
`@@ -568,14 +569,14 @@ unsigned int mpu_configure_region(uintptr_t base, size_t size,`
`568`	`569`	`*`
`569`	`570`	`****************************************************************************/`
`570`	`571`
`571`		`-void mpu_initialize(const struct mpu_region_s *table, bool hfnmiena,`
`572`		`- bool privdefena)`
	`572`	`+void mpu_initialize(const struct mpu_region_s *table, size_t count,`
	`573`	`+ bool hfnmiena, bool privdefena)`
`573`	`574`	`{`
`574`	`575`	`const struct mpu_region_s *conf;`
`575`		`- int index;`
	`576`	`+ size_t index;`
`576`	`577`
`577`	`578`	`mpu_control(false, false, false);`
`578`		`- for (index = 0; index < nitems(table); index++)`
	`579`	`+ for (index = 0; index < count; index++)`
`579`	`580`	`{`
`580`	`581`	`conf = &table[index];`
`581`	`582`	`mpu_configure_region(conf->base, conf->size, conf->flags);`
Original file line number	Diff line number	Diff line change
`@@ -486,19 +486,20 @@ unsigned int mpu_configure_region(uintptr_t base, size_t size,`
`486`	`486`	`*`
`487`	`487`	`* Input Parameters:`
`488`	`488`	`* table - MPU Initiaze table.`
	`489`	`+ * count - Initialize the number of entries in the region table.`
`489`	`490`	`*`
`490`	`491`	`* Returned Value:`
`491`	`492`	`* NULL.`
`492`	`493`	`*`
`493`	`494`	`****************************************************************************/`
`494`	`495`
`495`		`-void mpu_initialize(const struct mpu_region_s *table)`
	`496`	`+void mpu_initialize(const struct mpu_region_s *table, size_t count)`
`496`	`497`	`{`
`497`	`498`	`const struct mpu_region_s *conf;`
`498`		`- int index;`
	`499`	`+ size_t index;`
`499`	`500`
`500`	`501`	`mpu_control(false);`
`501`		`- for (index = 0; index < nitems(table); index++)`
	`502`	`+ for (index = 0; index < count; index++)`
`502`	`503`	`{`
`503`	`504`	`conf = &table[index];`
`504`	`505`	`mpu_configure_region(conf->base, conf->size, conf->flags);`
Original file line number	Diff line number	Diff line change
`@@ -318,13 +318,14 @@ unsigned int mpu_configure_region(uintptr_t base, size_t size,`
`318`	`318`	`*`
`319`	`319`	`* Input Parameters:`
`320`	`320`	`* table - MPU Initiaze table.`
	`321`	`+ * count - Initialize the number of entries in the region table.`
`321`	`322`	`*`
`322`	`323`	`* Returned Value:`
`323`	`324`	`* NULL.`
`324`	`325`	`*`
`325`	`326`	`****************************************************************************/`
`326`	`327`
`327`		`-void mpu_initialize(const struct mpu_region_s *table);`
	`328`	`+void mpu_initialize(const struct mpu_region_s *table, size_t count);`
`328`	`329`
`329`	`330`	`/****************************************************************************`
`330`	`331`	`* Inline Functions`
Original file line number	Diff line number	Diff line change
`@@ -289,6 +289,7 @@ unsigned int mpu_configure_region(uintptr_t base, size_t size,`
`289`	`289`	`*`
`290`	`290`	`* Input Parameters:`
`291`	`291`	`* table - MPU initialization table.`
	`292`	`+ * count - Initialize the number of entries in the region table.`
`292`	`293`	`* hfnmiena - A boolean indicating whether the MPU should enable the`
`293`	`294`	`* HFNMIENA bit.`
`294`	`295`	`* privdefena - A boolean indicating whether the MPU should enable the`
`@@ -299,14 +300,14 @@ unsigned int mpu_configure_region(uintptr_t base, size_t size,`
`299`	`300`	`*`
`300`	`301`	`****************************************************************************/`
`301`	`302`
`302`		`-void mpu_initialize(const struct mpu_region_s *table, bool hfnmiena,`
`303`		`- bool privdefena)`
	`303`	`+void mpu_initialize(const struct mpu_region_s *table, size_t count,`
	`304`	`+ bool hfnmiena, bool privdefena)`
`304`	`305`	`{`
`305`	`306`	`const struct mpu_region_s *conf;`
`306`		`- int index;`
	`307`	`+ size_t index;`
`307`	`308`
`308`	`309`	`mpu_control(false, false, false);`
`309`		`- for (index = 0; index < nitems(table); index++)`
	`310`	`+ for (index = 0; index < count; index++)`
`310`	`311`	`{`
`311`	`312`	`conf = &table[index];`
`312`	`313`	`mpu_configure_region(conf->base, conf->size, conf->flags1,`