Update the default settings for DMTimers

Signed-off-by: Ming Wei <mwei@ti.com>

5 files changed, 91 insertions, 67 deletions

diff --git a/soc/j721e/TimerP_default.c b/soc/j721e/TimerP_default.c
index 4d0eb04..5fc1309 100644
--- a/soc/j721e/TimerP_default.c
+++ b/soc/j721e/TimerP_default.c
@@ -69,8 +69,8 @@ TimerP_dmTimerDefault gDmTimerPInfoTbl[TimerP_numTimerDevices] = {
 #if defined (BUILD_DSP_1) || defined (BUILD_DSP_2)
      /* Default configurations for DSP core */
      CSL_TIMER0_CFG_BASE,                                /* Main domain's DM Timer base address */
-     0U,                                                 /* TBD */
-     0U                                                  /* TBD */
+     TIMERP_INTR_USER_CONFIGURE,                         /* User Confugure */
+     TIMERP_EVENT_USER_CONFIGURE                         /* User Confugure */
 #endif
   },
   /* Timer ID 1 */
@@ -87,9 +87,9 @@ TimerP_dmTimerDefault gDmTimerPInfoTbl[TimerP_numTimerDevices] = {
      TIMERP_EVENT_NOT_AVAILABLE
 #endif
 #if defined (BUILD_DSP_1) || defined (BUILD_DSP_2)
-     CSL_TIMER0_CFG_BASE,
-     0U,                                                 /* TBD */
-     0U                                                  /* TBD */
+     CSL_TIMER1_CFG_BASE,
+     TIMERP_INTR_USER_CONFIGURE,                         /* User Confugure */
+     TIMERP_EVENT_USER_CONFIGURE                         /* User Confugure */
 #endif
   },
   /* Timer ID 2 */
@@ -106,9 +106,9 @@ TimerP_dmTimerDefault gDmTimerPInfoTbl[TimerP_numTimerDevices] = {
      TIMERP_EVENT_NOT_AVAILABLE
 #endif
 #if defined (BUILD_DSP_1) || defined (BUILD_DSP_2)
-     CSL_TIMER0_CFG_BASE,
-     0U,                                                 /* TBD */
-     0U                                                  /* TBD */
+     CSL_TIMER2_CFG_BASE,
+     TIMERP_INTR_USER_CONFIGURE,                         /* User Confugure */
+     TIMERP_EVENT_USER_CONFIGURE                         /* User Confugure */
 #endif
   },
   /* Timer ID 3 */
@@ -125,9 +125,9 @@ TimerP_dmTimerDefault gDmTimerPInfoTbl[TimerP_numTimerDevices] = {
      TIMERP_EVENT_NOT_AVAILABLE
 #endif
 #if defined (BUILD_DSP_1) || defined (BUILD_DSP_2)
-     CSL_TIMER0_CFG_BASE,
-     0U,                                                 /* TBD */
-     0U                                                  /* TBD */
+     CSL_TIMER3_CFG_BASE,
+     TIMERP_INTR_USER_CONFIGURE,                         /* User Confugure */
+     TIMERP_EVENT_USER_CONFIGURE                         /* User Confugure */
 #endif
   },
   /* Timer ID 4 */
@@ -144,9 +144,9 @@ TimerP_dmTimerDefault gDmTimerPInfoTbl[TimerP_numTimerDevices] = {
      TIMERP_EVENT_NOT_AVAILABLE
 #endif
 #if defined (BUILD_DSP_1) || defined (BUILD_DSP_2)
-     CSL_TIMER0_CFG_BASE,
-     0U,                                                 /* TBD */
-     0U                                                  /* TBD */
+     CSL_TIMER4_CFG_BASE,
+     TIMERP_INTR_USER_CONFIGURE,                         /* User Confugure */
+     TIMERP_EVENT_USER_CONFIGURE                         /* User Confugure */
 #endif
   },
   /* Timer ID 5 */
@@ -163,9 +163,9 @@ TimerP_dmTimerDefault gDmTimerPInfoTbl[TimerP_numTimerDevices] = {
      TIMERP_EVENT_NOT_AVAILABLE
 #endif
 #if defined (BUILD_DSP_1) || defined (BUILD_DSP_2)
-     CSL_TIMER0_CFG_BASE,
-     0U,                                                 /* TBD */
-     0U                                                  /* TBD */
+     CSL_TIMER5_CFG_BASE,
+     TIMERP_INTR_USER_CONFIGURE,                         /* User Confugure */
+     TIMERP_EVENT_USER_CONFIGURE                         /* User Confugure */
 #endif
   },
   /* Timer ID 6 */
