Fix for SDOCM00106989: Need to update netapi ipsecmgr with K2L/K2E device-tree paths...

diff --git a/ti/runtime/netapi/applications/ipsec_offload/ipsecmgr/src/netapi_ipsecmgr.c b/ti/runtime/netapi/applications/ipsec_offload/ipsecmgr/src/netapi_ipsecmgr.c
index eaf7f60904c71f34da3b844f00732c1cc097d576..ea91baa801c43c61fc235b5fb6b9b468116fda8c 100755 (executable)
--- a/ti/runtime/netapi/applications/ipsec_offload/ipsecmgr/src/netapi_ipsecmgr.c
+++ b/ti/runtime/netapi/applications/ipsec_offload/ipsecmgr/src/netapi_ipsecmgr.c
@@ -66,40 +66,70 @@
 #include <ti/runtime/netapi/device/k2h/src/netapi_device.c>
 #include <ti/drv/qmss/device/k2h/src/qmss_device.c>
 #include <ti/drv/cppi/device/k2h/src/cppi_device.c>
 #include <ti/runtime/netapi/device/k2h/src/netapi_device.c>
 #include <ti/drv/qmss/device/k2h/src/qmss_device.c>
 #include <ti/drv/cppi/device/k2h/src/cppi_device.c>

+char*  DTS_LOG_FILE_QUEUE_ETHx[] = {
+ "/proc/device-tree/soc/pktdma@2004000/channels/netrx0/complete-queue"};
+char*  DTS_LOG_FILE_FLOW_ETHx[] = {
+"/proc/device-tree/soc/pktdma@2004000/channels/netrx0/flow"};

 #elif defined (DEVICE_K2K)
 #include <ti/runtime/hplib/device/k2k/src/hplib_device.c>
 #include <ti/drv/nwal/device/k2k/src/nwal_device.c>
 #include <ti/runtime/netapi/device/k2k/src/netapi_device.c>
 #include <ti/drv/qmss/device/k2k/src/qmss_device.c>
 #include <ti/drv/cppi/device/k2k/src/cppi_device.c>
 #elif defined (DEVICE_K2K)
 #include <ti/runtime/hplib/device/k2k/src/hplib_device.c>
 #include <ti/drv/nwal/device/k2k/src/nwal_device.c>
 #include <ti/runtime/netapi/device/k2k/src/netapi_device.c>
 #include <ti/drv/qmss/device/k2k/src/qmss_device.c>
 #include <ti/drv/cppi/device/k2k/src/cppi_device.c>

+char*  DTS_LOG_FILE_QUEUE_ETHx[] = {
+ "/proc/device-tree/soc/pktdma@2004000/channels/netrx0/complete-queue"};
+char*  DTS_LOG_FILE_FLOW_ETHx[] = {
+"/proc/device-tree/soc/pktdma@2004000/channels/netrx0/flow"};

 #elif defined (DEVICE_K2L)
 #include <ti/runtime/hplib/device/k2l/src/hplib_device.c>
 #include <ti/drv/nwal/device/k2l/src/nwal_device.c>
 #include <ti/runtime/netapi/device/k2l/src/netapi_device.c>
 #include <ti/drv/qmss/device/k2l/src/qmss_device.c>
 #include <ti/drv/cppi/device/k2l/src/cppi_device.c>
 #elif defined (DEVICE_K2L)
 #include <ti/runtime/hplib/device/k2l/src/hplib_device.c>
 #include <ti/drv/nwal/device/k2l/src/nwal_device.c>
 #include <ti/runtime/netapi/device/k2l/src/netapi_device.c>
 #include <ti/drv/qmss/device/k2l/src/qmss_device.c>
 #include <ti/drv/cppi/device/k2l/src/cppi_device.c>

+char*  DTS_LOG_FILE_QUEUE_ETHx[] = {
+ "/proc/device-tree/soc/pktdma@26186000/channels/netrx0/complete-queue"};
+char*  DTS_LOG_FILE_FLOW_ETHx[] = {
+"/proc/device-tree/soc/pktdma@26186000/channels/netrx0/flow"};

 #elif defined (DEVICE_K2E)
 #include <ti/runtime/hplib/device/k2e/src/hplib_device.c>
 #include <ti/drv/nwal/device/k2e/src/nwal_device.c>
 #include <ti/runtime/netapi/device/k2e/src/netapi_device.c>
 #include <ti/drv/qmss/device/k2e/src/qmss_device.c>
 #include <ti/drv/cppi/device/k2e/src/cppi_device.c>
 #elif defined (DEVICE_K2E)
 #include <ti/runtime/hplib/device/k2e/src/hplib_device.c>
 #include <ti/drv/nwal/device/k2e/src/nwal_device.c>
 #include <ti/runtime/netapi/device/k2e/src/netapi_device.c>
 #include <ti/drv/qmss/device/k2e/src/qmss_device.c>
 #include <ti/drv/cppi/device/k2e/src/cppi_device.c>

