core: interrupt: rename itr_core_handler()

Renames itr_core_handler() to interrupt_main_handler() as a later
change will modify interrupt chip API functions using interrupt_
as prefix.

Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>

core/arch/arm/kernel/thread.c

@@ -1163,7 +1163,7 @@ DECLARE_KEEP_PAGER(thread_system_reset_handler);
 #endif /*CFG_WITH_ARM_TRUSTED_FW*/
 
 #ifdef CFG_CORE_WORKAROUND_ARM_NMFI
-void __noreturn itr_core_handler(void)
+void __noreturn interrupt_main_handler(void)
 {
 	/*
 	 * Note: overrides the default implementation of this function so that

core/arch/arm/kernel/thread_a32.S

@@ -468,7 +468,7 @@ END_FUNC thread_unwind_user_mode
 	.endif
 
 	bl	thread_check_canaries
-	bl	itr_core_handler
+	bl	interrupt_main_handler
 
 	mrs	r0, spsr
 	cmp_spsr_user_mode r0

core/arch/arm/kernel/thread_a64.S

@@ -1272,7 +1272,7 @@ END_FUNC el0_sync_abort
 	mov	sp, x1
 
 	bl	thread_check_canaries
-	bl	itr_core_handler
+	bl	interrupt_main_handler
 
 	/*
 	 * Restore registers

core/arch/arm/kernel/thread_optee_smc_a32.S

@@ -72,7 +72,7 @@ UNWIND(	.cantunwind)
 	readjust_pc
  	/* Secure Monitor received a FIQ and passed control to us. */
 	bl	thread_check_canaries
-	bl	itr_core_handler
+	bl	interrupt_main_handler
 	ldr	r0, =TEESMC_OPTEED_RETURN_FIQ_DONE
 	smc	#0
 	/* SMC should not return */

core/arch/arm/kernel/thread_optee_smc_a64.S

@@ -70,7 +70,7 @@ LOCAL_FUNC vector_fiq_entry , : , .identity_map
 	readjust_pc
 	/* Secure Monitor received a FIQ and passed control to us. */
 	bl	thread_check_canaries
-	bl	itr_core_handler
+	bl	interrupt_main_handler
 	ldr	x0, =TEESMC_OPTEED_RETURN_FIQ_DONE
 	smc	#0
 	/* SMC should not return */

core/arch/arm/kernel/thread_spmc.c

@@ -974,7 +974,7 @@ void thread_spmc_msg_recv(struct thread_smc_args *args)
 		break;
 #endif /*CFG_CORE_SEL1_SPMC*/
 	case FFA_INTERRUPT:
-		itr_core_handler();
+		interrupt_main_handler();
 		spmc_set_args(args, FFA_MSG_WAIT, 0, 0, 0, 0, 0);
 		break;
 #ifdef ARM64

core/drivers/atmel_saic.c

@@ -43,7 +43,7 @@ static uint32_t saic_read_reg(uint32_t reg)
 	return io_read32(saic.base + reg);
 }
 
-void itr_core_handler(void)
+void interrupt_main_handler(void)
 {
 	uint32_t irqnr = saic_read_reg(AT91_AIC_IVR);
 

core/drivers/gic.c

@@ -497,8 +497,8 @@ static void __maybe_unused gic_native_itr_handler(void)
 }
 
 #ifndef CFG_CORE_WORKAROUND_ARM_NMFI
-/* Override itr_core_handler() with core interrupt controller implementation */
-void itr_core_handler(void)
+/* Override interrupt_main_handler() with driver implementation */
+void interrupt_main_handler(void)
 {
 	gic_native_itr_handler();
 }

core/drivers/hfic.c

@@ -73,8 +73,8 @@ void hfic_init(void)
 	itr_init(&hfic_data.chip);
 }
 
-/* Override itr_core_handler() with core interrupt controller implementation */
-void itr_core_handler(void)
+/* Override interrupt_main_handler() with driver implementation */
+void interrupt_main_handler(void)
 {
 	uint32_t id = 0;
 	uint32_t res __maybe_unused = 0;

core/include/kernel/interrupt.h

@@ -113,7 +113,7 @@ void itr_set_affinity(size_t it, uint8_t cpu_mask);
  * received. The default function calls panic() immediately, platforms which
  * expects to receive secure interrupts should override this function.
  */
-void itr_core_handler(void);
+void interrupt_main_handler(void);
 
 static inline void itr_add(struct itr_handler *handler)
 {

core/kernel/interrupt.c

@@ -134,7 +134,7 @@ void itr_set_affinity(size_t it, uint8_t cpu_mask)
 }
 
 /* This function is supposed to be overridden in platform specific code */
-void __weak __noreturn itr_core_handler(void)
+void __weak __noreturn interrupt_main_handler(void)
 {
 	panic("Secure interrupt handler not defined");
 }