@@ -182,9 +182,9 @@ TimerP_dmTimerDefault gDmTimerPInfoTbl[TimerP_numTimerDevices] = {
      TIMERP_EVENT_NOT_AVAILABLE
 #endif
 #if defined (BUILD_DSP_1) || defined (BUILD_DSP_2)
-     CSL_TIMER0_CFG_BASE,
-     0U,                                                 /* TBD */
-     0U                                                  /* TBD */
+     CSL_TIMER6_CFG_BASE,
+     TIMERP_INTR_USER_CONFIGURE,                         /* User Confugure */
+     TIMERP_EVENT_USER_CONFIGURE                         /* User Confugure */
 #endif
   },
    /* Timer ID 7 */
@@ -201,9 +201,9 @@ TimerP_dmTimerDefault gDmTimerPInfoTbl[TimerP_numTimerDevices] = {
      TIMERP_EVENT_NOT_AVAILABLE
 #endif
 #if defined (BUILD_DSP_1) || defined (BUILD_DSP_2)
-     CSL_TIMER0_CFG_BASE,
-     0U,                                                 /* TBD */
-     0U                                                  /* TBD */
+     CSL_TIMER7_CFG_BASE,
+     TIMERP_INTR_USER_CONFIGURE,                         /* User Confugure */
+     TIMERP_EVENT_USER_CONFIGURE                         /* User Confugure */
 #endif
   },
   /* Timer ID 8 */
@@ -220,9 +220,9 @@ TimerP_dmTimerDefault gDmTimerPInfoTbl[TimerP_numTimerDevices] = {
      TIMERP_EVENT_NOT_AVAILABLE
 #endif
 #if defined (BUILD_DSP_1) || defined (BUILD_DSP_2)
-     CSL_TIMER0_CFG_BASE,
-     0U,                                                 /* TBD */
-     0U                                                  /* TBD */
+     CSL_TIMER8_CFG_BASE,
+     TIMERP_INTR_USER_CONFIGURE,                         /* User Confugure */
+     TIMERP_EVENT_USER_CONFIGURE                         /* User Confugure */
 #endif
   },
   /* Timer ID 9 */
@@ -239,9 +239,9 @@ TimerP_dmTimerDefault gDmTimerPInfoTbl[TimerP_numTimerDevices] = {
      TIMERP_EVENT_NOT_AVAILABLE
 #endif
 #if defined (BUILD_DSP_1) || defined (BUILD_DSP_2)
-     CSL_TIMER0_CFG_BASE,
-     0U,                                                 /* TBD */
-     0U                                                  /* TBD */
+     CSL_TIMER9_CFG_BASE,
+     TIMERP_INTR_USER_CONFIGURE,                         /* User Confugure */
+     TIMERP_EVENT_USER_CONFIGURE                         /* User Confugure */
 #endif
   },
   /* Timer ID 10 */
@@ -258,9 +258,9 @@ TimerP_dmTimerDefault gDmTimerPInfoTbl[TimerP_numTimerDevices] = {
      TIMERP_EVENT_NOT_AVAILABLE
 #endif
 #if defined (BUILD_DSP_1) || defined (BUILD_DSP_2)
-     CSL_TIMER0_CFG_BASE,
-     0U,                                                 /* TBD */
-     0U                                                  /* TBD */
+     CSL_TIMER10_CFG_BASE,
+     TIMERP_INTR_USER_CONFIGURE,                         /* User Confugure */
+     TIMERP_EVENT_USER_CONFIGURE                         /* User Confugure */
 #endif
   },
   /* Timer ID 11 */
@@ -277,9 +277,9 @@ TimerP_dmTimerDefault gDmTimerPInfoTbl[TimerP_numTimerDevices] = {
      TIMERP_EVENT_NOT_AVAILABLE
 #endif
 #if defined (BUILD_DSP_1) || defined (BUILD_DSP_2)
-     CSL_TIMER0_CFG_BASE,
-     0U,                                                 /* TBD */
-     0U                                                  /* TBD */
+     CSL_TIMER11_CFG_BASE,
+     TIMERP_INTR_USER_CONFIGURE,                         /* User Confugure */
+     TIMERP_EVENT_USER_CONFIGURE                         /* User Confugure */
 #endif
   },
   /* Timer ID 12 */
