PRSDK-5851: Update OSAL_hwAttrs structure params

 1. Add a params to Osal_HwAttrs structure.
 2. Add common get_CoreId API to support all cores in future.
 3. Update HwiP_create function to use the get_CoreId API to mask the
 target processor interrupt for the running core.

7 files changed, 89 insertions, 7 deletions

diff --git a/arch/core/Core_utils.c b/arch/core/Core_utils.c
new file mode 100644
index 0000000..5464297
--- /dev/null
+++ b/arch/core/Core_utils.c
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2019, Texas Instruments Incorporated
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * *  Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * *  Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * *  Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*
+ *  ======== Core_utils.c ========
+ */
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+
+#if defined(gnu_targets_arm_A15F)
+#include <ti/csl/arch/a15/V0/csl_a15.h>
+#endif
+
+int32_t Osal_getCoreId()
+{
+#if defined(gnu_targets_arm_A15F)
+    return ((int32_t)CSL_a15ReadCoreId());
+#else
+    return 0;
+#endif
+}
diff --git a/osal.h b/osal.h
index 487b733..d46abc7 100644
--- a/osal.h
+++ b/osal.h
@@ -224,6 +224,8 @@ typedef struct Osal_HwAttrs_s
    int32_t  cpuFreqKHz;
    /* External Clock value in KHz */
    int32_t  extClkKHz;
+   /* Set Target processor list */
+   uint32_t targetProcMask;
 #ifdef _TMS320C6X
    int32_t ECM_intNum[4]; /* Interrupt numbers for Event combiner groups (0-3)*/
 #endif
@@ -274,6 +276,11 @@ typedef struct Osal_HwAttrs_s
  */
 #define OSAL_HWATTR_SET_CPU_FREQ        (0x00000040)
 
+/*!
+ * bit map to set the target processor list to direct interrupts to specific core
+ */
+#define OSAL_HWATTR_SET_TARG_PROC_LIST  (0x00000080)
+
 
 /*!
  *  @brief  Function to set the Hw Attributes
@@ -312,6 +319,12 @@ extern int32_t Osal_getHwAttrs(Osal_HwAttrs *hwAttrs);
  */
 extern int32_t Osal_getStaticMemStatus(Osal_StaticMemStatus *pMemStat);
 
+/*!
+ *  @brief  Function to get the core ID of the running Core.
+ *
+ *  @return core ID of the running core
+ */
+extern int32_t Osal_getCoreId(void);
 
 /*! 
  * @brief external references for Osal Hw Attribute structure 
diff --git a/src/nonos/Utils_nonos.c b/src/nonos/Utils_nonos.c
index cf83bc1..5a9c698 100644
--- a/src/nonos/Utils_nonos.c
+++ b/src/nonos/Utils_nonos.c
@@ -50,6 +50,10 @@
 #define OSAL_DELAY_TIMER_ADDR_DEFAULT ((uintptr_t)(NULL))
 #endif
 
+#ifndef OSAL_TARGET_PROC_MASK_DEFAULT
+#define OSAL_TARGET_PROC_MASK_DEFAULT (0xFFFFU)
+#endif
+
 /* Global Osal static memory status variables */
 uint32_t  gOsalSemAllocCnt   = 0U, gOsalSemPeak = 0U;
 uint32_t  gOsalTimerAllocCnt = 0U, gOsalTimerPeak = 0U;
