This is an automated email from the ASF dual-hosted git repository.

xiaoxiang781216 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git

commit 32280a9a4c7c729c23912e5756a5d692767bba2a
Author: Yanfeng Liu <[email protected]>
AuthorDate: Tue Feb 25 17:10:38 2025 +0800

    arch/armv8-r: align gicv3 init
    
    This renames arm_gic_initialize() and arm_gic_secondary_init() as
    arm_gic0_initialize() and arm_gic_initialize() so that to be aligned
    with that of armv7-a and armv7-r. The semantics is also aligned --
    cpu0 need use both and cpu1+ only use the latter.
    
    Signed-off-by: Yanfeng Liu <[email protected]>
---
 arch/arm/src/armv8-r/arm_doirq.c | 3 ++-
 arch/arm/src/armv8-r/arm_gicv3.c | 9 ++-------
 arch/arm/src/armv8-r/gic.h       | 8 ++------
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/arch/arm/src/armv8-r/arm_doirq.c b/arch/arm/src/armv8-r/arm_doirq.c
index d7fc2db901c..f2c61e2530d 100644
--- a/arch/arm/src/armv8-r/arm_doirq.c
+++ b/arch/arm/src/armv8-r/arm_doirq.c
@@ -121,7 +121,8 @@ void up_irqinitialize(void)
 
   /* Initialize the Generic Interrupt Controller (GIC) for CPU0 */
 
-  arm_gic_initialize();   /* Initialization common to all CPUs */
+  arm_gic0_initialize();      /* for GIC common parts */
+  arm_gic_initialize();       /* for GIC CPU interface */
 
 #ifndef CONFIG_SUPPRESS_INTERRUPTS
 
diff --git a/arch/arm/src/armv8-r/arm_gicv3.c b/arch/arm/src/armv8-r/arm_gicv3.c
index 46a91648f10..a4fb15fed1d 100644
--- a/arch/arm/src/armv8-r/arm_gicv3.c
+++ b/arch/arm/src/armv8-r/arm_gicv3.c
@@ -971,7 +971,7 @@ static void arm_gic_init(void)
 #endif
 }
 
-int arm_gic_initialize(void)
+int arm_gic0_initialize(void)
 {
   int err;
 
@@ -984,15 +984,10 @@ int arm_gic_initialize(void)
 
   gicv3_dist_init();
 
-  arm_gic_init();
-
   return 0;
 }
 
-#ifdef CONFIG_SMP
-void arm_gic_secondary_init(void)
+void arm_gic_initialize(void)
 {
   arm_gic_init();
 }
-
-#endif
diff --git a/arch/arm/src/armv8-r/gic.h b/arch/arm/src/armv8-r/gic.h
index 00374007589..1fbdfee5741 100644
--- a/arch/arm/src/armv8-r/gic.h
+++ b/arch/arm/src/armv8-r/gic.h
@@ -326,12 +326,9 @@
  * Public Function Prototypes
  ****************************************************************************/
 
-/* redirect to arm_gic_initialize() before SMP added */
-
-#define arm_gic0_initialize  arm_gic_initialize
-
 bool arm_gic_irq_is_enabled(unsigned int intid);
-int  arm_gic_initialize(void);
+int  arm_gic0_initialize(void);  /* For whole GIC */
+void arm_gic_initialize(void);   /* For per CPU interface */
 void arm_gic_irq_set_priority(unsigned int intid, unsigned int prio,
                                 uint32_t flags);
 
@@ -344,7 +341,6 @@ int arm_gic_raise_sgi(unsigned int sgi_id, uint16_t 
target_list);
 #ifdef CONFIG_SMP
 
 int arm_smp_sched_handler(int irq, void *context, void *arg);
-void arm_gic_secondary_init(void);
 
 #endif
 

Reply via email to