From f46e5e9becd2bc76e8335f5e8247ba21713b9510 Mon Sep 17 00:00:00 2001
From: rainbow_0206 <jiangwenjiang@huawei.com>
Date: Mon, 15 Oct 2018 16:49:26 +0800
Subject: Fix: nStackMain parameters should not be fixed

Change-Id: I60d16736831fde5af6e657393195ca57242a6d3c
Signed-off-by: rainbow_0206 <jiangwenjiang@huawei.com>
---
 .../common/base/include/common/common_mem_buf.h    |  4 +++-
 .../common/mem_mgr/nsfw_shmem/nsfw_shmem_mng.c     | 15 ++++----------
 src/framework/lib_common_mem/common_buf.c          | 24 ++++++++++++++++++++--
 3 files changed, 29 insertions(+), 14 deletions(-)

(limited to 'src/framework')

diff --git a/src/framework/common/base/include/common/common_mem_buf.h b/src/framework/common/base/include/common/common_mem_buf.h
index f9f1593..c9bb9fd 100644
--- a/src/framework/common/base/include/common/common_mem_buf.h
+++ b/src/framework/common/base/include/common/common_mem_buf.h
@@ -20,6 +20,7 @@
 #ifdef HAL_LIB
 #else
 
+#include "nsfw_mem_api.h"
 #include "common_mem_base_type.h"
 #include "types.h"
 
@@ -64,7 +65,8 @@ typedef struct __common_pal_module_info
  * @param name
  *   The name of the buf pool.
  */
-int nscomm_pal_module_init (common_mem_pal_module_info * pinfo, u8 app_mode);
+int nscomm_pal_module_init (nsfw_mem_para * para,
+                            common_mem_pal_module_info * pinfo, u8 app_mode);
 
 void *nscomm_memzone_data_reserve_name (const char *name, size_t len,
                                         int socket_id);
diff --git a/src/framework/common/mem_mgr/nsfw_shmem/nsfw_shmem_mng.c b/src/framework/common/mem_mgr/nsfw_shmem/nsfw_shmem_mng.c
index ba38c32..77ffd19 100644
--- a/src/framework/common/mem_mgr/nsfw_shmem/nsfw_shmem_mng.c
+++ b/src/framework/common/mem_mgr/nsfw_shmem/nsfw_shmem_mng.c
@@ -73,18 +73,11 @@ nsfw_shmem_init (nsfw_mem_para * para)
 
   NSCOMM_LOGINF ("nsfw shmem init begin");
 
-  if (NSFW_PROC_MAIN == para->enflag)
-    {
-      iret = common_pal_module_init (NULL, app_mode);
-    }
-  else
-    {
-      LCORE_MASK_SET (rteinfo.ilcoremask, 1);
-      rteinfo.ucproctype = DMM_PROC_T_SECONDARY;
-      iret = common_pal_module_init (&rteinfo, app_mode);
-    }
+  LCORE_MASK_SET (rteinfo.ilcoremask, 1);
+  rteinfo.ucproctype = DMM_PROC_T_SECONDARY;
+  iret = common_pal_module_init (para, &rteinfo, app_mode);
 
-  if (NSFW_MEM_OK != iret)
+  if (DMM_MBUF_RET_OK != iret)
     {
       NSCOMM_LOGERR ("rte init fail] ret=0x%x", iret);
       return NSFW_MEM_ERR;
diff --git a/src/framework/lib_common_mem/common_buf.c b/src/framework/lib_common_mem/common_buf.c
index 9d9a127..d31ca83 100644
--- a/src/framework/lib_common_mem/common_buf.c
+++ b/src/framework/lib_common_mem/common_buf.c
@@ -88,7 +88,8 @@
 int log_level = LOG_INFO;
 
 int
-nscomm_pal_module_init (common_mem_pal_module_info * pinfo, u8 app_mode)
+nscomm_pal_module_init (nsfw_mem_para * para,
+                        common_mem_pal_module_info * pinfo, u8 app_mode)
 {
   char tempargv[PATA_NUM_MAX][PATA_STRLENT];
   char *argv[PATA_NUM_MAX];
@@ -100,6 +101,12 @@ nscomm_pal_module_init (common_mem_pal_module_info * pinfo, u8 app_mode)
   int retVal;
   char name[10] = { '\0' };
 
+  if (para == NULL)
+    {
+      NSCOMM_LOGERR ("para is null");
+      return DMM_MBUF_RET_ERR;
+    }
+
   retVal = MEMSET_S (tempargv, sizeof (tempargv), '\0', sizeof (tempargv));
   if (EOK != retVal)
     {
@@ -112,8 +119,21 @@ nscomm_pal_module_init (common_mem_pal_module_info * pinfo, u8 app_mode)
       NSCOMM_LOGERR ("MEMSET_S failed]ret=%d", retVal);
       return DMM_MBUF_RET_ERR;
     }
-  if (NULL == pinfo)
+  if (NSFW_PROC_MAIN == para->enflag)
     {
+      if (para->iargsnum != 0)
+        {
+          if (common_mem_pal_init (para->iargsnum, para->pargs) < 0)
+            {
+              COMMON_LOG_PRINT (LOG_ERR, "Cannot init pal\r\n");
+              return DMM_MBUF_RET_ERR;
+            }
+          else
+            {
+              return DMM_MBUF_RET_OK;
+            }
+        }
+
       PARA1_SET (argv, tempargv, agindex, "nStackMain");
       PARA2_SET (argv, tempargv, agindex, "-c", "0x1");
       PARA2_SET (argv, tempargv, agindex, "-n", "4");
-- 
cgit