@@ -296,9 +296,9 @@ TimerP_dmTimerDefault gDmTimerPInfoTbl[TimerP_numTimerDevices] = {
      TIMERP_EVENT_NOT_AVAILABLE
 #endif
 #if defined (BUILD_DSP_1) || defined (BUILD_DSP_2)
-     CSL_TIMER0_CFG_BASE,
-     0U,                                                 /* TBD */
-     0U                                                  /* TBD */
+     CSL_TIMER12_CFG_BASE,
+     TIMERP_INTR_USER_CONFIGURE,                         /* User Confugure */
+     TIMERP_EVENT_USER_CONFIGURE                         /* User Confugure */
 #endif
   },
   /* Timer ID 13 */
@@ -315,9 +315,9 @@ TimerP_dmTimerDefault gDmTimerPInfoTbl[TimerP_numTimerDevices] = {
      TIMERP_EVENT_NOT_AVAILABLE
 #endif
 #if defined (BUILD_DSP_1) || defined (BUILD_DSP_2)
-     CSL_TIMER0_CFG_BASE,
-     0U,                                                 /* TBD */
-     0U                                                  /* TBD */
+     CSL_TIMER13_CFG_BASE,
+     TIMERP_INTR_USER_CONFIGURE,                         /* User Confugure */
+     TIMERP_EVENT_USER_CONFIGURE                         /* User Confugure */
 #endif
   },
   /* Timer ID 14 */
@@ -334,9 +334,9 @@ TimerP_dmTimerDefault gDmTimerPInfoTbl[TimerP_numTimerDevices] = {
      TIMERP_EVENT_NOT_AVAILABLE
 #endif
 #if defined (BUILD_DSP_1) || defined (BUILD_DSP_2)
-     CSL_TIMER0_CFG_BASE,
-     0U,                                                 /* TBD */
-     0U                                                  /* TBD */
+     CSL_TIMER14_CFG_BASE,
+     TIMERP_INTR_USER_CONFIGURE,                         /* User Confugure */
+     TIMERP_EVENT_USER_CONFIGURE                         /* User Confugure */
 #endif
   },
   /* Timer ID 15 */
@@ -353,9 +353,9 @@ TimerP_dmTimerDefault gDmTimerPInfoTbl[TimerP_numTimerDevices] = {
      TIMERP_EVENT_NOT_AVAILABLE
 #endif
 #if defined (BUILD_DSP_1) || defined (BUILD_DSP_2)
-     CSL_TIMER0_CFG_BASE,
-     0U,                                                 /* TBD */
-     0U                                                  /* TBD */
+     CSL_TIMER15_CFG_BASE,
+     TIMERP_INTR_USER_CONFIGURE,                         /* User Confugure */
+     TIMERP_EVENT_USER_CONFIGURE                         /* User Confugure */
 #endif
   },
   /* Timer ID 16 */
@@ -372,9 +372,9 @@ TimerP_dmTimerDefault gDmTimerPInfoTbl[TimerP_numTimerDevices] = {
      TIMERP_EVENT_NOT_AVAILABLE
 #endif
 #if defined (BUILD_DSP_1) || defined (BUILD_DSP_2)
-     CSL_TIMER0_CFG_BASE,
-     0U,                                                 /* TBD */
-     0U                                                  /* TBD */
+     CSL_TIMER16_CFG_BASE,
+     TIMERP_INTR_USER_CONFIGURE,                         /* User Confugure */
+     TIMERP_EVENT_USER_CONFIGURE                         /* User Confugure */
 #endif
   },
   /* Timer ID 17 */
@@ -391,9 +391,9 @@ TimerP_dmTimerDefault gDmTimerPInfoTbl[TimerP_numTimerDevices] = {
      TIMERP_EVENT_NOT_AVAILABLE
 #endif
 #if defined (BUILD_DSP_1) || defined (BUILD_DSP_2)
-     CSL_TIMER0_CFG_BASE,
-     0U,                                                 /* TBD */
-     0U                                                  /* TBD */
+     CSL_TIMER17_CFG_BASE,
+     TIMERP_INTR_USER_CONFIGURE,                         /* User Confugure */
+     TIMERP_EVENT_USER_CONFIGURE                         /* User Confugure */
 #endif
   },
   /* Timer ID 18 */
