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 e2ad466527b067ca8bf23f5d6e644f669212b674
Author: Saravanan Sekar <[email protected]>
AuthorDate: Thu Nov 5 22:05:15 2026 +0530

    arch/tricore: Access the interrupt router registers directly.
    
    tricore_irq.c programs the SRC registers through IfxSrc and IfxCpu.  Write
    them directly with the new SRC definitions instead, so the file no longer
    needs the iLLD, and drop the TC4xx SRC name aliases that only it used.
    
    Signed-off-by: Saravanan Sekar <[email protected]>
---
 arch/tricore/include/irq.h            |   2 +
 arch/tricore/src/common/tricore_irq.c | 128 +++++++++++++---------------------
 arch/tricore/src/tc4xx/CMakeLists.txt |   5 +-
 arch/tricore/src/tc4xx/Make.defs      |   2 -
 4 files changed, 54 insertions(+), 83 deletions(-)

diff --git a/arch/tricore/include/irq.h b/arch/tricore/include/irq.h
index e11e0834e90..9ceb9e4d6f3 100644
--- a/arch/tricore/include/irq.h
+++ b/arch/tricore/include/irq.h
@@ -134,6 +134,8 @@
 #define TRICORE_SRCNUM_PER_GPSR  8
 #define TRICORE_SRC2IRQ(src_addr) \
   (((uintptr_t)(src_addr) - TRICORE_SRC_BASE) / 4)
+#define TRICORE_IRQ2SRC(irq) \
+  ((volatile uint32_t *)(TRICORE_SRC_BASE + (irq) * 4))
 #define TRICORE_GPSR_IRQNUM(src_cpu, dest_cpu)  \
   TRICORE_SRC2IRQ(TRICORE_SRC_GPSR_BASE + \
                   ((src_cpu) * TRICORE_SRCNUM_PER_GPSR + (dest_cpu)) * 4)
diff --git a/arch/tricore/src/common/tricore_irq.c 
b/arch/tricore/src/common/tricore_irq.c
index 6371acc0190..df5c919b570 100644
--- a/arch/tricore/src/common/tricore_irq.c
+++ b/arch/tricore/src/common/tricore_irq.c
@@ -36,10 +36,6 @@
 
 #include "tricore_internal.h"
 
-#include "IfxSrc.h"
-#include "IfxCpu.h"
-#include "IfxInt_reg.h"
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -74,19 +70,6 @@ static inline void tricore_color_intstack(void)
  * Private Data
  ****************************************************************************/
 
-static const IfxSrc_Tos g_tricore_tos[] =
-{
-  IfxSrc_Tos_cpu0,
-  IfxSrc_Tos_cpu1,
-  IfxSrc_Tos_cpu2,
-  IfxSrc_Tos_cpu3,
-  IfxSrc_Tos_cpu4,
-  IfxSrc_Tos_cpu5,
-#ifdef CONFIG_ARCH_CHIP_TC4XX
-  IfxSrc_Tos_csrm,
-#endif
-};
-
 static spinlock_t g_irqlock = SP_UNLOCKED;
 static int g_irqmap_count = 1;
 
@@ -94,6 +77,30 @@ static int g_irqmap_count = 1;
  * Private Functions
  ****************************************************************************/
 
+/****************************************************************************
+ * Name: tricore_src_init
+ *
+ * Description:
+ *   Route a service request to a service provider (TOS), a core or for
+ *   example the DMA, with a priority and clear a pending request.  The
+ *   enable bit is left as it is.
+ *
+ ****************************************************************************/
+
+static void tricore_src_init(volatile uint32_t *src, int tos, int srpn)
+{
+  uint32_t regval = *src;
+
+  regval &= ~(TRICORE_SRC_SRPN_MASK | TRICORE_SRC_TOS_MASK);
+#ifdef TRICORE_SRC_VM_MASK
+  regval &= ~TRICORE_SRC_VM_MASK;
+#endif
+
+  regval |= (srpn & TRICORE_SRC_SRPN_MASK) |
+            ((tos << TRICORE_SRC_TOS_SHIFT) & TRICORE_SRC_TOS_MASK);
+  *src = regval | TRICORE_SRC_CLRR;
+}
+
 #ifdef CONFIG_ARCH_HAVE_IRQTRIGGER
 /****************************************************************************
  * Name: tricore_gpsrinitialize
@@ -105,36 +112,24 @@ static int g_irqmap_count = 1;
 
 static void tricore_gpsrinitialize(void)
 {
-  volatile Ifx_SRC_SRCR *src;
-  int cpu_idx;
+  int cpu = up_cpu_index();
+  int tos = TRICORE_SRC_TOS_CPU(cpu);
   int i;
 
-  cpu_idx = up_cpu_index();
-  src = &SRC_GPSR00 + cpu_idx;
-
   /* Cpux gpsr init */
 
   for (i = 0; i < 6; i++)
     {
-#ifdef CONFIG_ARCH_CHIP_TC3XX
-      IfxSrc_init(src, g_tricore_tos[cpu_idx],
-                  IRQ_TO_NDX(TRICORE_SRC2IRQ(src)));
-#else
-      IfxSrc_init(src, g_tricore_tos[cpu_idx],
-                  IRQ_TO_NDX(TRICORE_SRC2IRQ(src)),
-                  IfxSrc_VmId_none);
-#endif
+      int irq = TRICORE_GPSR_IRQNUM(i, cpu);
 
-      src += TRICORE_SRCNUM_PER_GPSR;
+      tricore_src_init(TRICORE_IRQ2SRC(irq), tos, IRQ_TO_NDX(irq));
     }
 
   /* Cpucs gpsr init */
 
 #ifndef CONFIG_ARCH_CHIP_TC3XX
