PRSDK-4453 Add SMP enabled support for A53 and A15 core

 Update makefile and component makefile to add entry for SMP enabled
 examples
 Add project text file and config file to add SMP enabled support for
 AM572x A15 core

5 files changed, 349 insertions, 7 deletions

diff --git a/example/MCASP_AudioLoopback_TestApp/makefile b/example/MCASP_AudioLoopback_TestApp/makefile
index 6487403..c3c7cce 100644
--- a/example/MCASP_AudioLoopback_TestApp/makefile
+++ b/example/MCASP_AudioLoopback_TestApp/makefile
@@ -1,9 +1,14 @@
 # Makefile for McASP device loopback unit test app
 include $(PDK_INSTALL_PATH)/ti/build/Rules.make
-export DISABLE_RECURSE_DEPS
-
-#Name of the directory created under packages/ti/binary/
-APP_NAME = MCASP_AudioLoopback_TestApp
+#export DISABLE_RECURSE_DEPS
+
+ifeq ($(SMP), enable)
+    #Name of the directory created under packages/ti/binary/
+    APP_NAME = MCASP_AudioLoopback_SMP_TestApp
+else
+    #Name of the directory created under packages/ti/binary/
+    APP_NAME = MCASP_AudioLoopback_TestApp
+endif
 
 SRCDIR = ../src ../../
 INCDIR = ../src ../include ../../