@@ -410,9 +410,9 @@ TimerP_dmTimerDefault gDmTimerPInfoTbl[TimerP_numTimerDevices] = {
      TIMERP_EVENT_NOT_AVAILABLE
 #endif
 #if defined (BUILD_DSP_1) || defined (BUILD_DSP_2)
-     CSL_TIMER0_CFG_BASE,
-     0U,                                                 /* TBD */
-     0U                                                  /* TBD */
+     CSL_TIMER18_CFG_BASE,
+     TIMERP_INTR_USER_CONFIGURE,                         /* User Confugure */
+     TIMERP_EVENT_USER_CONFIGURE                         /* User Confugure */
 #endif
   },
   /* Timer ID 19 */
@@ -429,9 +429,9 @@ TimerP_dmTimerDefault gDmTimerPInfoTbl[TimerP_numTimerDevices] = {
      TIMERP_EVENT_NOT_AVAILABLE
 #endif
 #if defined (BUILD_DSP_1) || defined (BUILD_DSP_2)
-     CSL_TIMER0_CFG_BASE,
-     0U,                                                 /* TBD */
-     0U                                                  /* TBD */
+     CSL_TIMER19_CFG_BASE,
+     TIMERP_INTR_USER_CONFIGURE,                         /* User Confugure */
+     TIMERP_EVENT_USER_CONFIGURE                         /* User Confugure */
 #endif
   }
 };
