j721e: icssg use case updates

 Build existing icssg dual mac firmware for j721e to resolve
 build failure for test application.
 driver and unit test updates.
 makefile udpates to include i2c library

Signed-off-by: Tinku Mannan <tmannan@ti.com>

6 files changed, 33 insertions, 16 deletions

diff --git a/build/makefile.mk b/build/makefile.mk
index 15b17e0..19ebb14 100644
--- a/build/makefile.mk
+++ b/build/makefile.mk
@@ -60,7 +60,7 @@ ifeq ($(MAKERULEDIR), )
 endif
 include $(MAKERULEDIR)/common.mk
 
-ifeq ($(SOC), $(filter $(SOC), am65xx))
+ifeq ($(SOC), $(filter $(SOC), am65xx j721e))
 ifeq ($(CORE), $(filter $(CORE), mpu1_0))
 .PHONY: dualmac_fw
 
diff --git a/src/v5/emac_drv_v5.c b/src/v5/emac_drv_v5.c
index 0c66976..4ad745b 100644
--- a/src/v5/emac_drv_v5.c
+++ b/src/v5/emac_drv_v5.c
@@ -770,11 +770,7 @@ emac_setup_udma_channel_rx(uint32_t portNum,EMAC_PER_CHANNEL_CFG_RX* pChCfg, uin
             /* subChan[0] is default flow */
             chPrms.fqRingPrms.ringMem   = pChCfg->subChan[0].freeRingMem[0];
             chPrms.fqRingPrms.elemCnt   = pChCfg->subChan[0].elementCountFree[0];
-        #if defined(SOC_J721E)
-            chPrms.fqRingPrms.mode =  CSL_RINGACC_RING_MODE_RING; /// TO DO: need to change for bringup
-        #else
             chPrms.fqRingPrms.mode =  CSL_RINGACC_RING_MODE_MESSAGE;
-        #endif
             chPrms.cqRingPrms.ringMem   = pChCfg->subChan[0].compRingMem;
             chPrms.cqRingPrms.elemCnt   = pChCfg->subChan[0].elementCountCompletion;
 
@@ -1280,7 +1276,7 @@ static void emac_config_icssg_dual_mac_fw(uint32_t port_num, EMAC_HwAttrs_V5 *hw
     EMAC_ICSSG_DUALMAC_FW_CFG *pDmFwCfg;
 
     /* work-around to use PG1.0 firmware on J7 for bringup */
-#ifdef DSOC_J721E
+#ifdef SOC_J721E
     uintptr_t addr;
     uint32_t tempVal = 0;
 
diff --git a/test/EmacLoopbackTest/j721e/cpsw/makefile b/test/EmacLoopbackTest/j721e/cpsw/makefile
index 47b8ce3..d871325 100644
--- a/test/EmacLoopbackTest/j721e/cpsw/makefile
+++ b/test/EmacLoopbackTest/j721e/cpsw/makefile
@@ -15,7 +15,7 @@ endif
 INCLUDE_EXTERNAL_INTERFACES = bios xdc pdk
 
 # List all the components required by the application
-COMP_LIST_COMMON = emac uart uart_console osal_tirtos csl board udma sciclient
+COMP_LIST_COMMON = emac uart uart_console osal_tirtos csl board udma sciclient i2c
 
 
 ifeq ($(CORE),$(filter $(CORE), mpu1_0))
diff --git a/test/EmacLoopbackTest/j721e/icssg/makefile b/test/EmacLoopbackTest/j721e/icssg/makefile
index 0f6fb49..093f340 100644
--- a/test/EmacLoopbackTest/j721e/icssg/makefile
+++ b/test/EmacLoopbackTest/j721e/icssg/makefile
@@ -17,7 +17,7 @@ endif
 INCLUDE_EXTERNAL_INTERFACES = bios xdc pdk
 
 # List all the components required by the application
-COMP_LIST_COMMON = emac uart uart_console osal_tirtos csl pruss board udma sciclient
+COMP_LIST_COMMON = emac uart uart_console osal_tirtos csl pruss board udma sciclient i2c
 
 ifeq ($(CORE),$(filter $(CORE), mpu1_0))
 # Enable XDC build for application by providing XDC CFG File per core
diff --git a/test/EmacLoopbackTest/j721e/icssg/makefile_dualmac b/test/EmacLoopbackTest/j721e/icssg/makefile_dualmac
index 80b751d..fc45be5 100644
--- a/test/EmacLoopbackTest/j721e/icssg/makefile_dualmac
+++ b/test/EmacLoopbackTest/j721e/icssg/makefile_dualmac
@@ -18,7 +18,7 @@ endif
 INCLUDE_EXTERNAL_INTERFACES = bios xdc pdk
 
 # List all the components required by the application
-COMP_LIST_COMMON = emac uart uart_console osal_tirtos csl pruss board udma sciclient
+COMP_LIST_COMMON = emac uart uart_console osal_tirtos csl pruss board udma sciclient i2c
 
 ifeq ($(CORE),$(filter $(CORE), mpu1_0))
 # Enable XDC build for application by providing XDC CFG File per core
diff --git a/test/EmacLoopbackTest/test_utils_k3.c b/test/EmacLoopbackTest/test_utils_k3.c
index f365fec..b8ccd6a 100644
--- a/test/EmacLoopbackTest/test_utils_k3.c
+++ b/test/EmacLoopbackTest/test_utils_k3.c
@@ -71,6 +71,11 @@
 #include <ti/drv/uart/UART_stdio.h>
 #include <ti/board/board.h>
 
+#ifdef SOC_J721E
+#include <ti/board/src/j721e_evm/include/board_pinmux.h>
+#include <ti/board/src/j721e_evm/include/board_control.h>
+#endif
+
 #ifdef EMAC_TEST_APP_ICSSG
 /* PRUSS Driver Header File. */
 #include <ti/drv/pruss/pruicss.h>
@@ -90,6 +95,9 @@ extern int port_en[];
  ************************** Global Variables **************************
  **********************************************************************/
 
+#ifdef SOC_J721E
+uint8_t icss_tx_port_queue[2][100352] __attribute__ ((aligned (UDMA_CACHELINE_ALIGNMENT))) __attribute__ ((section (".bss:emac_ocmc_mem")));
+#else
 #ifdef EMAC_TEST_APP_WITHOUT_DDR
 /* DDR less test, can only test with 2 ports due to msmc memory constraints */
 uint8_t icss_tx_port_queue[1][100352] __attribute__ ((aligned (UDMA_CACHELINE_ALIGNMENT))) __attribute__ ((section (".bss:emac_msmc_mem")));
@@ -100,6 +108,7 @@ uint8_t icss_tx_port_queue[1][100352] __attribute__ ((aligned (UDMA_CACHELINE_AL
 uint8_t icss_tx_port_queue[3][100352] __attribute__ ((aligned (UDMA_CACHELINE_ALIGNMENT))) __attribute__ ((section (".bss:emac_msmc_mem")));
 #endif
 #endif
+#endif
 
 uint8_t sequenceNumber = 0;
 
@@ -1307,11 +1316,7 @@ int32_t app_test_emac_open(uint32_t mode)
 #endif
         open_cfg.master_core_flag = 1;
         open_cfg.max_pkt_size = APP_EMAC_MAX_PKT_SIZE;
-#if defined(SOC_J721E) && defined(SIMULATOR)
-        open_cfg.mdio_flag = 0;
-#else
         open_cfg.mdio_flag = 1;
-#endif
         open_cfg.num_of_chans = 1;
         open_cfg.udmaHandle = (void*)gDrvHandle;
 
@@ -1534,7 +1539,7 @@ void app_test_task_benchmark(UArg arg0, UArg arg1)
         while(1);
     }
     UART_printf("Board_init success benchmark\n");
-#if defined(SOC_J721E) && defined(SIMULATOR)
+#if defined(SOC_J721E)
 #else
     if (app_detect_interposer_card() == TRUE)
     {
@@ -1552,8 +1557,10 @@ void app_test_task_benchmark(UArg arg0, UArg arg1)
     PRUICSS_socGetInitCfg(&prussCfg);
     prussHandle[0] =  PRUICSS_create((PRUICSS_Config*)prussCfg,PRUICCSS_INSTANCE_ONE);
     prussHandle[1] =  PRUICSS_create((PRUICSS_Config*)prussCfg,PRUICCSS_INSTANCE_TWO);
+#if defined(SOC_AM65XX)
     prussHandle[2] =  PRUICSS_create((PRUICSS_Config*)prussCfg,PRUICCSS_INSTANCE_THREE);
 #endif
+#endif
 
     app_test_udma_init();
 
@@ -1584,7 +1591,19 @@ void app_test_task_verify_ut_dual_mac_cpsw(UArg arg0, UArg arg1)
 #ifdef EMAC_TEST_APP_WITHOUT_DDR
         Task_sleep(2000);
 #endif
-        Board_initCfg cfg = BOARD_INIT_UART_STDIO | BOARD_INIT_PINMUX_CONFIG | BOARD_INIT_MODULE_CLOCK | BOARD_INIT_ICSS_ETH_PHY | BOARD_INIT_ETH_PHY;
+#ifdef EMAC_TEST_APP_ICSSG
+    Board_initCfg cfg = BOARD_INIT_UART_STDIO | BOARD_INIT_PINMUX_CONFIG | BOARD_INIT_MODULE_CLOCK | BOARD_INIT_ICSS_ETH_PHY | BOARD_INIT_ETH_PHY;
+#else
+        Board_initCfg cfg = BOARD_INIT_UART_STDIO | BOARD_INIT_PINMUX_CONFIG | BOARD_INIT_MODULE_CLOCK | BOARD_INIT_ETH_PHY;
+#endif
+#if defined(SOC_J721E)
+    /* PINMUX config of GESI for ICSSG */
+    Board_PinmuxConfig_t gesiIcssgPinmux;
+    Board_pinmuxGetCfg(&gesiIcssgPinmux);
+    gesiIcssgPinmux.autoCfg = BOARD_PINMUX_CUSTOM;
+    gesiIcssgPinmux.gesiExp = BOARD_PINMUX_GESI_ICSSG;
+    Board_pinmuxSetCfg(&gesiIcssgPinmux);
+#endif
         boardInitStatus = Board_init(cfg);
         if (boardInitStatus !=BOARD_SOK)
         {
@@ -1593,7 +1612,7 @@ void app_test_task_verify_ut_dual_mac_cpsw(UArg arg0, UArg arg1)
         }
         UART_printf("Board_init success for UT\n");
 
-#if defined(SOC_J721E) && defined(SIMULATOR)
+#if defined(SOC_J721E)
 #else
         if (app_detect_interposer_card() == TRUE)
         {
@@ -1611,8 +1630,10 @@ void app_test_task_verify_ut_dual_mac_cpsw(UArg arg0, UArg arg1)
         PRUICSS_socGetInitCfg(&prussCfg);
         prussHandle[0] =  PRUICSS_create((PRUICSS_Config*)prussCfg,PRUICCSS_INSTANCE_ONE);
         prussHandle[1] =  PRUICSS_create((PRUICSS_Config*)prussCfg,PRUICCSS_INSTANCE_TWO);
+#if defined(SOC_AM65XX)
         prussHandle[2] =  PRUICSS_create((PRUICSS_Config*)prussCfg,PRUICCSS_INSTANCE_THREE);
 #endif
+#endif
 
     app_test_udma_init();