diff --git a/example/evmAM572x/armv7/bios/AudioLoopback_smp.cfg b/example/evmAM572x/armv7/bios/AudioLoopback_smp.cfg
new file mode 100644
index 0000000..0f22159
--- /dev/null
+++ b/example/evmAM572x/armv7/bios/AudioLoopback_smp.cfg
@@ -0,0 +1,295 @@
+/**
+ *  \file   AudiioLoopback_smp.cfg
+ *
+ *  \brief  Sysbios config file for mmcsd test project on AM572X GP EVM
+ *          with SMP enabled.
+ *
+ */
+
+/*
+ * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * 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.
+ *
+ */
+/* ========================================================================== */
+/*                      CFG script for the Audio sample                       */
+/* ========================================================================== */
+var Defaults    = xdc.useModule('xdc.runtime.Defaults');
+var Diags               = xdc.useModule('xdc.runtime.Diags');
+var Error = xdc.useModule('xdc.runtime.Error');
+var Log                 = xdc.useModule('xdc.runtime.Log');
+var LoggerBuf   = xdc.useModule('xdc.runtime.LoggerBuf');
+var Main                = xdc.useModule('xdc.runtime.Main');
+var Memory              = xdc.useModule('xdc.runtime.Memory')
+var SysMin              = xdc.useModule('xdc.runtime.SysMin');
+var System              = xdc.useModule('xdc.runtime.System');
+var Text = xdc.useModule('xdc.runtime.Text');
+var Clock = xdc.useModule('ti.sysbios.knl.Clock');
+var Swi = xdc.useModule('ti.sysbios.knl.Swi');
+var Task        = xdc.useModule ("ti.sysbios.knl.Task");
+var Sem         = xdc.useModule("ti.sysbios.knl.Semaphore");
+var Hwi = xdc.useModule('ti.sysbios.hal.Hwi');
+var ti_sysbios_family_arm_gic_Hwi = xdc.useModule('ti.sysbios.family.arm.gic.Hwi');
+var IntXbar      = xdc.useModule('ti.sysbios.family.shared.vayu.IntXbar');
+
+/* load the required files and packages                                       */
+var GIO                 = xdc.useModule('ti.sysbios.io.GIO');
+var BIOS        = xdc.useModule ("ti.sysbios.BIOS");
+var SysStd      = xdc.useModule('xdc.runtime.SysStd');
+
+var HeapMem     = xdc.useModule ("ti.sysbios.heaps.HeapMem");
+
+var Edma                        = xdc.loadPackage ("ti.sdo.edma3.drv.sample");
+var drv                 = xdc.loadPackage ("ti.sdo.edma3.drv");
+var rm                  = xdc.loadPackage ("ti.sdo.edma3.rm");
+
+/* Enable SMP in BIOS */
+BIOS.smpEnabled = true;
+
+var socType           = "am572x";
+
+var Csl = xdc.useModule('ti.csl.Settings');
+Csl.deviceType = "am572x";
+
+/* Load the OSAL package */ 
+var osType = "tirtos"
+var Osal = xdc.useModule('ti.osal.Settings');
+Osal.osType = osType;
+Osal.socType = socType;
+
+/* Load the driver packages, starting with mcasp */
+var McASP               = xdc.loadPackage('ti.drv.mcasp');
+McASP.Settings.socType  = socType;
+
+/* Load the i2c package */
+var I2C               = xdc.loadPackage('ti.drv.i2c');
+I2C.Settings.socType  = socType;
+
+/* Load the uart package */
+var Uart = xdc.loadPackage('ti.drv.uart');
+Uart.Settings.socType  = socType;
+
+/* Load the Board package and set the board name */
+var Board = xdc.loadPackage('ti.board');
+Board.Settings.boardName = "evmAM572x";
+
+/* 
+ * The BIOS module will create the default heap for the system.
+ * Specify the size of this default heap.
+ */
+BIOS.heapSize = 0x2000;
+BIOS.cpuFreq.lo = 1000000000;
+BIOS.libType = BIOS.LibType_Custom;
+
+/* Enable the cache                                                           */
+var Cache  = xdc.useModule('ti.sysbios.hal.Cache');
+
+
+/* Enable the MMU (Required for L1/L2 caching)                              */
+
+/***********************************************
+ *              MMU Configuration              *
+ ***********************************************/
+var Mmu = xdc.useModule('ti.sysbios.family.arm.a15.Mmu');
+Mmu.enableMMU = true;
+
+/******************************************************************************
+ *
+ * SYS/BIOS assigns the following defaults to MAIR0 ATTR0, ATTR1 and ATTR2:
+ * 
+ * ATTR0 -> 0x44 (mark memory region as non-cacheable normal memory)
+ * ATTR1 -> 0x04 (mark memory region as device memory, i.e. strongly
+ * ordered and non-cacheable)
+ * ATTR2 -> 0xFF (mark memory region as normal memory, RW cacheable and
+ * RW allocate)
+ ******************************************************************************
+ */
+
+
+// descriptor attribute structure
+var attrs0 = new Mmu.DescriptorAttrs();
+
+Mmu.initDescAttrsMeta(attrs0);
+attrs0.type = Mmu.DescriptorType_BLOCK;    // BLOCK descriptor
+attrs0.shareable = 2;                      // sharerable
+attrs0.accPerm=0;                          // read/write at PL1
+attrs0.noExecute = true;
+attrs0.attrIndx = 1;                       // Non-cache, device memory
+
+Mmu.setSecondLevelDescMeta(0x4ae00000, 0x4ae00000, attrs0);
+Mmu.setSecondLevelDescMeta(0x4a4E0000, 0x4a4E0000, attrs0);
+
+/* DMA Cross bar config */
+Mmu.setSecondLevelDescMeta(0x4A000000, 0x4A000000, attrs0);
+/*
+// Set the descriptor for each entry in the address range
+for (var i=0x40000000; i < 0x60000000; i = i + 0x00200000) {
+    // Each 'BLOCK' descriptor entry spans a 2MB address range
+    Mmu.setSecondLevelDescMeta(i, i, attrs0);
+}
+*/
+/* edma */
+for (var i=0x43300000; i < 0x43520000; i = i + 0x00200000) {
+    // Each 'BLOCK' descriptor entry spans a 2MB address range
+    Mmu.setSecondLevelDescMeta(i, i, attrs0);
+}
+
+/* I2C */
+for (var i=0x48060000; i < 0x48080000; i = i + 0x00200000) {
+    // Each 'BLOCK' descriptor entry spans a 2MB address range
+    Mmu.setSecondLevelDescMeta(i, i, attrs0);
+}
+
+/* mcasp */
+for (var i=0x45800000; i < 0x47000000; i = i + 0x00200000) {
+    // Each 'BLOCK' descriptor entry spans a 2MB address range
+    Mmu.setSecondLevelDescMeta(i, i, attrs0);
+}
+
+/* mcasp contd */
+for (var i=0x48436000; i < 0x48480000; i = i + 0x00200000) {
+    // Each 'BLOCK' descriptor entry spans a 2MB address range
+    Mmu.setSecondLevelDescMeta(i, i, attrs0);
+}
+
+
+/*
+// descriptor attribute structure
+var attrs1 = new Mmu.DescriptorAttrs();
+
+Mmu.initDescAttrsMeta(attrs1);
+attrs1.type = Mmu.DescriptorType_BLOCK;    // BLOCK descriptor
+attrs1.noExecute = true;
+attrs1.accPerm=0;                          // read/write at PL1
+attrs1.shareable = 2;                      // sharerable
+attrs1.attrIndx = 2;                       // Cached, normal memory
+
+
+// Set the descriptor for each entry in the address range
+for (var i=0x80000000; i < 0xA0000000; i = i + 0x00200000) {
+    // Each 'BLOCK' descriptor entry spans a 2MB address range
+    Mmu.setSecondLevelDescMeta(i, i, attrs1);
+}
+*/
+
+var attrs = new Mmu.DescriptorAttrs();
+Mmu.initDescAttrsMeta(attrs);
+attrs.type = Mmu.DescriptorType_BLOCK;
+attrs.noExecute = true;
+attrs.accPerm = 0;
+attrs.attrIndx = 1;
+/* Set IO Delay configuration areas as non-cache */
+Mmu.setSecondLevelDescMeta(0x4844a000, 0x4844a000, attrs);
+Mmu.setSecondLevelDescMeta(0x4ae07d00, 0x4ae07d00, attrs);
+
+
+/*
+ * Program.argSize sets the size of the .args section.
+ * The examples don't use command line args so argSize is set to 0.
+ */
+Program.argSize = 0x0;
+
+/* System stack size (used by ISRs and Swis) */
+Program.stack = 0x20000;
+
+/*
+ * Minimize exit handler array in System.  The System module includes
+ * an array of functions that are registered with System_atexit() to be
+ * called by System_exit().
+ */
+System.maxAtexitHandlers = 4;
+
+/* Circular buffer size for System_printf() */
+SysMin.bufSize = 0x200;
+System.SupportProxy = SysMin;
+
+/* 
+ * Create and install logger for the whole system
+ */
+/*
+ * Create and install logger for the whole system
+ */
+var loggerBufParams = new LoggerBuf.Params();
+loggerBufParams.numEntries = 16;
+var logger0 = LoggerBuf.create(loggerBufParams);
+Defaults.common$.logger = logger0;
+Main.common$.diags_INFO = Diags.ALWAYS_ON;
+
+if (Program.build.target.$name.match(/gnu/)) {
+    if (Program.build.target.$name.match(/A8F/) ||
+        Program.build.target.$name.match(/A9F/) ||
+        Program.build.target.$name.match(/A15F/)) {
+        var SemiHost = xdc.useModule('ti.sysbios.rts.gnu.SemiHostSupport');
+    }
+}
+
+
+/* allocate a config-params object */  
+var HeapParam = new HeapMem.Params;  
+  
+/* optionally assign per-instance configs */  
+HeapParam.size = 200000;
+//HeapParam.sectionName = "L2SRAM"
+  
+/* create an instance-object */  
+Program.global.myHeap = HeapMem.create(HeapParam);  
+
+var task0Params = new Task.Params();
+task0Params.priority = 5;
+task0Params.instance.name = "task0";
+
+Program.global.task0 = Task.create("&Audio_echo_Task", task0Params);
+
+//Program.sectMap[".text"] = "L2SRAM";
+// chnaging default tick of timer to 100us from default 1000us
+var Clock = xdc.useModule('ti.sysbios.knl.Clock'); 
+Clock.tickPeriod = 1000;
+
+ 
+ 
+var Load = xdc.useModule('ti.sysbios.utils.Load');
+ // Load.common$.logger = loggerBuf0;
+var Diags = xdc.useModule('xdc.runtime.Diags');
+Load.common$.diags_USER4 = Diags.ALWAYS_ON;
+
+
+
+/* No runtime stack checking is performed */
+// Task.checkStackFlag = false;
+
+
+/* Reduce the number of task priorities */
+// Task.numPriorities = 6;
+
+
+
+/* ================ Memory sections configuration ================ */
+Program.sectMap["BOARD_IO_DELAY_DATA"] = "OCMC_RAM1";
+Program.sectMap["BOARD_IO_DELAY_CODE"] = "OCMC_RAM1";
diff --git a/example/evmAM572x/armv7/bios/MCASP_Audio_evmAM572x_SMP_armExampleProject.txt b/example/evmAM572x/armv7/bios/MCASP_Audio_evmAM572x_SMP_armExampleProject.txt
new file mode 100644
index 0000000..c91f0a7
--- /dev/null
+++ b/example/evmAM572x/armv7/bios/MCASP_Audio_evmAM572x_SMP_armExampleProject.txt
@@ -0,0 +1,12 @@
+-ccs.linkFile "${PDK_INSTALL_PATH}/ti/drv/mcasp/example/src/audioSample_io.c" 
+-ccs.linkFile "${PDK_INSTALL_PATH}/ti/drv/mcasp/example/src/audioSample_main.c"
+-ccs.linkFile "${PDK_INSTALL_PATH}/ti/drv/mcasp/example/src/aic3104_if.c"
+-ccs.linkFile "${PDK_INSTALL_PATH}/ti/drv/mcasp/example/src/aic31.c"
+-ccs.linkFile "${PDK_INSTALL_PATH}/ti/drv/mcasp/example/src/codec_if.c"
+-ccs.linkFile "${PDK_INSTALL_PATH}/ti/drv/mcasp/example/evmAM572x/src/audio_evmInit.c"
+-ccs.linkFile "${PDK_INSTALL_PATH}/ti/drv/mcasp/example/evmAM572x/src/mcasp_cfg.c"
+-ccs.linkFile "${PDK_INSTALL_PATH}/ti/drv/mcasp/soc/am572x/mcasp_soc.c"
+-ccs.linkFile "${PDK_INSTALL_PATH}/ti/drv/i2c/soc/am572x/I2C_soc.c"
+-ccs.linkFile "${PDK_INSTALL_PATH}/ti/drv/mcasp/example/evmAM572x/armv7/bios/AudioLoopback_smp.cfg" 
+-ccs.setCompilerOptions "-c -mcpu=cortex-a15 -mtune=cortex-a15 -march=armv7-a -marm -mfloat-abi=hard -DMCASP_MASTER -DAIC_CODEC -DSOC_AM572x -DEVM_AM572X -g -gstrict-dwarf -Wall -MMD -MP -I${PDK_INSTALL_PATH} -I${PDK_INSTALL_PATH}/ti/drv/mcasp/example/include -I${PDK_INSTALL_PATH}/ti/drv/mcasp/example/evmAM572x/include -I${PDK_INSTALL_PATH}/ti/drv/mcasp/include -I${PDK_INSTALL_PATH}/ti/drv/mcasp -I${PDK_INSTALL_PATH}/ti/board" -rtsc.enableRtsc 
+-ccs.setLinkerOptions "-lrdimon -lgcc -lm -lnosys -nostartfiles -static -Wl,--gc-sections "
diff --git a/example/evmAM65xx/a53/mcaspUnitTest_a53.cfg b/example/evmAM65xx/a53/mcaspUnitTest_a53.cfg
index 37e6f12..5459e05 100644
--- a/example/evmAM65xx/a53/mcaspUnitTest_a53.cfg
+++ b/example/evmAM65xx/a53/mcaspUnitTest_a53.cfg
@@ -1,6 +1,6 @@
 
 /* =============================================================================
- *   Copyright (c) Texas Instruments Incorporated 2017
+ *   Copyright (c) Texas Instruments Incorporated 2017-2019
  *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions
@@ -173,7 +173,16 @@ var HeapParam = new HeapMem.Params;
   
 /* optionally assign per-instance configs */  
 HeapParam.size = 200000;