+char*  DTS_LOG_FILE_QUEUE_ETHx[] = {
+ "/proc/device-tree/soc/pktdma@26186000/channels/netrx0/complete-queue"};
+char*  DTS_LOG_FILE_FLOW_ETHx[] = {
+"/proc/device-tree/soc/pktdma@26186000/channels/netrx0/flow"};
+

 #else /*Default */
 #include <ti/runtime/hplib/device/k2h/src/hplib_device.c>
 #include <ti/drv/nwal/device/k2h/src/nwal_device.c>
 #include <ti/runtime/netapi/device/k2h/src/netapi_device.c>
 #include <ti/drv/qmss/device/k2h/src/qmss_device.c>
 #include <ti/drv/cppi/device/k2h/src/cppi_device.c>
 #else /*Default */
 #include <ti/runtime/hplib/device/k2h/src/hplib_device.c>
 #include <ti/drv/nwal/device/k2h/src/nwal_device.c>
 #include <ti/runtime/netapi/device/k2h/src/netapi_device.c>
 #include <ti/drv/qmss/device/k2h/src/qmss_device.c>
 #include <ti/drv/cppi/device/k2h/src/cppi_device.c>

+char*  DTS_LOG_FILE_QUEUE_ETHx[] = {
+ "/proc/device-tree/soc/pktdma@2004000/channels/netrx0/complete-queue"};
+char*  DTS_LOG_FILE_FLOW_ETHx[] = {
+"/proc/device-tree/soc/pktdma@2004000/channels/netrx0/flow"};
+

 #endif
 
 /**********************************************************************
  ************************** Local Definitions *************************
  **********************************************************************/
 #endif
 
 /**********************************************************************
  ************************** Local Definitions *************************
  **********************************************************************/

+#if 0
+

 char*  DTS_LOG_FILE_QUEUE_ETHx[] = {
  "/proc/device-tree/soc/pktdma@2004000/channels/netrx0/complete-queue"};
 char*  DTS_LOG_FILE_FLOW_ETHx[] = {
 "/proc/device-tree/soc/pktdma@2004000/channels/netrx0/flow"};
 
 char*  DTS_LOG_FILE_QUEUE_ETHx[] = {
  "/proc/device-tree/soc/pktdma@2004000/channels/netrx0/complete-queue"};
 char*  DTS_LOG_FILE_FLOW_ETHx[] = {
 "/proc/device-tree/soc/pktdma@2004000/channels/netrx0/flow"};
 

+char*  DTS_LOG_FILE_QUEUE_ETHx[] = {
+ "/proc/device-tree/soc/pktdma@26186000/channels/netrx0/complete-queue"};
+char*  DTS_LOG_FILE_FLOW_ETHx[] = {
+"/proc/device-tree/soc/pktdma@26186000/channels/netrx0/flow"};
+#endif
+

 
 /**********************************************************************
  ************************** Global Variables **************************
 
 /**********************************************************************
  ************************** Global Variables **************************


@@ -724,9 +754,6 @@ int create_pktio_channel()
         return -1;
     }
 
         return -1;
     }
 

-    printf("create_pktio_channel: qnum: %d, pktio_handle: 0x%x\n",
-            pktio_cfg.qnum,
-            globalDB.pktio_channel);

 
     flow.dma_engine= 1;
     flow.flowid = globalDB.flowId;
 
     flow.dma_engine= 1;
     flow.flowid = globalDB.flowId;


@@ -739,7 +766,6 @@ int create_pktio_channel()
                                              7,
                                              NETCP_CFG_ACTION_TO_SW,
                                              (NETCP_CFG_ROUTE_HANDLE_T) &route);
                                              7,
                                              NETCP_CFG_ACTION_TO_SW,
                                              (NETCP_CFG_ROUTE_HANDLE_T) &route);

-    printf("create_pktio_channel: expPkt appid: 0x%x\n", expPkt_appid);

 
     return 0;
 }
 
     return 0;
 }