-  src = &SRC_GPSR6_SR0 + cpu_idx;
-  IfxSrc_init(src, g_tricore_tos[cpu_idx],
-              IRQ_TO_NDX(TRICORE_SRC2IRQ(src)),
-              IfxSrc_VmId_none);
+  tricore_src_init(TRICORE_IRQ2SRC(TRICORE_GPSR_IRQNUM(6, cpu)), tos,
+                   IRQ_TO_NDX(TRICORE_GPSR_IRQNUM(6, cpu)));
 #endif
 }
 #endif
@@ -153,7 +148,7 @@ static void tricore_gpsrinitialize(void)
 
 void up_irq_enable(void)
 {
-  IfxCpu_enableInterrupts();
+  __asm__ volatile ("enable" : : : "memory");
 }
 
 /****************************************************************************
@@ -180,17 +175,11 @@ void up_irqinitialize(void)
 
 void up_disable_irq(int irq)
 {
-  volatile Ifx_SRC_SRCR *src = &SRC_CPU_CPU0_SB + irq;
-  Ifx_SRC_SRCR srctmp;
-
-  IfxSrc_disable(src);
+  volatile uint32_t *src = TRICORE_IRQ2SRC(irq);
 
-  /* Clear, keep SRPN */
+  /* Disable and clear, keep SRPN */
 
-  srctmp.U      = 0U;
-  srctmp.B.TOS  = ~0;
-  srctmp.B.SRPN = src->B.SRPN;
-  src->U = srctmp.U;
+  *src = (*src & TRICORE_SRC_SRPN_MASK) | TRICORE_SRC_TOS_MASK;
 }
 
 /****************************************************************************
@@ -203,16 +192,11 @@ void up_disable_irq(int irq)
 
 void up_enable_irq(int irq)
 {
-  volatile Ifx_SRC_SRCR *src = &SRC_CPU_CPU0_SB + irq;
-
-#ifdef CONFIG_ARCH_CHIP_TC3XX
-  IfxSrc_init(src, g_tricore_tos[up_cpu_index()], IRQ_TO_NDX(irq));
-#else
-  IfxSrc_init(src, g_tricore_tos[up_cpu_index()], IRQ_TO_NDX(irq),
-              IfxSrc_VmId_none);
-#endif
+  volatile uint32_t *src = TRICORE_IRQ2SRC(irq);
 
-  IfxSrc_enable(src);
+  tricore_src_init(src, TRICORE_SRC_TOS_CPU(up_cpu_index()),
+                   IRQ_TO_NDX(irq));
+  *src |= TRICORE_SRC_SRE;
 }
 
 /****************************************************************************
@@ -225,23 +209,17 @@ void up_enable_irq(int irq)
 
 void up_affinity_irq(int irq, cpu_set_t cpuset)
 {
-  volatile Ifx_SRC_SRCR *src = &SRC_CPU_CPU0_SB + irq;
-  int irq_prio = src->B.SRPN;
+  volatile uint32_t *src = TRICORE_IRQ2SRC(irq);
 
-  IfxSrc_disable(src);
+  *src &= ~TRICORE_SRC_SRE;
 
   /* Only support interrupt routing mode 0,
    * so routing to the first cpu in cpuset.
    */
 