-  
+
+/* Enable SMP mode in BIOS if SMP is enabled from makefile */
+var smp = java.lang.System.getenv("SMP")
+if(smp == 'enable')
+{
+    xdc.print("Enabling BIOS SMP mode");
+        BIOS.smpEnabled = true;
+        var Cache = xdc.module("ti.sysbios.hal.Cache");
+}
+
 /* create an instance-object */  
 Program.global.myHeap = HeapMem.create(HeapParam);
 
diff --git a/mcasp_component.mk b/mcasp_component.mk
index 635795a..a1231cc 100644
--- a/mcasp_component.mk
+++ b/mcasp_component.mk
@@ -97,7 +97,7 @@ drvmcasp_LIB_LIST = $(mcasp_LIB_LIST)
 # All the tests mentioned in list are built when test target is called
 # List below all examples for allowed values
 ############################
-mcasp_EXAMPLE_LIST = MCASP_AudioLoopback_TestApp MCASP_DeviceLoopback_TestApp MCASP_DeviceLoopback_Regression_TestApp
+mcasp_EXAMPLE_LIST = MCASP_AudioLoopback_TestApp MCASP_AudioLoopback_SMP_TestApp MCASP_DeviceLoopback_TestApp MCASP_DeviceLoopback_Regression_TestApp
 
 #
 # MCASP Modules