@@ -63,6 +67,7 @@ uint32_t  gOsalHwiAllocCnt   = 0U, gOsalHwiPeak = 0U;
 Osal_HwAttrs  gOsal_HwAttrs = {
    OSAL_CPU_FREQ_KHZ_DEFAULT,
    EXTERNAL_CLOCK_KHZ_DEFAULT,
+   OSAL_TARGET_PROC_MASK_DEFAULT,
 #ifdef _TMS320C6X
    /* ECM_intNum[]: Event combiner interrupts */ 
   { OSAL_ECM_GROUP0_INT, /* Interrupt[4-15] to use for Event Combiner Group 0 */
diff --git a/src/src_common_tirtos.mk b/src/src_common_tirtos.mk
index 81f188a..b2abf88 100644
--- a/src/src_common_tirtos.mk
+++ b/src/src_common_tirtos.mk
@@ -1,8 +1,8 @@
 
-SRCDIR = . src/tirtos
+SRCDIR = . src/tirtos arch/core
 INCDIR = . src/tirtos
 
-SRCS_COMMON += SemaphoreP_tirtos.c HwiP_tirtos.c SwiP_tirtos.c Utils_tirtos.c CacheP_tirtos.c RegisterIntr_tirtos.c EventCombinerP_tirtos.c Queue_tirtos.c EventP_tirtos.c TaskP_tirtos.c
+SRCS_COMMON += Core_utils.c SemaphoreP_tirtos.c HwiP_tirtos.c SwiP_tirtos.c Utils_tirtos.c CacheP_tirtos.c RegisterIntr_tirtos.c EventCombinerP_tirtos.c Queue_tirtos.c EventP_tirtos.c TaskP_tirtos.c
 
 ifeq ($(SOC),$(filter $(SOC), am574x am572x am571x k2g k2l k2e k2h k2k c6678 c6657 am437x am335x omapl137 omapl138 c6747 am65xx j721e))
 SRCS_COMMON += TimerP_tirtos.c
@@ -14,7 +14,7 @@ ifeq ($(ISA),$(filter $(ISA), a53 a72 c7x))
 endif
 
 PACKAGE_SRCS_COMMON = makefile HwiP.h SwiP.h MuxIntcP.h osal.h osal_component.mk SemaphoreP.h \
-                      src/tirtos src/src_common_nonos.mk  src/src_common_tirtos.mk \
+                      arch/core src/tirtos src/src_common_nonos.mk  src/src_common_tirtos.mk \
                       docs/OSAL_SoftwareManifest.html docs/ReleaseNotes_OSAL.pdf \
                       build/makefile_nonos_indp.mk build/makefile_nonos.mk build/makefile_tirtos_indp.mk build/makefile_tirtos.mk
 
diff --git a/src/tirtos/HwiP_tirtos.c b/src/tirtos/HwiP_tirtos.c
index eb45902..56400ab 100644
--- a/src/tirtos/HwiP_tirtos.c
+++ b/src/tirtos/HwiP_tirtos.c
@@ -42,13 +42,11 @@
 #include <xdc/std.h>
 #include <xdc/runtime/Error.h>
 #include <xdc/runtime/Memory.h>
+#include <ti/sysbios/BIOS.h>
 #if  defined(__ARM_ARCH_7A__)
 
 #if defined(gnu_targets_arm_A15F) || defined(gnu_targets_arm_A9F)
 #include <ti/sysbios/family/arm/gic/Hwi.h>
-#if defined(gnu_targets_arm_A15F)
-#include <ti/csl/arch/a15/V0/csl_a15.h>
-#endif
 #elif defined(ti_targets_arm_elf_A8F) || \
       defined(ti_targets_arm_elf_A8Fnv) || \
       defined(gnu_targets_arm_A8F)
@@ -220,7 +218,10 @@ HwiP_Handle HwiP_create(int32_t interruptNum, HwiP_Fxn hwiFxn,
 #endif
 #if defined(gnu_targets_arm_A15F)
             /* Set the target interrupt to the running core */
-            hwiParams.targetProcList = 1 << CSL_a15ReadCoreId();
+            if(gOsal_HwAttrs.targetProcMask == OSAL_TARGET_PROC_MASK_DEFAULT)
+            {
+                hwiParams.targetProcList = 1 << Osal_getCoreId();
+            }
 #endif
 #endif
 #if defined (__TI_ARM_V7R4__)
diff --git a/src/tirtos/Utils_tirtos.c b/src/tirtos/Utils_tirtos.c
index 847d55f..277ab42 100755
--- a/src/tirtos/Utils_tirtos.c
+++ b/src/tirtos/Utils_tirtos.c
@@ -67,6 +67,7 @@ uint32_t  gOsalHwiAllocCnt   = 0U, gOsalHwiPeak = 0U;
 Osal_HwAttrs  gOsal_HwAttrs = {
    OSAL_CPU_FREQ_KHZ_DEFAULT,
    EXTERNAL_CLOCK_KHZ_DEFAULT,
+   OSAL_TARGET_PROC_MASK_DEFAULT,
 #ifdef _TMS320C6X
    /* ECM_intNum[]: Event combiner interrupts */ 
   { OSAL_ECM_GROUP0_INT, /* Interrupt[4-15] to use for Event Combiner Group 0 */
@@ -191,6 +192,12 @@ int32_t Osal_setHwAttrs(uint32_t ctrlBitMap, const Osal_HwAttrs *hwAttrs)
          ret = osal_OK;
      }
 
+     /* Set the target processor list for routing the interrupt to specific core */
+     if (ctrlBitMap & OSAL_HWATTR_SET_TARG_PROC_LIST)
+     {
+         gOsal_HwAttrs.targetProcMask = hwAttrs->targetProcMask;
+         ret = osal_OK;
+     }
      ret = osal_OK;
    }
    return(ret);
diff --git a/src/tirtos/tirtos_config.h b/src/tirtos/tirtos_config.h
index 2c3fb85..63271bd 100644
--- a/src/tirtos/tirtos_config.h
+++ b/src/tirtos/tirtos_config.h
@@ -69,6 +69,10 @@ extern "C" {
 #endif
 #endif /* __ARM_ARCH_7A__ */
 
+#ifndef OSAL_TARGET_PROC_MASK_DEFAULT
+#define OSAL_TARGET_PROC_MASK_DEFAULT (0xFFFFU)
+#endif
+
 extern Osal_HwAttrs  gOsal_HwAttrs;
 
 #ifdef __cplusplus