From: pborla Date: Thu, 9 May 2024 05:40:52 +0000 (+0530) Subject: [Epic-Id: ODUHIGH-576][Task-Id: ODUHIGH-594][SubTask-Id: ODUHIGH-595]| [NFAPI_ENABLED... X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=9f3709faf8359e10d558c2def7aca6d5a3f99bf6;p=o-du%2Fl2.git [Epic-Id: ODUHIGH-576][Task-Id: ODUHIGH-594][SubTask-Id: ODUHIGH-595]| [NFAPI_ENABLED] | Adding a TAPA Task for UDP P7 receiver side Change-Id: Ib450a457dac3e52367174ca0e545da92d9a72b32 Signed-off-by: svaidhya --- diff --git a/build/config/fdd_odu_config.xml b/build/config/fdd_odu_config.xml index 54a110057..0732b0315 100644 --- a/build/config/fdd_odu_config.xml +++ b/build/config/fdd_odu_config.xml @@ -9,6 +9,7 @@ 22 25 21 + 23 1 1 diff --git a/build/config/tdd_odu_config.xml b/build/config/tdd_odu_config.xml index 206303be2..798e7bc6d 100644 --- a/build/config/tdd_odu_config.xml +++ b/build/config/tdd_odu_config.xml @@ -9,6 +9,7 @@ 22 25 21 + 23 1 1 diff --git a/build/odu/makefile b/build/odu/makefile index 97d5716ed..a76e64f6d 100644 --- a/build/odu/makefile +++ b/build/odu/makefile @@ -74,7 +74,7 @@ endif # macro for output file name and makefile name # -PLTFRM_FLAGS=-UMSPD -DODU -DINTEL_FAPI -UODU_MEMORY_DEBUG_LOG -DDEBUG_ASN_PRINT -UDEBUG_PRINT -DERROR_PRINT -USTART_DL_UL_DATA -UNR_DRX -UCALL_FLOW_DEBUG_LOG -UODU_SLOT_IND_DEBUG_LOG -DNFAPI_ENABLED -UTHREAD_AFFINITY +PLTFRM_FLAGS=-UMSPD -DODU -DINTEL_FAPI -UODU_MEMORY_DEBUG_LOG -DDEBUG_ASN_PRINT -UDEBUG_PRINT -DERROR_PRINT -USTART_DL_UL_DATA -UNR_DRX -UCALL_FLOW_DEBUG_LOG -UODU_SLOT_IND_DEBUG_LOG -UTHREAD_AFFINITY ifeq ($(MODE),TDD) PLTFRM_FLAGS += -DNR_TDD @@ -86,7 +86,6 @@ endif ifeq ($(NODE),TEST_STUB) PLTFRM_FLAGS+=-DODU_TEST_STUB endif - ifeq ($(PHY), INTEL_L1) PLTFRM_FLAGS+=-DSS_USE_WLS_MEM -DINTEL_WLS_MEM -DDEBUG_MODE -DINTEL_L1_V20_03_ONWARDS ifeq ($(PHY_MODE),TIMER) @@ -98,6 +97,10 @@ ifeq ($(O1_ENABLE),YES) PLTFRM_FLAGS+=-DO1_ENABLE endif +ifeq ($(NFAPI_ENABLE),YES) + PLTFRM_FLAGS+=-DNFAPI_ENABLED +endif + # The include options get merged with the options needed by # # the called makefiles and hence we export these to make them # # available to them. @@ -209,8 +212,10 @@ du: $(Q)$(MAKE) -j -f $(COM_BUILD_DIR)/mt.mak OBJ_DIR=$(OBJ_ROOT)/odu LIB_DIR=$(LIB_ROOT)/odu LOG_DIR=$(LOG_ROOT)/odu CC='$(CC1)' ifneq ($(PHY), INTEL_L1) +ifneq ($(NFAPI_ENABLE),YES) $(Q)$(MAKE) -j -f $(COM_BUILD_DIR)/phy_stub.mak OBJ_DIR=$(OBJ_ROOT)/odu LIB_DIR=$(LIB_ROOT)/odu LOG_DIR=$(LOG_ROOT)/odu CC='$(CC1)' endif +endif ifeq ($(O1_ENABLE),YES) $(Q)$(MAKE) -j -f $(COM_BUILD_DIR)/o1.mak OBJ_DIR=$(OBJ_ROOT)/odu LIB_DIR=$(LIB_ROOT)/odu LOG_DIR=$(LOG_ROOT)/odu CC='$(CCPP1)' $(Q)$(MAKE) -j -f $(COM_BUILD_DIR)/ves.mak OBJ_DIR=$(OBJ_ROOT)/odu LIB_DIR=$(LIB_ROOT)/odu LOG_DIR=$(LOG_ROOT)/odu CC='$(CCPP1)' @@ -234,8 +239,10 @@ clean_odu: $(Q)$(MAKE) -j -f $(COM_BUILD_DIR)/mt.mak clean OBJ_DIR=$(OBJ_ROOT)/odu LIB_DIR=$(LIB_ROOT)/odu LOG_DIR=$(LOG_ROOT)/odu CC='$(CC1)' ifneq ($(PHY), INTEL_L1) +ifneq ($(NFAPI_ENABLE),YES) $(Q)$(MAKE) -j -f $(COM_BUILD_DIR)/phy_stub.mak clean OBJ_DIR=$(OBJ_ROOT)/odu LIB_DIR=$(LIB_ROOT)/odu LOG_DIR=$(LOG_ROOT)/odu CC='$(CC1)' endif +endif ifeq ($(O1_ENABLE),YES) $(Q)$(MAKE) -j -f $(COM_BUILD_DIR)/o1.mak clean OBJ_DIR=$(OBJ_ROOT)/odu LIB_DIR=$(LIB_ROOT)/odu LOG_DIR=$(LOG_ROOT)/odu CC='$(CCPP1)' $(Q)$(MAKE) -j -f $(COM_BUILD_DIR)/ves.mak clean OBJ_DIR=$(OBJ_ROOT)/odu LIB_DIR=$(LIB_ROOT)/odu LOG_DIR=$(LOG_ROOT)/odu CC='$(CCPP1)' diff --git a/src/5gnrmac/lwr_mac_ex_ms.c b/src/5gnrmac/lwr_mac_ex_ms.c index eaca62ac6..4f2867223 100644 --- a/src/5gnrmac/lwr_mac_ex_ms.c +++ b/src/5gnrmac/lwr_mac_ex_ms.c @@ -26,7 +26,7 @@ #include "nr5g_fapi_internal.h" #include "fapi_vendor_extension.h" #endif -#ifndef INTEL_WLS_MEM +#if !(defined(NFAPI_ENABLED) || defined (INTEL_WLS_MEM)) #include "lwr_mac_phy_stub_inf.h" #endif #ifdef NFAPI_ENABLED @@ -106,7 +106,7 @@ void callFlowlwrMacActvTsk(Pst *pst) break; } -#ifndef INTEL_WLS_MEM +#if !(defined(NFAPI_ENABLED) || defined (INTEL_WLS_MEM)) case ENTPHYSTUB: { strcpy(sourceTask,"PHY"); @@ -220,7 +220,7 @@ uint8_t lwrMacActvTsk(Pst *pst, Buffer *mBuf) break; } -#ifndef INTEL_WLS_MEM +#if !(defined(NFAPI_ENABLED) || defined (INTEL_WLS_MEM)) case ENTPHYSTUB: { switch(pst->event) diff --git a/src/5gnrmac/lwr_mac_phy.c b/src/5gnrmac/lwr_mac_phy.c index a9bf88d3c..e1232fc23 100644 --- a/src/5gnrmac/lwr_mac_phy.c +++ b/src/5gnrmac/lwr_mac_phy.c @@ -275,7 +275,9 @@ uint8_t LwrMacSendToL1(void *msg) { uint8_t ret = ROK; #ifdef INTEL_FAPI +#ifndef NFAPI_ENABLED uint32_t msgLen =0; +#endif p_fapi_api_queue_elem_t currMsg = NULLP; #ifdef CALL_FLOW_DEBUG_LOG @@ -331,48 +333,49 @@ uint8_t LwrMacSendToL1(void *msg) addWlsBlockToFree(currMsg, msgLen, (lwrMacCb.phySlotIndCntr-1)); if(currMsg->p_next == NULLP) { - DU_LOG("\nERROR --> LWR MAC : There cannot be only one block to send"); - return RFAILED; + DU_LOG("\nERROR --> LWR MAC : There cannot be only one block to send"); + return RFAILED; } /* Sending first block */ ret = WLS_Put(wlsHdlr, WLS_VA2PA(wlsHdlr, currMsg), msgLen, currMsg->msg_type, WLS_SG_FIRST); if(ret != 0) { - DU_LOG("\nERROR --> LWR MAC : Failure in sending message to PHY"); - return RFAILED; + DU_LOG("\nERROR --> LWR MAC : Failure in sending message to PHY"); + return RFAILED; } currMsg = currMsg->p_next; while(currMsg) { - /* Sending the next msg */ - msgLen = currMsg->msg_len + sizeof(fapi_api_queue_elem_t); - addWlsBlockToFree(currMsg, msgLen, (lwrMacCb.phySlotIndCntr-1)); - if(currMsg->p_next != NULLP) - { - ret = WLS_Put(wlsHdlr, WLS_VA2PA(wlsHdlr, currMsg), msgLen, currMsg->msg_type, WLS_SG_NEXT); - if(ret != 0) - { - DU_LOG("\nERROR --> LWR MAC : Failure in sending message to PHY"); - return RFAILED; - } - currMsg = currMsg->p_next; - } - else - { - /* Sending last msg */ - ret = WLS_Put(wlsHdlr, WLS_VA2PA(wlsHdlr, currMsg), msgLen, currMsg->msg_type, WLS_SG_LAST); - if(ret != 0) - { - DU_LOG("\nERROR --> LWR MAC : Failure in sending message to PHY"); - return RFAILED; - } - currMsg = NULLP; - } + /* Sending the next msg */ + msgLen = currMsg->msg_len + sizeof(fapi_api_queue_elem_t); + addWlsBlockToFree(currMsg, msgLen, (lwrMacCb.phySlotIndCntr-1)); + if(currMsg->p_next != NULLP) + { + ret = WLS_Put(wlsHdlr, WLS_VA2PA(wlsHdlr, currMsg), msgLen, currMsg->msg_type, WLS_SG_NEXT); + if(ret != 0) + { + DU_LOG("\nERROR --> LWR MAC : Failure in sending message to PHY"); + return RFAILED; + } + currMsg = currMsg->p_next; + } + else + { + /* Sending last msg */ + ret = WLS_Put(wlsHdlr, WLS_VA2PA(wlsHdlr, currMsg), msgLen, currMsg->msg_type, WLS_SG_LAST); + if(ret != 0) + { + DU_LOG("\nERROR --> LWR MAC : Failure in sending message to PHY"); + return RFAILED; + } + currMsg = NULLP; + } } } #else +#ifndef NFAPI_ENABLED p_fapi_api_queue_elem_t nextMsg = NULLP; /* FAPI header and vendor specific msgs are freed here. Only @@ -383,17 +386,18 @@ uint8_t LwrMacSendToL1(void *msg) nextMsg = currMsg->p_next; msgLen = currMsg->msg_len + sizeof(fapi_api_queue_elem_t); if((currMsg->msg_type != FAPI_VENDOR_MSG_HEADER_IND) && \ - (currMsg->msg_type != FAPI_VENDOR_MESSAGE)) + (currMsg->msg_type != FAPI_VENDOR_MESSAGE)) { - l1ProcessFapiRequest(currMsg->msg_type, msgLen, currMsg); + l1ProcessFapiRequest(currMsg->msg_type, msgLen, currMsg); } else { - LWR_MAC_FREE(currMsg, msgLen); + LWR_MAC_FREE(currMsg, msgLen); } currMsg = nextMsg; } #endif +#endif #endif return ret; } diff --git a/src/5gnrmac/nfapi_udp_p7.c b/src/5gnrmac/nfapi_udp_p7.c new file mode 100644 index 000000000..13c6b3011 --- /dev/null +++ b/src/5gnrmac/nfapi_udp_p7.c @@ -0,0 +1,72 @@ +/******************************************************************************* +################################################################################ +# Copyright (c) [2017-2019] [Radisys] # +# # +# Licensed under the Apache License, Version 2.0 (the "License"); # +# you may not use this file except in compliance with the License. # +# You may obtain a copy of the License at # +# # +# http://www.apache.org/licenses/LICENSE-2.0 # +# # +# Unless required by applicable law or agreed to in writing, software # +# distributed under the License is distributed on an "AS IS" BASIS, # +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # +# See the License for the specific language governing permissions and # +# limitations under the License. # +################################################################################ +*******************************************************************************/ + +/* This file is the entry point for UDP P7 */ + +#include "common_def.h" + +/************************************************************************** + * @brief Task Initiation callback function. + * + * @details + * + * Function : udpP7ActvInit + * + * Functionality: + * This function is supplied as one of parameters during UDP P7 + * task registration. SSI will invoke this function once, after + * it creates and attaches this TAPA Task to a system task. + * + * @param[in] Ent entity, the entity ID of this task. + * @param[in] Inst inst, the instance ID of this task. + * @param[in] Region region, the region ID registered for memory + * usage of this task. + * @param[in] Reason reason. + * @return ROK - success + * RFAILED - failure + ***************************************************************************/ +uint8_t udpP7ActvInit(Ent entity, Inst inst, Region region, Reason reason) +{ + return ROK; +} + +/************************************************************************** + * @brief Task Activation callback function. + * + * @details + * + * Function : udpP7ActvTsk + * + * Functionality: + * Primitives invoked by UDP P7 users/providers through + * a loosely coupled interface arrive here by means of + * SSI's message handling. This API is registered with + * SSI during the Task Registration of DU APP. + * + * @param[in] Pst *pst, Post structure of the primitive. + * @param[in] Buffer *mBuf, Packed primitive parameters in the + * buffer. + * @return ROK - success + * RFAILED - failure + * + ***************************************************************************/ +uint8_t udpP7ActvTsk(Pst *pst, Buffer *mBuf) +{ + uint8_t ret = ROK; + return ret; +} diff --git a/src/cm/ssi.h b/src/cm/ssi.h index 3379caeab..42a284454 100755 --- a/src/cm/ssi.h +++ b/src/cm/ssi.h @@ -1338,10 +1338,12 @@ #define ENTUZ 0xd2 /* S1AP User */ /* ssi_h_001.main_134 : Adtion for eGTP protocol */ #define ENTEG 0xd3 /* EGTP Layer */ -#ifndef INTEL_WLS_MEM +#if !(defined(NFAPI_ENABLED) || defined (INTEL_WLS_MEM)) #define ENTPHYSTUB 0xd4 #else -#define ENTEU 0xd4 /* EGTP USER */ +#ifdef NFAPI_ENABLED +#define ENTUDP7 0xd4 /* UDP P7 */ +#endif #endif /* ssi_h_001.main_135 : addition of LTE related entities */ #define ENTLWRMAC 0xd5 /* LTE-PHY */ diff --git a/src/du_app/du_cfg.c b/src/du_app/du_cfg.c index 11d95e856..d6d20face 100644 --- a/src/du_app/du_cfg.c +++ b/src/du_app/du_cfg.c @@ -4398,6 +4398,16 @@ uint8_t parseThreadAffinity(xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur, ThreadIn #endif } +#ifdef NFAPI_ENABLED + if ((!xmlStrcmp(cur->name, (const xmlChar *)"NFAPI_UDP_P7_CORE")) && (cur->ns == ns)) + { + threads->udpP7CoreId = atoi((char *)xmlNodeListGetString(doc, cur->xmlChildrenNode, 1)); +#ifdef THREAD_AFFINITY + ODU_SET_THREAD_AFFINITY(&threads->udpP7STskId, SS_AFFINITY_MODE_EXCL, threads->udpP7CoreId, 0); +#endif + } +#endif + cur = cur -> next; } return ROK; @@ -5572,6 +5582,9 @@ void printDuConfig() DU_LOG("RLC-DL and MAC CORE ID %d\n", duCfgParam.threadInfo.rlcMacCoreId); DU_LOG("SCH CORE ID %d\n", duCfgParam.threadInfo.schCoreId); DU_LOG("Lower MAC CORE ID %d\n", duCfgParam.threadInfo.lwrMacCoreId); +#ifdef NFAPI_ENABLED + DU_LOG("UDP P7 CORE ID %d\n", duCfgParam.threadInfo.udpP7CoreId); +#endif DU_LOG("MAX NUM DRB %d\n", duCfgParam.maxNumDrb); diff --git a/src/du_app/du_cfg.h b/src/du_app/du_cfg.h index 2cd3cc2c1..63b0d769b 100644 --- a/src/du_app/du_cfg.h +++ b/src/du_app/du_cfg.h @@ -1162,6 +1162,8 @@ typedef struct threadInfo uint8_t schCoreId; SSTskId lwrMacSTskId; uint8_t lwrMacCoreId; + SSTskId udpP7STskId; + uint8_t udpP7CoreId; }ThreadInfo; typedef struct duCfgParams diff --git a/src/du_app/du_mgr_main.c b/src/du_app/du_mgr_main.c index aff984f97..56dd91e82 100644 --- a/src/du_app/du_mgr_main.c +++ b/src/du_app/du_mgr_main.c @@ -52,9 +52,14 @@ uint8_t schActvTsk (Pst *, Buffer *); uint8_t schActvInit(Ent, Inst, Region, Reason); uint8_t lwrMacActvTsk(Pst *, Buffer *); uint8_t lwrMacActvInit(Ent, Inst, Region, Reason); -#ifndef INTEL_WLS_MEM +#if !(defined(NFAPI_ENABLED) || defined (INTEL_WLS_MEM)) uint8_t phyStubActvTsk(Pst *, Buffer *); uint8_t phyStubActvInit(Ent, Inst, Region, Reason); +#else +#ifdef NFAPI_ENABLED +uint8_t udpP7ActvTsk(Pst *, Buffer *); +uint8_t udpP7ActvInit(Ent, Inst, Region, Reason); +#endif #endif /* Global variable */ @@ -518,7 +523,7 @@ uint8_t lwrMacInit(SSTskId sysTskId) return ROK; } -#ifndef INTEL_WLS_MEM +#if !(defined(NFAPI_ENABLED) || defined (INTEL_WLS_MEM)) /******************************************************************* * * @brief Initializes Phy stub slot indication generator task @@ -554,6 +559,43 @@ uint8_t phyStubInit(SSTskId sysTskId) sysTskId); return ROK; } +#else +#ifdef NFAPI_ENABLED +/******************************************************************* + * + * @brief Initializes UDP P7 task + * + * @details + * + * Function : udpP7Init + * + * Functionality: + * - Registers and attaches TAPA tasks for UDP P7 + * + * @params[in] system task ID + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +uint8_t udpP7Init(SSTskId sysTskId) +{ + /* Register UDP P7 TAPA Task */ + if(ODU_REG_TTSK((Ent)ENTUDP7, (Inst)0, (Ttype)TTNORM, (Prior)PRIOR0, + udpP7ActvInit, (ActvTsk)udpP7ActvTsk) != ROK) + { + return RFAILED; + } + /* Attach UDP P7 TAPA Task */ + if (ODU_ATTACH_TTSK((Ent)ENTUDP7, (Inst)0, sysTskId)!= ROK) + { + return RFAILED; + } + + DU_LOG("\nINFO --> DU_APP : UDP P7 TAPA task created and registered to %d sys task", + sysTskId); + return ROK; +} +#endif #endif /******************************************************************* @@ -575,7 +617,9 @@ uint8_t phyStubInit(SSTskId sysTskId) uint8_t commonInit() { /* Declare system task Ids */ +#if !(defined(NFAPI_ENABLED) || defined (INTEL_WLS_MEM)) SSTskId phyStubSlotIndSTskId; +#endif pthread_attr_t attr; @@ -633,14 +677,29 @@ uint8_t commonInit() return RFAILED; } -#ifndef INTEL_WLS_MEM +/*UDP P7 Socket thread is required for NFAPI. Following conditions are framed as below: + * 1. If NFAPI is enabled and + * i. INTEL_L1 is not used then PHY thread is not created as PNF will be replacing PHY. + * ii. INTEL_L1 is used then also we need UDP socket for P7 coomunication. + * 2. In case of NFAPI is disabled + * i. INTEL_L1 is not used then we need PHY thread + * ii. INTEL_L1 is used as PHY then neither of PHY nor UDPP7 thread is required*/ +#if !(defined(NFAPI_ENABLED) || defined (INTEL_WLS_MEM)) /* system task for phy stub's slot indication generator thread */ if(ODU_CREATE_TASK(PRIOR0, &phyStubSlotIndSTskId) != ROK) { DU_LOG("\nERROR --> DU_APP : System Task creation for Phy stub slot indication generator failed. MAX STSK [%d]", SS_MAX_STSKS); return RFAILED; } - +#else +#ifdef NFAPI_ENABLED + /* system task for UDP-P7 thread */ + if(ODU_CREATE_TASK(PRIOR0, &duCfgParam.threadInfo.udpP7STskId) != ROK) + { + DU_LOG("\nERROR --> DU_APP : System Task creation for UDP P7 Interface failed. MAX STSK [%d]", SS_MAX_STSKS); + return RFAILED; + } +#endif #endif /* Create TAPA tasks */ @@ -686,14 +745,21 @@ uint8_t commonInit() return RFAILED; } -#ifndef INTEL_WLS_MEM +#if !(defined(NFAPI_ENABLED) || defined (INTEL_WLS_MEM)) if(phyStubInit(phyStubSlotIndSTskId) != ROK) { DU_LOG("\nERROR --> DU_APP : PHY stub slot indication Tapa Task initialization failed"); return RFAILED; } +#else +#ifdef NFAPI_ENABLED + if(udpP7Init(duCfgParam.threadInfo.udpP7STskId) != ROK) + { + DU_LOG("\nERROR --> DU_APP : UDP P7 Tapa Task initialization failed"); + return RFAILED; + } +#endif #endif - return ROK; } diff --git a/src/mt/mt_ss.c b/src/mt/mt_ss.c index 3579275fd..809785fbf 100644 --- a/src/mt/mt_ss.c +++ b/src/mt/mt_ss.c @@ -528,6 +528,21 @@ SsRegCfg cfgRegInfo[SS_MAX_REGS] = { SS_POOL_STATIC, 0 } } } +#else +#ifdef NFAPI_ENABLED + , + { + SS_DFLT_REGION + 8, SS_MAX_POOLS_PER_REG - 1, + { + { SS_POOL_DYNAMIC, MT_POOL_0_DSIZE }, + { SS_POOL_DYNAMIC, MT_POOL_1_DSIZE }, + { SS_POOL_DYNAMIC, MT_POOL_2_DSIZE }, + { SS_POOL_DYNAMIC, MT_POOL_3_DSIZE }, + { SS_POOL_DYNAMIC, MT_POOL_4_DSIZE }, + { SS_POOL_STATIC, 0 } + } + } +#endif #endif #endif /* SS_LOCKLESS_MEMORY */ @@ -651,6 +666,22 @@ MtDynMemCfg mtDynMemoCfg = {SS_BLK_RELEASE_THRESHOLD, SS_BLK_ACQUIRE_THRESHOLD} } } +#else +#ifdef NFAPI_ENABLED + , + { + SS_DFLT_REGION + 8, /* region id */ + MT_MAX_BKTS, /* number of buckets */ + { + /* block size, no. of blocks, Upper threshold, lower threshold */ + {SS_BLK_RELEASE_THRESHOLD, SS_BLK_ACQUIRE_THRESHOLD}, + {SS_BLK_RELEASE_THRESHOLD, SS_BLK_ACQUIRE_THRESHOLD}, + {SS_BLK_RELEASE_THRESHOLD, SS_BLK_ACQUIRE_THRESHOLD}, + {SS_BLK_RELEASE_THRESHOLD, SS_BLK_ACQUIRE_THRESHOLD}, + {SS_BLK_RELEASE_THRESHOLD, SS_BLK_ACQUIRE_THRESHOLD} + } + } +#endif #endif #if ((defined (SPLIT_RLC_DL_TASK)) && (!defined (L2_L3_SPLIT))) , @@ -845,6 +876,22 @@ MtMemCfg mtMemoCfg = {MT_BKT_4_DSIZE, MT_BKT_4_STATIC_NUMBLKS} /* block size, no. of blocks */ } } +#else +#ifdef NFAPI_ENABLED + , + { + SS_DFLT_REGION + 8, /* region id */ + MT_MAX_BKTS, /* number of buckets */ + MT_HEAP_SIZE, /* heap size */ + { + {MT_BKT_0_DSIZE, MT_BKT_0_STATIC_NUMBLKS}, /* block size, no. of blocks */ + {MT_BKT_1_DSIZE, MT_BKT_1_STATIC_NUMBLKS}, /* block size, no. of blocks */ + {MT_BKT_2_DSIZE, MT_BKT_2_STATIC_NUMBLKS}, /* block size, no. of blocks */ + {MT_BKT_3_DSIZE, MT_BKT_3_STATIC_NUMBLKS}, /* block size, no. of blocks */ + {MT_BKT_4_DSIZE, MT_BKT_4_STATIC_NUMBLKS} /* block size, no. of blocks */ + } + } +#endif #endif #endif /* SS_LOCKLESS_MEMORY */ STATIC_MEM_CFG diff --git a/src/mt/mt_ss.h b/src/mt/mt_ss.h index e213b7df4..8eff63aa4 100755 --- a/src/mt/mt_ss.h +++ b/src/mt/mt_ss.h @@ -66,7 +66,11 @@ #ifndef INTEL_WLS_MEM #define SS_MAX_STSKS 9 #else -#define SS_MAX_STSKS 8 +#ifdef NFAPI_ENABLED +#define SS_MAX_STSKS 9 +#else +#define SS_MAX_STSKS 8 +#endif #endif #endif #endif /* SS_MULTICORE_SUPPORT */ diff --git a/src/mt/ss_msg.c b/src/mt/ss_msg.c index 474d79839..dd5f2ba11 100644 --- a/src/mt/ss_msg.c +++ b/src/mt/ss_msg.c @@ -5392,8 +5392,9 @@ S16 dst /* destination id */ Buffer *tmp = NULLP; /* buffer ptr */ Data *cptr =NULLP; /* ss012.13: Addition */ +#ifdef DEBUG_PRINT Data reg =0; - +#endif if (mBuf == NULLP) @@ -5407,7 +5408,9 @@ S16 dst /* destination id */ for (qlen = 0, tmp = mBuf->b_cont; tmp; qlen++) tmp = tmp->b_cont; mlen = ((SsMsgInfo*)(mBuf->b_rptr))->len; +#ifdef DEBUG_PRINT reg = ((SsMsgInfo*)(mBuf->b_rptr))->region; +#endif /*ss013.301: Fixed Warnings for 32/64 bit compilation*/ #ifdef DEBUG_PRINT sprintf(prntBuf,"\nmsg: qlen: %04d mlen: %04d %02d-->%02d region: %02d\n",