@@ -179,6 +179,27 @@ export MCASP_AudioLoopback_TestApp_BOARDLIST
 MCASP_AudioLoopback_TestApp_$(SOC)_CORELIST = $(drvmcasp_$(SOC)_CORELIST)
 export MCASP_AudioLoopback_TestApp_$(SOC)_CORELIST
 
+
+# McASP Audio Loopback example app with SMP enabled
+MCASP_AudioLoopback_SMP_TestApp_COMP_LIST = MCASP_AudioLoopback_SMP_TestApp
+MCASP_AudioLoopback_SMP_TestApp_RELPATH = ti/drv/mcasp/example/MCASP_AudioLoopback_TestApp
+MCASP_AudioLoopback_SMP_TestApp_PATH = $(PDK_MCASP_COMP_PATH)/example/MCASP_AudioLoopback_TestApp
+MCASP_AudioLoopback_SMP_TestApp_MAKEFILE = -f makefile SMP=enable
+MCASP_AudioLoopback_SMP_TestApp_BOARD_DEPENDENCY = yes
+MCASP_AudioLoopback_SMP_TestApp_CORE_DEPENDENCY = no
+MCASP_AudioLoopback_SMP_TestApp_XDC_CONFIGURO = yes
+export MCASP_AudioLoopback_SMP_TestApp_COMP_LIST
+export MCASP_AudioLoopback_SMP_TestApp_BOARD_DEPENDENCY
+export MCASP_AudioLoopback_SMP_TestApp_CORE_DEPENDENCY
+export MCASP_AudioLoopback_SMP_TestApp_XDC_CONFIGURO
+export MCASP_AudioLoopback_SMP_TestApp_MAKEFILE
+MCASP_AudioLoopback_SMP_TestApp_PKG_LIST = MCASP_AudioLoopback_SMP_TestApp
+MCASP_AudioLoopback_SMP_TestApp_INCLUDE = $(MCASP_AudioLoopback_SMP_TestApp_PATH)
+MCASP_AudioLoopback_SMP_TestApp_BOARDLIST = am65xx_evm am65xx_idk
+export MCASP_AudioLoopback_TestApp_BOARDLIST
+MCASP_AudioLoopback_SMP_TestApp_$(SOC)_CORELIST = mpu1_0
+export MCASP_AudioLoopback_SMP_TestApp_$(SOC)_CORELIST
+
 # McASP sysbios unit test app
 MCASP_DeviceLoopback_TestApp_COMP_LIST = MCASP_DeviceLoopback_TestApp
 MCASP_DeviceLoopback_TestApp_RELPATH = ti/drv/mcasp/example/MCASP_DeviceLoopback_TestApp