diff --git a/src/nonos/Nonos_config.h b/src/nonos/Nonos_config.h
index afb72e2..cb73869 100644
--- a/src/nonos/Nonos_config.h
+++ b/src/nonos/Nonos_config.h
@@ -113,6 +113,8 @@ typedef struct hwi_struct {
 #endif
 
 #define  TIMERP_EVENT_NOT_AVAILABLE (-(int32_t) (1u))
+#define  TIMERP_INTR_USER_CONFIGURE (-(int32_t) (2u))
+#define  TIMERP_EVENT_USER_CONFIGURE (-(int32_t) (3u))
 
 /*
  *  @brief    TimerP Information structure
diff --git a/src/tirtos/RegisterIntr_tirtos.c b/src/tirtos/RegisterIntr_tirtos.c
index 8265bca..5d1da5f 100644
--- a/src/tirtos/RegisterIntr_tirtos.c
+++ b/src/tirtos/RegisterIntr_tirtos.c
@@ -87,7 +87,7 @@ void Osal_RegisterInterrupt_initParams(OsalRegisterIntrParams_t *interruptRegPar
 #ifdef __TI_ARM_V7R4__
       interruptRegParams->corepacConfig.priority=0x15U; /* Default */
 #else
-#ifdef __C7100__
+#if defined(__C7100__) || defined(BUILD_DSP_1) || defined(BUILD_DSP_2)
       interruptRegParams->corepacConfig.priority=0x01U; /* Default */
 #else
       interruptRegParams->corepacConfig.priority=0x20U; /* Default */
diff --git a/test/src/main_osal_test.c b/test/src/main_osal_test.c
index 8143277..47c7ceb 100755
--- a/test/src/main_osal_test.c
+++ b/test/src/main_osal_test.c
@@ -308,8 +308,8 @@ UT_Timer_Type_t  timer_type =             UT_Timer_TIMER64;
     #define OSAL_TEST_TIMER_ID2               (3U)
     #define OSAL_TEST_TIMER_PERIOD            (5000U)
   #elif defined (BUILD_C66X_2)
-    #define OSAL_TEST_TIMER_ID                (1U)
-    #define OSAL_TEST_TIMER_ID2               (2U)
+    #define OSAL_TEST_TIMER_ID                (2U)
+    #define OSAL_TEST_TIMER_ID2               (3U)
     #define OSAL_TEST_TIMER_PERIOD            (5000U)
   #elif defined (BUILD_C7X_1)
     #define OSAL_TEST_TIMER_ID                (1U)
@@ -437,7 +437,6 @@ bool OSAL_timer_test()
 #if defined(BUILD_C66X_1) || defined(BUILD_C66X_2) || defined(BUILD_C7X_1)
     id                  = OSAL_TEST_TIMER_ID;
 #endif
-
     volatile      int32_t i;
     uint32_t      prevCount, ctrlBitmap = OSAL_HWATTR_SET_OSALDELAY_TIMER_BASE ;
     bool          ret = true;
@@ -488,18 +487,26 @@ bool OSAL_timer_test()
     timerParams.periodType = TimerP_PeriodType_MICROSECS;
     timerParams.period     = OSAL_TEST_TIMER_PERIOD;
 
+#if defined(SOC_J721E)
 #if defined(BUILD_C66X_1)
+    /* the Eevnt 21 is used for DMTimer0 by SYS/BIOS by default, so we need to use a different one here for DMTimer2 */
+        timerParams.eventId    = 22;
+    /* the Interrupt 14 is used for DMTimer0 by SYS/BIOS by default, so we need to use a different one here for DMTimer2 */
     timerParams.intNum     = 15;
     OSAL_log("\n set intNum=%d, id=%d,  \n", timerParams.intNum, id);
 #endif
 #if defined(BUILD_C66X_2)
-    timerParams.intNum     = 12;
+    /* the Eevnt 20 is used for DMTimer0 by SYS/BIOS by default, so we need to use a different one here for DMTimer2 */
+        timerParams.eventId    = 22;
+    /* the Interrupt 14 is used for DMTimer0 by SYS/BIOS by default, so we need to use a different one here for DMTimer2 */
+    timerParams.intNum     = 15;
 #endif
 
 #if defined(BUILD_C7X_1)
     timerParams.intNum     = 15;
     OSAL_log("\n set intNum=%d, id=%d,  \n", timerParams.intNum, id);
 #endif
+#endif
 
 #if !defined(SOC_J721E)
 #if defined(_TMS320C6X)
@@ -1281,14 +1288,29 @@ void C66xTimerInterruptInit(void)
      * intr_router[12] corresponds to output event #21, which is what we
      * set eventId to in .cfg file.
      *     - bit 16 enables the entry
-     *     - lower bits define input event (#0 for dmtimer #0)
+     *     - lower bits define input event (#1 for dmtimer #0)
+     * intr_router[13] corresponds to output event #22, which is what we
+     * set eventId to in this file.
+     *     - bit 16 enables the entry
+     *     - lower bits define input event (#3 for dmtimer #2)
      */
 #ifdef BUILD_C66X_1
     intr_router[12] = 0x00010001;
     intr_router[13] = 0x00010003;
 #endif
+    /*
+     * intr_router[11] corresponds to output event #20, which is what we
+     * set eventId to in .cfg file.
+     *     - bit 16 enables the entry
+     *     - lower bits define input event (#1 for dmtimer #0)
+     * intr_router[13] corresponds to output event #22, which is what we
+     * set eventId to in this file.
+     *     - bit 16 enables the entry
+     *     - lower bits define input event (#3 for dmtimer #2)
+     */
 #ifdef BUILD_C66X_2
-    intr_router[11] = 0x00010002;
+    intr_router[11] = 0x00010001;
+    intr_router[13] = 0x00010003;
 #endif
 }
 
diff --git a/test/sysbios_unit_test/makefile b/test/sysbios_unit_test/makefile
index a27a59a..e497fdc 100755
--- a/test/sysbios_unit_test/makefile
+++ b/test/sysbios_unit_test/makefile
@@ -62,7 +62,7 @@ XDC_CFG_FILE_$(CORE) = $(PDK_INSTALL_PATH)/ti/build/j721e/sysbios_c66.cfg
 EXTERNAL_LNKCMD_FILE = $(PDK_INSTALL_PATH)/ti/build/j721e/linker_c66.lds
 endif
 
-ifeq ($(CORE),$(filter $(CORE), c7x))
+ifeq ($(CORE),$(filter $(CORE), c7x_1))
 # Enable XDC build for application by providing XDC CFG File per core
 XDC_CFG_FILE_$(CORE) = $(PDK_INSTALL_PATH)/ti/build/j721e/sysbios_c7x.cfg
 EXTERNAL_LNKCMD_FILE = $(PDK_INSTALL_PATH)/ti/build/j721e/linker_c7x.lds