-#ifdef CONFIG_ARCH_CHIP_TC3XX
-  IfxSrc_init(src, g_tricore_tos[ffs(cpuset) - 1], irq_prio);
-#else
-  IfxSrc_init(src, g_tricore_tos[ffs(cpuset) - 1], irq_prio,
-              IfxSrc_VmId_none);
-#endif
-
-  IfxSrc_enable(src);
+  tricore_src_init(src, TRICORE_SRC_TOS_CPU(ffs(cpuset) - 1),
+                   *src & TRICORE_SRC_SRPN_MASK);
+  *src |= TRICORE_SRC_SRE;
 }
 
 /****************************************************************************
@@ -254,9 +232,7 @@ void up_affinity_irq(int irq, cpu_set_t cpuset)
 
 void tricore_ack_irq(int irq)
 {
-  volatile Ifx_SRC_SRCR *src = &SRC_CPU_CPU0_SB + irq;
-
-  IfxSrc_clearRequest(src);
+  *TRICORE_IRQ2SRC(irq) |= TRICORE_SRC_CLRR;
 }
 
 #ifdef CONFIG_ARCH_HAVE_IRQTRIGGER
@@ -270,9 +246,8 @@ void tricore_ack_irq(int irq)
 
 void up_trigger_irq(int irq, cpu_set_t cpuset)
 {
-  volatile Ifx_INT_SRB *srb = &INT_SRB0 + up_cpu_index();
-
-  srb->U = cpuset;
+  *(volatile uint32_t *)(TRICORE_INT_SRB_BASE + up_cpu_index() * 4) =
+    cpuset;
 }
 #endif
 
@@ -286,26 +261,23 @@ void up_trigger_irq(int irq, cpu_set_t cpuset)
 
 int up_irq_to_ndx(int irq)
 {
-  volatile Ifx_SRC_SRCR *src = &SRC_CPU_CPU0_SB + irq;
-  Ifx_SRC_SRCR srctmp;
+  volatile uint32_t *src = TRICORE_IRQ2SRC(irq);
   irqstate_t flags;
   int ndx;
 
-  ndx = src->B.SRPN;
+  ndx = *src & TRICORE_SRC_SRPN_MASK;
   if (ndx != 0)
     {
       return ndx;
     }
 
   flags = spin_lock_irqsave(&g_irqlock);
-  ndx = src->B.SRPN;
+  ndx = *src & TRICORE_SRC_SRPN_MASK;
   if (ndx == 0)
     {
       ndx = g_irqmap_count++;
       g_irqrevmap[ndx] = irq;
-      srctmp.U = src->U;
-      srctmp.B.SRPN = ndx;
-      src->U = srctmp.U;
+      *src = (*src & ~TRICORE_SRC_SRPN_MASK) | ndx;
     }
 
   spin_unlock_irqrestore(&g_irqlock, flags);
diff --git a/arch/tricore/src/tc4xx/CMakeLists.txt 
b/arch/tricore/src/tc4xx/CMakeLists.txt
index d849f243f2c..ce182ece807 100644
--- a/arch/tricore/src/tc4xx/CMakeLists.txt
+++ b/arch/tricore/src/tc4xx/CMakeLists.txt
@@ -180,6 +180,5 @@ if(NOT CONFIG_TRICORE_TOOLCHAIN_TASKING)
   target_compile_options(nuttx PRIVATE -Wno-implicit-fallthrough)
 endif()
 
-target_compile_definitions(
-  arch PRIVATE -DSRC_GPSR00=SRC_GPSR0SR0 -DSRC_CPU_CPU0_SB=SRC_CPU0SB
-               -DMODULE_STM0=MODULE_CPU0 -DSRC_STM0SR0=SRC_STMCPU0_SR2)
+target_compile_definitions(arch PRIVATE -DMODULE_STM0=MODULE_CPU0
+                                        -DSRC_STM0SR0=SRC_STMCPU0_SR2)
diff --git a/arch/tricore/src/tc4xx/Make.defs b/arch/tricore/src/tc4xx/Make.defs
index bbc3a15fa28..809e2d74ae0 100644
--- a/arch/tricore/src/tc4xx/Make.defs
+++ b/arch/tricore/src/tc4xx/Make.defs
@@ -147,8 +147,6 @@ SDK_CSRCS += 
$(ILLD_DIR)/Libraries/Infra/Ssw/TC4xx/Tricore/Ifx_Ssw_Infra.c
 SDK_CSRCS += $(ILLD_DIR)/Libraries/Infra/Ssw/TC4xx/Tricore/Ifx_Ssw_Tc0.c
 
 CFLAGS += $(addprefix ${INCDIR_PREFIX},$(SDK_INCDIR))
-CFLAGS += -DSRC_CPU_CPU0_SB=SRC_CPU0SB
-CFLAGS += -DSRC_GPSR00=SRC_GPSR0SR0
 CFLAGS += -DMODULE_STM0=MODULE_CPU0
 CFLAGS += -DSRC_STM0SR0=SRC_STMCPU0_SR2
 

Reply via email to