X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fmt%2Fmt_ss.c;h=d909e4b504d2e5ec0d30a253fda6bb1f437b86f1;hb=ba78fa13b01e0729fe0a6a7a18cbf1d52cdcda1c;hp=9626822368272fb0aebb766f0246b5a36c49326c;hpb=5d74fef7c9fe6b65a965ceac6bfe812872dab323;p=o-du%2Fl2.git diff --git a/src/mt/mt_ss.c b/src/mt/mt_ss.c index 962682236..d909e4b50 100644 --- a/src/mt/mt_ss.c +++ b/src/mt/mt_ss.c @@ -102,6 +102,12 @@ #include #endif /* SS_WATCHDOG */ +#ifdef SS_USE_WLS_MEM +#include +#include +#include +#endif + /* header/extern include files (.x) */ #include "gen.x" /* general layer */ @@ -153,24 +159,20 @@ #include "sys/syscall.h" #endif -#if defined(RGL_SPECIFIC_CHANGES) || defined(INTEL_WLS) +#if defined(RGL_SPECIFIC_CHANGES) || defined(INTEL_WLS) || defined(SS_USE_WLS_MEM) #include #include #endif -#ifdef INTEL_WLS -EXTERN void LwrMacRecvPhyMsg(); -#endif - #if defined(SPLIT_RLC_DL_TASK) && defined(RLC_MAC_STA_RSP_RBUF) -EXTERN S16 rgBatchProc (Void); +S16 rgBatchProc (Void); #endif #ifdef RLC_MAC_DAT_REQ_RBUF -EXTERN S16 rgDlDatReqBatchProc ARGS(( +S16 rgDlDatReqBatchProc ARGS(( Void)); #endif #if defined(SPLIT_RLC_DL_TASK) && defined(RLC_MAC_STA_RSP_RBUF) -EXTERN S16 rgBatchProc ARGS(( +S16 rgBatchProc ARGS(( Void)); #endif @@ -203,12 +205,12 @@ Void cmPrcTmr ARGS((CmTqCp* tqCp, CmTqType* tq, PFV func)); void dump_external(void); #ifdef ANSI -PRIVATE Void mtDelSigals +static Void mtDelSigals ( Void ) #else -PRIVATE Void mtDelSignals() +static Void mtDelSignals() #endif { struct sigaction sa; @@ -223,7 +225,7 @@ PRIVATE Void mtDelSignals() sa.sa_handler = SIG_DFL; sigaction(SIGILL, &sa, NULL); - RETVOID; + return; } static void signal_segv(int signum, siginfo_t * info, void *ptr) { @@ -324,18 +326,18 @@ void *pthreadCreateHdlr(void* arg); Buffer *mtTskBuffer1; Buffer *mtTskBuffer2; -EXTERN pthread_t tmpRegTidMap[20]; -EXTERN U8 stopBtInfo; -EXTERN S16 SGlobMemInfoShow(void); +pthread_t tmpRegTidMap[20]; +uint8_t stopBtInfo; + S16 SGlobMemInfoShow(void); #endif /* SS_LOCKLESS_MEMORY */ #ifdef L2_L3_SPLIT -EXTERN APP_CONTEXT AppContext; -EXTERN S32 clusterMode; +APP_CONTEXT AppContext; +S32 clusterMode; #endif #ifdef TENB_T2K3K_SPECIFIC_CHANGES -EXTERN unsigned int tlPost(void *handle); +unsigned int tlPost(void *handle); #endif /* forward references */ @@ -346,56 +348,56 @@ Void *mtTskHdlrT2kL2 ARGS((Void*)); void mtSigUsr2Hndlr ARGS((void)); #endif -PRIVATE S16 ssdSetPthreadAttr ARGS ((S32 tskPrior, pthread_attr_t *attr)); -PRIVATE Void *mtTskHdlr ARGS((void *)); -PRIVATE S16 mtTskHdlMsg ARGS((SsSTskEntry *sTsk)); +static S16 ssdSetPthreadAttr ARGS ((S32 tskPrior, pthread_attr_t *attr)); +static Void *mtTskHdlr ARGS((void *)); +static S16 mtTskHdlMsg ARGS((SsSTskEntry *sTsk)); -PRIVATE Void *mtTmrHdlr ARGS((void *)); -PRIVATE Void mtTimeout ARGS((PTR tCb, S16 evnt)); +static Void *mtTmrHdlr ARGS((void *)); +static Void mtTimeout ARGS((PTR tCb, S16 evnt)); /*mt010.301 Fix for core when run with -o option and when killed with SIGINT*/ -PRIVATE Void mtIntSigHndlr ARGS((int)); -PRIVATE Void mtExitClnup ARGS((void)); +static Void mtIntSigHndlr ARGS((int)); +static Void mtExitClnup ARGS((void)); #ifdef CONAVL -PRIVATE Void *mtConHdlr ARGS((void *)); +static Void *mtConHdlr ARGS((void *)); #endif #ifndef L2_L3_SPLIT #ifdef SS_DRVR_SUPPORT -PRIVATE Void *mtIsTskHdlr ARGS((void *)); +static Void *mtIsTskHdlr ARGS((void *)); #endif #endif /* mt020.201 - Addition for no command line available */ #ifndef NOCMDLINE -PRIVATE Void mtGetOpts ARGS((void)); +static Void mtGetOpts ARGS((void)); /* mt003.301 Additions - File Based task registration made * common for both MULTICORE and NON-MULTICORE */ -PRIVATE Bool fileBasedMemCfg = FALSE; +static Bool fileBasedMemCfg = FALSE; #endif /* mt033.201 - addition of local function to print the statistics such as * (size vs. numAttempts) and (allocations vs. deallocations) */ #ifdef SSI_DEBUG_LEVEL1 -PRIVATE S16 SPrintRegMemStats ARGS((Region region)); +static S16 SPrintRegMemStats ARGS((Region region)); #endif /* SSI_DEBUG_LEVEL1 */ #ifdef SS_MULTICORE_SUPPORT -PRIVATE SsSTskEntry* ssdAddTmrSTsk(Void); -PRIVATE SsSTskEntry* ssdReAddTmrSTsk ARGS((U8 idx)); +static SsSTskEntry* ssdAddTmrSTsk(Void); +static SsSTskEntry* ssdReAddTmrSTsk ARGS((uint8_t idx)); #ifndef SS_LOCKLESS_MEMORY #ifndef RGL_SPECIFIC_CHANGES -PRIVATE S16 ssdInitMemInfo ARGS((void)); +static S16 ssdInitMemInfo ARGS((void)); #endif #endif #endif /* mt005.301: Cavium changes */ #ifdef SS_SEUM_CAVIUM -PRIVATE Void *workRcvTsk ARGS((void *)); +static Void *workRcvTsk ARGS((void *)); #endif /* SS_SEUM_CAVIUM */ #ifdef SS_THR_REG_MAP @@ -409,8 +411,8 @@ S32 ssCheckAndDelMemoryRegionMap ARGS((pthread_t threadId)); #ifdef SS_DRVR_SUPPORT typedef struct mtIsFlag { - U16 id; - U8 action; + uint16_t id; + uint8_t action; } MtIsFlag; #endif @@ -434,6 +436,7 @@ SsRegCfg cfgRegInfo[SS_MAX_REGS] = { 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 } } } @@ -460,6 +463,7 @@ SsRegCfg cfgRegInfo[SS_MAX_REGS] = { 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 } } }, @@ -470,6 +474,7 @@ SsRegCfg cfgRegInfo[SS_MAX_REGS] = { 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 } } }, @@ -480,6 +485,7 @@ SsRegCfg cfgRegInfo[SS_MAX_REGS] = { 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 } } }, @@ -490,9 +496,21 @@ SsRegCfg cfgRegInfo[SS_MAX_REGS] = { 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 } } - } + }, + { + SS_DFLT_REGION + 5, 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 /* SS_LOCKLESS_MEMORY */ }; /* mt003.301 Modifications - File Based task registration made @@ -512,7 +530,8 @@ MtDynMemCfg mtDynMemoCfg = {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}, + {SS_BLK_RELEASE_THRESHOLD, SS_BLK_ACQUIRE_THRESHOLD} } }, { @@ -523,7 +542,8 @@ MtDynMemCfg mtDynMemoCfg = {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}, + {SS_BLK_RELEASE_THRESHOLD, SS_BLK_ACQUIRE_THRESHOLD} } }, { @@ -534,7 +554,8 @@ MtDynMemCfg mtDynMemoCfg = {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}, + {SS_BLK_RELEASE_THRESHOLD, SS_BLK_ACQUIRE_THRESHOLD} } }, { @@ -545,7 +566,8 @@ MtDynMemCfg mtDynMemoCfg = {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}, + {SS_BLK_RELEASE_THRESHOLD, SS_BLK_ACQUIRE_THRESHOLD} } }, { @@ -556,7 +578,20 @@ MtDynMemCfg mtDynMemoCfg = {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}, + {SS_BLK_RELEASE_THRESHOLD, SS_BLK_ACQUIRE_THRESHOLD} + } + }, + { + SS_DFLT_REGION + 5, /* 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} } } #if ((defined (SPLIT_RLC_DL_TASK)) && (!defined (L2_L3_SPLIT))) @@ -586,7 +621,8 @@ MtGlobMemCfg mtGlobMemoCfg = {MT_BKT_0_DSIZE, (MT_BKT_0_NUMBLKS + MT_BKT_0_NUMBLKS), SS_DFLT_MEM_BLK_SET_SIZE}, {MT_BKT_1_DSIZE, MT_BKT_1_NUMBLKS, SS_DFLT_MEM_BLK_SET_SIZE}, {MT_BKT_2_DSIZE, MT_BKT_2_NUMBLKS, SS_DFLT_MEM_BLK_SET_SIZE}, - {MT_BKT_3_DSIZE, MT_BKT_3_NUMBLKS, SS_DFLT_MEM_BLK_SET_SIZE} + {MT_BKT_3_DSIZE, MT_BKT_3_NUMBLKS, SS_DFLT_MEM_BLK_SET_SIZE}, + {MT_BKT_4_DSIZE, MT_BKT_4_NUMBLKS, SS_DFLT_MEM_BLK_SET_SIZE} #else {1024, 12800 /* MT_BKT_0_NUMBLKS */, SS_DFLT_MEM_BLK_SET_SIZE}, {1664, 12800 /* MT_BKT_1_NUMBLKS */, SS_DFLT_MEM_BLK_SET_SIZE}, @@ -620,7 +656,8 @@ MtMemCfg mtMemoCfg = {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_3_DSIZE, MT_BKT_3_STATIC_NUMBLKS}, /* block size, no. of blocks */ + {MT_BKT_4_DSIZE, MT_BKT_4_STATIC_NUMBLKS} #else {256, 491520}, /* 60 pages of 2M*/ {512, 12288}, /* 3 pages of 2M */ @@ -659,7 +696,8 @@ MtMemCfg mtMemoCfg = {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_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 */ } }, { @@ -670,7 +708,8 @@ MtMemCfg mtMemoCfg = {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_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 */ } }, { @@ -681,7 +720,8 @@ MtMemCfg mtMemoCfg = {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_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 */ } }, { @@ -692,10 +732,22 @@ MtMemCfg mtMemoCfg = {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_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 */ + } + }, + { + SS_DFLT_REGION + 5, /* 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 /* SS_LOCKLESS_MEMORY */ STATIC_MEM_CFG } @@ -712,27 +764,34 @@ S16 msOptInd; /* SGetOpt vars */ S8 *msOptArg; /* SGetOpt vars */ -#ifdef INTEL_WLS +#if defined (INTEL_WLS) || defined (SS_USE_WLS_MEM) typedef struct _MtRegMemSz { - U32 reqdSz; - U8 *startAddr; + uint32_t reqdSz; + uint8_t *startAddr; }MtRegMemSz; -PRIVATE MtRegMemSz mtRegMemSz[MT_MAX_BKTS+1]; +#ifdef SS_USE_WLS_MEM +static MtRegMemSz mtDynMemSz[MT_MAX_BKTS]; +static S16 SPartitionWlsDynMem(); +static S16 SAllocateWlsDynMem(); +#endif +#ifdef INTEL_WLS +static MtRegMemSz mtRegMemSz[MT_MAX_BKTS+1]; +#endif #endif /* private variable declarations */ /* mt018.201 - change mtCMMRegCfg as array of pointers */ -PRIVATE CmMmRegCfg *mtCMMRegCfg[SS_MAX_REGS]; -PRIVATE CmMmRegCb *mtCMMRegCb[SS_MAX_REGS]; +static CmMmRegCfg *mtCMMRegCfg[SS_MAX_REGS]; +static CmMmRegCb *mtCMMRegCb[SS_MAX_REGS]; /* mt003.301 - Fixed compilation warnings */ /*mt004.301-addede new veriable for FAP*/ /*mt010.301 - removed veriable defined for FA*/ -#ifdef INTEL_WLS +#if defined (INTEL_WLS) || defined (SS_USE_WLS_MEM) #ifdef NTL_LIB void mtSetNtlHdl(unsigned int hdl) @@ -746,21 +805,33 @@ unsigned int mtGetNtlHdl() } #endif /* NTL_LIB */ - -void * mtGetWlsHdl() +void mtGetWlsHdl(void **hdlr) { - return (osCp.wls.intf); -} + *hdlr = osCp.wls.intf; +} #ifdef XEON_MULTIPLE_CELL_CHANGES -EXTERN S8 gWrWlsDeviceName[MAX_WLS_DEVICE_NAME_LEN]; -EXTERN S16 smWrReadWlsConfigParams (Void); +S8 gWrWlsDeviceName[MAX_WLS_DEVICE_NAME_LEN]; +S16 smWrReadWlsConfigParams (Void); #endif -PRIVATE int SOpenWlsIntf() +static int SOpenWlsIntf() { + uint8_t i; void *hdl; - #define WLS_DEVICE_NAME "/dev/wls" + #define WLS_DEVICE_NAME "wls0" + + char *my_argv[] = {"gnodeb", "-c3", "--proc-type=auto", "--file-prefix", WLS_DEVICE_NAME, "--iova-mode=pa"}; + printf("Calling rte_eal_init: "); + for (i = 0; i < RTE_DIM(my_argv); i++) + { + printf("%s ", my_argv[i]); + } + printf("\n"); + + if (rte_eal_init(RTE_DIM(my_argv), my_argv) < 0) + rte_panic("Cannot init EAL\n"); + #ifdef XEON_SPECIFIC_CHANGES #ifdef XEON_MULTIPLE_CELL_CHANGES @@ -769,7 +840,7 @@ PRIVATE int SOpenWlsIntf() hdl = WLS_Open(WLS_DEVICE_NAME, 1); #endif #else - hdl = WLS_Open(WLS_DEVICE_NAME, WLS_MASTER_CLIENT, (512 *1024 * 1024)); + hdl = WLS_Open(WLS_DEVICE_NAME, WLS_MASTER_CLIENT, WLS_MEM_SIZE); #endif osCp.wls.intf = hdl; @@ -825,7 +896,7 @@ char **argv; /* argument vector */ } /* end of if statement */ #endif -#ifdef INTEL_WLS +#if defined (INTEL_WLS) || defined (SS_USE_WLS_MEM) if(!SOpenWlsIntf()) return (0); #endif /* INTEL_WLS */ @@ -1078,7 +1149,7 @@ Void ssdDeinitGen() sem_destroy(&osCp.dep.ssStarted); - RETVOID; + return; } #ifdef SS_LOCKLESS_MEMORY #ifdef USE_MALLOC @@ -1100,13 +1171,13 @@ Void ssdDeinitGen() #ifdef ANSI S16 ssPutDynMemBlkSet ( -U8 bktIdx, /* Index to bucket list */ +uint8_t bktIdx, /* Index to bucket list */ CmMmBlkSetElement *dynMemSetElem /* Memory set element which is needs to be added to global region */ ) #else S16 ssPutDynMemBlkSet(bktIdx, dynMemSetElem) -U8 bktIdx; /* Index to bucket list */ +uint8_t bktIdx; /* Index to bucket list */ CmMmBlkSetElement *dynMemSetElem; /* Memory set element which is needs to be added to global region */ #endif @@ -1114,7 +1185,7 @@ CmMmBlkSetElement *dynMemSetElem; /* Memory set element which is needs to be CmMmGlobRegCb *globReg; CmMmGlobalBktCb *bktCb; Data *blkPtr; - U8 blkCnt; + uint8_t blkCnt; globReg = osCp.globRegCb; @@ -1158,13 +1229,13 @@ CmMmBlkSetElement *dynMemSetElem; /* Memory set element which is needs to be #ifdef ANSI S16 ssGetDynMemBlkSet ( -U8 bktIdx, /* Index to bucket list */ +uint8_t bktIdx, /* Index to bucket list */ CmMmBlkSetElement *dynMemSetElem /* Memory set element which is updated with new set values */ ) #else S16 ssGetDynMemBlkSet(bktIdx, dynMemSetElem) -U8 bktIdx; /* Index to bucket list */ +uint8_t bktIdx; /* Index to bucket list */ CmMmBlkSetElement *dynMemSetElem; /* Memory set element which is updated with new set values */ #endif @@ -1174,7 +1245,7 @@ CmMmBlkSetElement *dynMemSetElem; /* Memory set element which is updated CmMmGlobalBktCb *bktCb; Data **basePtr; Data *blkPtr; - U8 blkCnt; + uint8_t blkCnt; globReg = osCp.globRegCb; @@ -1220,17 +1291,17 @@ CmMmBlkSetElement *dynMemSetElem; /* Memory set element which is updated #ifdef ANSI S16 ssPutDynMemBlkSet ( -U8 bktIdx, /* Index to bucket list */ +uint8_t bktIdx, /* Index to bucket list */ CmMmBlkSetElement *dynMemSetElem, /* Memory set element which is needs to be added to global region */ -U32 doNotBlockForLock /* Boolean whether to block for lock or not */ +uint32_t doNotBlockForLock /* Boolean whether to block for lock or not */ ) #else S16 ssPutDynMemBlkSet(bktIdx, dynMemSetElem) -U8 bktIdx; /* Index to bucket list */ +uint8_t bktIdx; /* Index to bucket list */ CmMmBlkSetElement *dynMemSetElem; /* Memory set element which is needs to be added to global region */ -U32 doNotBlockForLock; /* Boolean whether to block for lock or not */ +uint32_t doNotBlockForLock; /* Boolean whether to block for lock or not */ #endif { CmMmGlobRegCb *globReg; @@ -1307,17 +1378,17 @@ U32 doNotBlockForLock; /* Boolean whether to block for lock #ifdef ANSI S16 ssGetDynMemBlkSet ( -U8 bktIdx, /* Index to bucket list */ +uint8_t bktIdx, /* Index to bucket list */ CmMmBlkSetElement *dynMemSetElem, /* Memory set element which is updated with new set values */ -U32 doNotBlockForLock /* Boolean whether to block for lock or not */ +uint32_t doNotBlockForLock /* Boolean whether to block for lock or not */ ) #else S16 ssGetDynMemBlkSet(bktIdx, dynMemSetElem) -U8 bktIdx; /* Index to bucket list */ +uint8_t bktIdx; /* Index to bucket list */ CmMmBlkSetElement *dynMemSetElem; /* Memory set element which is updated with new set values */ -U32 doNotBlockForLock; /* Boolean whether to block for lock or not */ +uint32_t doNotBlockForLock; /* Boolean whether to block for lock or not */ #endif { CmMmGlobRegCb *globReg; @@ -1374,21 +1445,21 @@ U32 doNotBlockForLock; /* Boolean whether to block for lock #define NUM_CALLS_TO_CHECK_MEM_DYN_AGAIN 100 -U32 gDynMemAlrm[4]; -PRIVATE U32 memoryCheckCounter; +uint32_t gDynMemAlrm[4]; +static uint32_t memoryCheckCounter; #ifdef ANSI -U32 isMemThreshReached( +uint32_t isMemThreshReached( Region reg ) #else -U32 isMemThreshReached(reg) +uint32_t isMemThreshReached(reg) Region reg; #endif { CmMmGlobRegCb *globReg; CmMmGlobalBktCb *bktCb; - U8 bktIdx= reg; + uint8_t bktIdx= reg; globReg = osCp.globRegCb; @@ -1473,25 +1544,70 @@ Region region; #endif /* SS_USE_ICC_MEMORY */ #ifdef T2K_MEM_LEAK_DBG -extern RegionMemLeakInfo regMemLeakInfo; +RegionMemLeakInfo regMemLeakInfo; #endif /* T2K_MEM_LEAK_DBG */ +#ifdef SS_USE_WLS_MEM +static S16 SPartitionWlsDynMem() +{ + uint32_t i; + uint8_t *bktMemStrtAddr = (uint8_t *)(((uint8_t*)osCp.wls.allocAddr) + (4 * 1024 * 1024)); + + for (i = 0 ; i < mtGlobMemoCfg.numBkts ; i++) + { + mtDynMemSz[i].startAddr = bktMemStrtAddr; + bktMemStrtAddr += mtDynMemSz[i].reqdSz; + } + + printf("Global Memory Info: \n"); + for (i = 0 ; i < mtGlobMemoCfg.numBkts ; i++) + { + printf("mtDynMemSz[%d]: [0x%016lx]\n", i, (unsigned long int)mtDynMemSz[i].startAddr); + } + return ROK; +} + +static S16 SAllocateWlsDynMem() +{ + uint32_t reqdMemSz; + uint32_t i; + reqdMemSz = 0; + memset(&mtDynMemSz[0], 0, sizeof(mtDynMemSz)); + + for (i = 0 ; i < mtGlobMemoCfg.numBkts ; i++) + { + reqdMemSz += (mtGlobMemoCfg.bkt[i].blkSize * mtGlobMemoCfg.bkt[i].numBlks); + mtDynMemSz[i].reqdSz += (mtGlobMemoCfg.bkt[i].blkSize * mtGlobMemoCfg.bkt[i].numBlks); + } + osCp.wls.allocAddr = WLS_Alloc(osCp.wls.intf, +#ifdef INTEL_L1_V19_10 + WLS_MEMORY_SIZE); +#else + (reqdMemSz + (4 * 1024 * 1024))); +#endif + printf("\n *************** \n WLS memory: %lx, %d\n", (PTR)osCp.wls.allocAddr, reqdMemSz); + SPartitionWlsDynMem(); + return ROK; +} + +#endif + #ifdef INTEL_WLS S16 SPartitionWlsMemory() { - U32 i; + uint32_t i; #ifndef ALIGN_64BIT - U64 reqdSz; - U64 pageSize[1], hugePageSize; + uint64_t reqdSz; + uint64_t pageSize[1], hugePageSize; #else long int reqdSz; long int pageSize[1], hugePageSize; #endif - U32 numHugePg; + uint32_t numHugePg; #define DIV_ROUND_OFFSET(X,Y) ( X/Y + ((X%Y)?1:0) ) - U8 *regMemStrtAddr = (U8 *)osCp.wls.allocAddr; + uint8_t *regMemStrtAddr = (uint8_t *)osCp.wls.allocAddr; gethugepagesizes(pageSize,1); hugePageSize = pageSize[0]; @@ -1505,7 +1621,7 @@ S16 SPartitionWlsMemory() regMemStrtAddr += reqdSz; #ifdef T2K_MEM_LEAK_DBG /* Since wls is region 0 */ - regMemLeakInfo.regStartAddr[i] = (U64)mtRegMemSz[i].startAddr; + regMemLeakInfo.regStartAddr[i] = (uint64_t)mtRegMemSz[i].startAddr; regMemLeakInfo.numActvRegions++; #endif /* T2K_MEM_LEAK_DBG */ } @@ -1539,12 +1655,12 @@ Void SChkAddrValid(int type, int region, PTR ptr) } #endif /* SS_MEM_WL_DEBUG */ -S16 SPartitionStaticMemory(U8 *startAddr) +S16 SPartitionStaticMemory(uint8_t *startAddr) { int i; - U32 reqdSz; + uint32_t reqdSz; - U8 *regMemStrtAddr = (U8 *)startAddr; + uint8_t *regMemStrtAddr = (uint8_t *)startAddr; //for (i = 0; i < mtMemoCfg.numRegions; i++) @@ -1555,7 +1671,7 @@ S16 SPartitionStaticMemory(U8 *startAddr) regMemStrtAddr += reqdSz; #ifdef T2K_MEM_LEAK_DBG { /* Since region 1 onwards are used for non wls */ - regMemLeakInfo.regStartAddr[i] = (U64)mtRegMemSz[i].startAddr; + regMemLeakInfo.regStartAddr[i] = (uint64_t)mtRegMemSz[i].startAddr; regMemLeakInfo.numActvRegions++; } #endif /* T2K_MEM_LEAK_DBG */ @@ -1565,8 +1681,8 @@ S16 SPartitionStaticMemory(U8 *startAddr) S16 SAllocateWlsMem() { - U32 reqdMemSz; - U32 i, j; + uint32_t reqdMemSz; + uint32_t i, j; MtRegCfg *region; reqdMemSz = 0; @@ -1599,10 +1715,10 @@ S16 SAllocateWlsMem() S16 SAllocateStaticMem() { - U32 reqdMemSz; + uint32_t reqdMemSz; int i, j; MtRegCfg *region; - U8 *startAddr; + uint8_t *startAddr; reqdMemSz = 0; //memset(&mtRegMemSz[0], sizeof(mtRegMemSz), 0); @@ -1660,9 +1776,9 @@ S16 ssdInitMem() #endif { /* mt018.201 - added local variable */ - U8 i; - U16 j; - U8 k; + uint8_t i; + uint16_t j; + uint8_t k; MtRegCfg *region; Txt errMsg[256] = {'\0'}; #ifdef SS_LOCKLESS_MEMORY @@ -1711,13 +1827,22 @@ S16 ssdInitMem() globReg = (CmMmGlobRegCb *)osCp.globRegCb; +#ifdef SS_USE_WLS_MEM + SAllocateWlsDynMem(); +#endif + for(i = 0; i < mtGlobMemoCfg.numBkts; i++) { memSize = (mtGlobMemoCfg.bkt[i].blkSize * mtGlobMemoCfg.bkt[i].numBlks); +#if !defined (INTEL_WLS) && defined (SS_USE_WLS_MEM) + globReg->bktTbl[i].startAddr = (Data *)mtDynMemSz[i].startAddr; + printf("Starting Address of Bkt Entry [%d]: [0x%016lx], memSize[%d]\n", i, (unsigned long int)globReg->bktTbl[i].startAddr, memSize); +#else #ifndef INTEL_WLS globReg->bktTbl[i].startAddr = (Data *)calloc(memSize, sizeof(Data)); #else globReg->bktTbl[i].startAddr = (Data *)mtRegMemSz[i].startAddr; +#endif #endif if(globReg->bktTbl[i].startAddr == NULLP) { @@ -1753,6 +1878,7 @@ S16 ssdInitMem() #endif return RFAILED; } + dynRegCb->bktTbl[k].poolId = k; dynRegCb->bktTbl[k].size = mtGlobMemoCfg.bkt[k].blkSize; dynRegCb->bktTbl[k].blkSetRelThreshold = mtDynMemoCfg.region[i].bkt[k].blkSetRelThreshold; dynRegCb->bktTbl[k].blkSetAcquireThreshold = mtDynMemoCfg.region[i].bkt[k].blkSetAcquireThreshold; @@ -1770,7 +1896,7 @@ S16 ssdInitMem() #endif /* SS_LOCKLESS_MEMORY */ #ifdef T2K_MEM_LEAK_DBG - U8 reg; + uint8_t reg; /* Initailize mem leak tool memorys for debguing */ regMemLeakInfo.numActvRegions=0; for(reg=0; reg dep.lwpId = ++stLwpId; } #endif /* SS_MULTICORE_SUPPORT || SS_AFFINITY_SUPPORT */ @@ -3724,7 +3850,7 @@ void* arg; { int retVal = 0; #ifdef SS_THR_REG_MAP - U32 threadCreated = FALSE; + uint32_t threadCreated = FALSE; #endif SPThreadCreateArg* threadArg = (SPThreadCreateArg*)malloc(sizeof(SPThreadCreateArg)); @@ -3781,13 +3907,13 @@ void* arg; */ #ifdef ANSI -PRIVATE S16 ssdSetPthreadAttr +static S16 ssdSetPthreadAttr ( S32 tskPrior, pthread_attr_t *attr ) #else -PRIVATE S16 ssdSetPthreadAttr(sTsk, attr) +static S16 ssdSetPthreadAttr(sTsk, attr) S32 tskPrior, pthread_attr_t *attr #endif @@ -3862,26 +3988,26 @@ pthread_attr_t *attr S16 ssdGetAffinity ( SSTskId *tskId, /* filled in with system task ID */ -U32 *coreId /* the core/processor id to which the affinity is set */ +uint32_t *coreId /* the core/processor id to which the affinity is set */ ) #else S16 ssdGetAffinity(tskId, coreId) SSTskId *tskId; /* filled in with system task ID */ -U32 *coreId; /* the core/processor id to which the affinity is set */ +uint32_t *coreId; /* the core/processor id to which the affinity is set */ #endif { - U32 tskInd; + uint32_t tskInd; #ifdef SS_LINUX pthread_t tId =0; cpu_set_t cpuSet; - U32 cpuInd = 0; + uint32_t cpuInd = 0; /*mt013.301 :Fix for TRACE5 feature crash due to missing TRC MACRO*/ #else #ifdef SUNOS - U32 lwpId = *tskId; + uint32_t lwpId = *tskId; #endif /*SUNOS*/ #endif /*SS_LINUX*/ #ifdef SS_LINUX @@ -3978,16 +4104,16 @@ U32 *coreId; /* the core/processor id to which the affinity i S16 ssdSetAffinity ( SSTskId *tskId, /* filled in with system task ID */ -U32 coreId /* the core/processor id to which the affinity has to be set */ +uint32_t coreId /* the core/processor id to which the affinity has to be set */ ) #else S16 ssdSetAffinity(tskId, coreId) SSTskId *tskId; /* filled in with system task ID */ -U32 coreId; /* the core/processor id to which the affinity has to be set */ +uint32_t coreId; /* the core/processor id to which the affinity has to be set */ #endif { - U32 tskInd = 0; + uint32_t tskInd = 0; #ifdef SS_LINUX pthread_t tId = 0; @@ -3995,7 +4121,7 @@ U32 coreId; /* the core/processor id to which the affinity h /*mt013.301 :Fix for TRACE5 feature crash due to missing TRC MACRO*/ #else #ifdef SUNOS - U32 lwpId = *tskId; + uint32_t lwpId = *tskId; #endif /*SUNOS*/ #endif /*SS_LINUX*/ @@ -4317,7 +4443,7 @@ Reason reason; /* reset reason */ /* set up the message to display */ sprintf(errBuf, "\n\nFATAL ERROR - taskid = %x, errno = %d," - "reason = %d\n\n", (U8)tId, seq, reason); + "reason = %d\n\n", (uint8_t)tId, seq, reason); SPrint(errBuf); @@ -4468,7 +4594,7 @@ Txt *errDesc; /* description of error */ #endif - RETVOID; + return; } #ifdef ENB_RELAY @@ -4691,9 +4817,9 @@ SsIdx idx; //#ifndef SPLIT_RLC_DL_TASK #ifdef TENB_T2K3K_SPECIFIC_CHANGES #if defined (L2_L3_SPLIT) && defined(SPLIT_RLC_DL_TASK) -EXTERN Void ysMtTskHdlr(Void); -EXTERN Void ysMtPollPhyMsg(U8 region); -EXTERN Void ysMtRcvPhyMsg(Void); +Void ysMtTskHdlr(Void); +Void ysMtPollPhyMsg(uint8_t region); +Void ysMtRcvPhyMsg(Void); #ifdef ANSI Void *mtTskHdlrT2kL2 ( @@ -4728,8 +4854,8 @@ Ptr tskPtr; /* pointer to task entry */ return (NULLP); } #else -EXTERN Void ysMtTskHdlr(Void); -EXTERN Void YsPhyRecvMsg(); +Void ysMtTskHdlr(Void); +Void YsPhyRecvMsg(); #ifdef ANSI Void *mtTskHdlrT2kL2 ( @@ -4856,11 +4982,6 @@ Ptr tskPtr; /* pointer to task entry */ #endif while (1) { -#ifndef ODU_TEST_STUB -#ifdef INTEL_WLS - LwrMacRecvPhyMsg(); -#endif -#endif /* Wait for a message from the demand queue */ #ifdef SS_CDMNDQ_SUPPORT ret = ssCDmndQWait(&sTsk->dQ); @@ -4929,7 +5050,7 @@ SsSTskEntry *sTsk PFS16 tmrActvFn = NULLP; #else PAIFTMRS16 tmrActvFn; - U16 procIdIdx; + uint16_t procIdIdx; #endif /* SS_MULTIPLE_PROCS */ /* mt003.301 Modifications */ #ifdef SS_THREAD_PROFILE @@ -5078,7 +5199,7 @@ SsSTskEntry *sTsk /* copy the Pst structure into a local duplicate */ for (i = 0; i < (S16) sizeof(Pst); i++) - *(((U8 *)(&nPst)) + i) = *(((U8 *)&mInfo->pst) + i); + *(((uint8_t *)(&nPst)) + i) = *(((uint8_t *)&mInfo->pst) + i); /* Give the message to the task activation function. If * its a normal data message, we pass it, if this is a @@ -5090,7 +5211,7 @@ SsSTskEntry *sTsk { #ifndef RGL_SPECIFIC_CHANGES #ifdef SS_TSKLOG_ENABLE - U32 t = MacGetTick(); + uint32_t t = MacGetTick(); #endif #endif /* mt003.301 Modifications */ @@ -5106,8 +5227,8 @@ SsSTskEntry *sTsk #endif #if SS_THREAD_PROFILE SGetEpcTime(&et2); - tTsk->curEvtTime = (U32)(et2 - et1); - tTsk->totTime += (U64)tTsk->curEvtTime; + tTsk->curEvtTime = (uint32_t)(et2 - et1); + tTsk->totTime += (uint64_t)tTsk->curEvtTime; #endif /* SS_THREAD_PROFILE */ } else @@ -5344,13 +5465,13 @@ Void mtTmrHdlrPublic() */ /*mt041.201 Modified SSI tick handling in mtTmrHdlr() */ #ifdef ANSI -PRIVATE Void *mtTmrHdlr +static Void *mtTmrHdlr ( void *parm /* unused */ ) #else /* mt009.21: addition */ -PRIVATE Void *mtTmrHdlr(parm) +static Void *mtTmrHdlr(parm) void *parm; /* unused */ #endif { @@ -5359,14 +5480,14 @@ void *parm; /* unused */ * enabled oroginal code in function mtTmrHdlr */ struct timespec ts; - U32 time_int; - U32 i, cnt, oldTicks, newTicks; + uint32_t time_int; + uint32_t i, cnt, oldTicks, newTicks; struct timeval tv1,tv2; /* mt038.201 added return */ S16 ret; /* mt039.201 changes for nanosleep */ struct timespec tsN; - PRIVATE U32 err_in_usec; + static uint32_t err_in_usec; /*mt013.301 : doesn't need TRC macro ,as this will never return*/ @@ -5529,11 +5650,11 @@ S16 evnt; /* event */ #endif /* mt028.201: modification: multiple procs support related changes */ #ifdef SS_MULTIPLE_PROCS - U16 procIdIdx; + uint16_t procIdIdx; #endif /* SS_MULTIPLE_PROCS */ #ifdef RGL_SPECIFIC_CHANGES #ifdef MSPD_MLOG_NEW - U32 t = GetTIMETICK(); + uint32_t t = GetTIMETICK(); #endif #endif @@ -5546,7 +5667,7 @@ S16 evnt; /* event */ /* if the timer was deleted, this will be NULL, so drop it */ if (tEnt == NULL) { - RETVOID; + return; } /* mt008.301 Deletion: tmrTbl Lock is moved to mtTmrHdlr */ @@ -5557,7 +5678,7 @@ S16 evnt; /* event */ */ if (tEnt->used == FALSE) { - RETVOID; + return; } @@ -5579,7 +5700,7 @@ S16 evnt; /* event */ MTLOGERROR(ERRCLS_DEBUG, EMT017, ERRZERO, "Could not get message"); #endif - RETVOID; + return; } mInfo = (SsMsgInfo *)mBuf->b_rptr; @@ -5620,7 +5741,7 @@ S16 evnt; /* event */ MTLOGERROR(ERRCLS_DEBUG, EMT018, ret, "Could not lock TAPA task table"); #endif - RETVOID; + return; } #endif @@ -5639,7 +5760,7 @@ S16 evnt; /* event */ SS_RELEASE_SEMA(&osCp.tTskTblSem); #endif SPutMsg(mBuf); - RETVOID; + return; } @@ -5651,7 +5772,7 @@ S16 evnt; /* event */ SS_RELEASE_SEMA(&osCp.tTskTblSem); #endif SPutMsg(mBuf); - RETVOID; + return; } /* Klock work fix ccpu00148484 */ /* write the timer message to the queue of the destination task */ @@ -5668,7 +5789,7 @@ S16 evnt; /* event */ "Could not write to demand queue"); #endif - RETVOID; + return; } #ifdef SS_LOCKLESS_MEMORY mInfo->pst.region = tTsk->sTsk->region; @@ -5687,7 +5808,7 @@ S16 evnt; /* event */ "Could not write to demand queue"); #endif - RETVOID; + return; } /* Fix for ccpu00130657 */ #ifdef TENB_T2K3K_SPECIFIC_CHANGES @@ -5723,7 +5844,7 @@ S16 evnt; /* event */ MLogTask(131313, RESOURCE_LARM, t, GetTIMETICK()); #endif #endif - RETVOID; + return; } @@ -5743,13 +5864,13 @@ S16 evnt; /* event */ * */ #ifdef ANSI -PRIVATE Void *mtConHdlr +static Void *mtConHdlr ( Ptr parm /* unused */ ) #else /* mt009.21: addition */ -PRIVATE Void *mtConHdlr(parm) +static Void *mtConHdlr(parm) Ptr parm; /* unused */ #endif { @@ -5812,13 +5933,13 @@ Ptr parm; /* unused */ */ #ifdef ANSI /* mt009.21: addition */ -PRIVATE Void *mtIsTskHdlr +static Void *mtIsTskHdlr ( Ptr tskPtr /* pointer to task entry */ ) #else /* mt009.21: addition */ -PRIVATE Void *mtIsTskHdlr(tskPtr) +static Void *mtIsTskHdlr(tskPtr) Ptr tskPtr; /* pointer to task entry */ #endif { @@ -5934,7 +6055,7 @@ int arg; #endif #endif - RETVOID; + return; } /*mt010.301 Fix for core when run with -o option and when killed with SIGINT*/ @@ -6204,12 +6325,12 @@ REG1 DateTime *dt; /* date and time */ #endif localtime_r(&ptime.tv_sec, &tme); - dt->month = (U8) tme.tm_mon + 1; - dt->day = (U8) tme.tm_mday; - dt->year = (U8) tme.tm_year; - dt->hour = (U8) tme.tm_hour; - dt->min = (U8) tme.tm_min; - dt->sec = (U8) tme.tm_sec; + dt->month = (uint8_t) tme.tm_mon + 1; + dt->day = (uint8_t) tme.tm_mday; + dt->year = (uint8_t) tme.tm_year; + dt->hour = (uint8_t) tme.tm_hour; + dt->min = (uint8_t) tme.tm_min; + dt->sec = (uint8_t) tme.tm_sec; dt->tenths = 0; #ifdef SS_DATETIME_USEC @@ -6251,9 +6372,9 @@ EpcTime *et; /* date and time */ #endif { /* mt003.301 Modifications */ -PRIVATE U64 now; - U64 to_sec = 1000000; - U64 to_nsec = 1000; +static uint64_t now; + uint64_t to_sec = 1000000; + uint64_t to_nsec = 1000; #ifndef SS_LINUX struct timespec ptime; #else @@ -6356,15 +6477,15 @@ Ticks *sysTime; /* system time */ #ifdef ANSI S16 SGetRefTime ( -U32 refTime, /* reference time */ -U32 *sec, -U32 *usec +uint32_t refTime, /* reference time */ +uint32_t *sec, +uint32_t *usec ) #else S16 SGetRefTime(refTime, sec, usec) -U32 refTime; /* reference time */ -U32 *sec; -U32 *usec; +uint32_t refTime; /* reference time */ +uint32_t *sec; +uint32_t *usec; #endif { @@ -6388,7 +6509,7 @@ U32 *usec; return RFAILED; } /* mt022.201 - Modification to fix compile warning */ - if (refTime > (U32)(ptime.tv_sec)) + if (refTime > (uint32_t)(ptime.tv_sec)) { MTLOGERROR(ERRCLS_INT_PAR, EMT026, ERRZERO, "Reference time exceeds present time"); return RFAILED; @@ -6582,12 +6703,12 @@ S16 SRelInt() * */ #ifdef ANSI -INLINE S16 SEnbInt +inline S16 SEnbInt ( void ) #else -INLINE S16 SEnbInt() +inline S16 SEnbInt() #endif { @@ -6611,12 +6732,12 @@ INLINE S16 SEnbInt() * */ #ifdef ANSI -INLINE S16 SDisInt +inline S16 SDisInt ( void ) #else -INLINE S16 SDisInt() +inline S16 SDisInt() #endif { @@ -6867,14 +6988,14 @@ Inst inst; /* instance */ * */ #ifdef ANSI -INLINE S16 SSetIntPend +inline S16 SSetIntPend ( -U16 id, /* driver task identifier */ +uint16_t id, /* driver task identifier */ Bool flag /* flag */ ) #else -INLINE S16 SSetIntPend(id, flag) -U16 id; /* driver task identifier */ +inline S16 SSetIntPend(id, flag) +uint16_t id; /* driver task identifier */ Bool flag; /* flag */ #endif { @@ -6930,7 +7051,7 @@ Void S16 SGlobMemInfoShow() #endif { - U16 idx; + uint16_t idx; Txt prntBuf[100]; CmMmGlobRegCb *globReg; @@ -7026,15 +7147,15 @@ Bool IsMemoryThresholdHit(Region reg, Pool pool) S16 SRegInfoShow ( Region region, -U32 *availmem +uint32_t *availmem ) #else S16 SRegInfoShow(region, availmem) Region region; -U32 *availmem; +uint32_t *availmem; #endif { - U16 idx; + uint16_t idx; Txt prntBuf[100]; @@ -7127,23 +7248,23 @@ U32 *availmem; #ifdef XEON_SPECIFIC_CHANGES #define SSI_MAX_BKT_THRESHOLD 6 #define SSI_MAX_REG_THRESHOLD 2 -U32 SMemMaxThreshold[SSI_MAX_REG_THRESHOLD][SSI_MAX_BKT_THRESHOLD] = {{0}}; -U32 SMemMidThreshold[SSI_MAX_REG_THRESHOLD][SSI_MAX_BKT_THRESHOLD] = {{0}}; -U32 SMemLowThreshold[SSI_MAX_REG_THRESHOLD][SSI_MAX_BKT_THRESHOLD] = {{0}}; +uint32_t SMemMaxThreshold[SSI_MAX_REG_THRESHOLD][SSI_MAX_BKT_THRESHOLD] = {{0}}; +uint32_t SMemMidThreshold[SSI_MAX_REG_THRESHOLD][SSI_MAX_BKT_THRESHOLD] = {{0}}; +uint32_t SMemLowThreshold[SSI_MAX_REG_THRESHOLD][SSI_MAX_BKT_THRESHOLD] = {{0}}; #ifdef ANSI -PRIVATE Void SInitMemThreshold +static Void SInitMemThreshold ( Region region, -U8 maxBkt +uint8_t maxBkt ) #else -PRIVATE Void SInitMemThreshold(region, maxBkt) +static Void SInitMemThreshold(region, maxBkt) Region region; -U8 maxBkt; +uint8_t maxBkt; #endif { - U8 idx = 0; + uint8_t idx = 0; for (idx = 0; (idx < maxBkt && idx < mtCMMRegCb[region]->numBkts); idx++) { SMemMaxThreshold[region][idx] = (mtCMMRegCb[region]->bktTbl[idx].numBlks*95)/100; @@ -7157,17 +7278,17 @@ U8 maxBkt; S16 SRegReachedMemThreshold ( Region region, -U8 maxBkt +uint8_t maxBkt ) #else S16 SRegReachedMemThreshold(region, maxBkt) Region region; -U8 maxBkt; +uint8_t maxBkt; #endif { - U8 idx = 0; - U8 memStatus = 3; - PRIVATE U8 initFlag = 1; + uint8_t idx = 0; + uint8_t memStatus = 3; + static uint8_t initFlag = 1; if(initFlag) { initFlag = 0; @@ -7222,7 +7343,7 @@ Region region; SsMemDbgInfo *dbgInfo; #endif { - U32 idx; + uint32_t idx; #if (ERRCLASS & ERRCLS_INT_PAR) @@ -7270,13 +7391,13 @@ SsMemDbgInfo *dbgInfo; #ifdef ANSI S16 SGetRegPoolInfo ( -U8 *numRegion, -U8 *numPool +uint8_t *numRegion, +uint8_t *numPool ) #else S16 SGetRegPoolInfo(numRegion, numPool) -U8 *numRegion; -U8 *numPool; +uint8_t *numRegion; +uint8_t *numPool; #endif { /* Send number of Region available */ @@ -7314,18 +7435,18 @@ U8 *numPool; S16 SPrintRegMemStatusInfo ( Region region, -U8 typeFlag +uint8_t typeFlag ) #else S16 SPrintRegMemStatusInfo(region, typeFlag) Region region; -U8 typeFlag; +uint8_t typeFlag; #endif { Txt prntBuf[150]; - U32 idx; - U32 statMemSize; - U32 dynMemSize; + uint32_t idx; + uint32_t statMemSize; + uint32_t dynMemSize; #if (ERRCLASS & ERRCLS_INT_PAR) @@ -7425,19 +7546,19 @@ U8 typeFlag; * */ #ifdef ANSI -PRIVATE S16 SPrintRegMemStats +static S16 SPrintRegMemStats ( Region region ) #else -PRIVATE S16 SPrintRegMemStats(region) +static S16 SPrintRegMemStats(region) Region region; #endif { CmMmHashListCp *hashListCp; Txt prntBuf[150]; - U32 idx; - U32 cntEnt; + uint32_t idx; + uint32_t cntEnt; hashListCp = &mtCMMRegCb[region]->hashListCp; @@ -7558,7 +7679,7 @@ S16 errCode; SDisplay(0, prntBuf); } - RETVOID; + return; } /* @@ -7594,8 +7715,8 @@ Region region; Size offsetToNxtBlk; Size hdrSize; Txt prntBuf[250]; - U32 idx; - U32 blkCnt; + uint32_t idx; + uint32_t blkCnt; @@ -7882,12 +8003,12 @@ S8 *ts; * --*/ #ifdef ANSI -U32 SGetSystemTsk +uint32_t SGetSystemTsk ( Void ) #else -U32 SGetSystemTsk() +uint32_t SGetSystemTsk() #endif { @@ -7911,9 +8032,9 @@ U32 SGetSystemTsk() * --*/ #ifdef ANSI -PRIVATE SsSTskEntry* ssdAddTmrSTsk(Void) +static SsSTskEntry* ssdAddTmrSTsk(Void) #else -PRIVATE SsSTskEntry* ssdAddTmrSTsk() +static SsSTskEntry* ssdAddTmrSTsk() #endif { SsSTskEntry *sTsk; @@ -8044,12 +8165,12 @@ PRIVATE SsSTskEntry* ssdAddTmrSTsk() S16 ssdInitLockNew ( SLockInfo *lockId, -U8 lockType +uint8_t lockType ) #else S16 ssdInitLockNew(lockId, lockType) SLockInfo *lockId; -U8 lockType; +uint8_t lockType; #endif { @@ -8134,12 +8255,12 @@ U8 lockType; S16 ssdLockNew ( SLockInfo *lockId, -U8 lockType +uint8_t lockType ) #else S16 ssdLockNew(lockId, lockType) SLockInfo *lockId; -U8 lockType; +uint8_t lockType; #endif { @@ -8232,12 +8353,12 @@ U8 lockType; S16 ssdUnlockNew ( SLockInfo *lockId, -U8 lockType +uint8_t lockType ) #else S16 ssdUnlockNew(lockId, lockType) SLockInfo *lockId; -U8 lockType; +uint8_t lockType; #endif { @@ -8298,12 +8419,12 @@ U8 lockType; S16 ssdDestroyLockNew ( SLockInfo *lockId, -U8 lockType +uint8_t lockType ) #else S16 ssdDestroyLockNew(lockId, lockType) SLockInfo *lockId; -U8 lockType; +uint8_t lockType; #endif { Txt prntBuf[PRNTSZE]; @@ -8420,12 +8541,12 @@ S16 ssInitRcvWork() **/ #ifdef ANSI -PRIVATE void *workRcvTsk +static void *workRcvTsk ( Ptr ptr ) #else -PRIVATE void *workRcvTsk (ptr) +static void *workRcvTsk (ptr) Ptr ptr; #endif { @@ -8514,7 +8635,7 @@ PRIVATE void *workRcvTsk (ptr) #endif /* SS_SEUM_CAVIUM */ #ifdef TENB_RTLIN_CHANGES -S16 SInitLock(SLockId *l, U8 t) +S16 SInitLock(SLockId *l, uint8_t t) { S16 r = 0; pthread_mutexattr_t prior; @@ -8593,9 +8714,9 @@ pthread_t threadId, /* Thread Id of system task */ Region region /* Region associated with thread */ ) { - PRIVATE U32 createdThreads; - PRIVATE pthread_t createdThreadIds[SS_MAX_THREAD_CREATE_RETRY]; - U32 indx; + static uint32_t createdThreads; + static pthread_t createdThreadIds[SS_MAX_THREAD_CREATE_RETRY]; + uint32_t indx; /* Here 0xFF is considered as invalid region and if the mapping table @@ -8676,9 +8797,9 @@ pthread_t threadId /* Thread Id of system task */ osCp.threadMemoryRegionMap[((threadId >> SS_MEM_THREAD_ID_SHIFT) % SS_MAX_THREAD_REGION_MAP)]) { #ifndef ALIGN_64BIT - printf("Invalid Thread ID (%ld)\n", (U32)threadId); + printf("Invalid Thread ID (%ld)\n", (uint32_t)threadId); #else - printf("Invalid Thread ID (%d)\n", (U32)threadId); + printf("Invalid Thread ID (%d)\n", (uint32_t)threadId); #endif return RFAILED; } @@ -8710,13 +8831,13 @@ pthread_t threadId /* Thread Id of system task */ #ifdef ANSI S16 SStartTask ( -VOLATILE U32 *startTime, -U32 taskId +volatile uint32_t *startTime, +uint32_t taskId ) #else S16 SStartTask(startTime, taskId) -VOLATILE U32 *startTime; -U32 taskId; +volatile uint32_t *startTime; +uint32_t taskId; #endif { #ifdef MSPD_MLOG_NEW @@ -8743,16 +8864,16 @@ U32 taskId; #ifdef ANSI S16 SStopTask ( -VOLATILE U32 startTime, -U32 taskId +volatile uint32_t startTime, +uint32_t taskId ) #else S16 SStopTask(startTime, taskId) -VOLATILE U32 startTime; -U32 taskId; +volatile uint32_t startTime; +uint32_t taskId; #endif { - /*U32 stopTime;*/ + /*uint32_t stopTime;*/ switch(taskId) { case PID_MAC_HARQ_IND: @@ -8792,13 +8913,13 @@ U32 taskId; #ifdef ANSI S16 SStartTask ( -VOLATILE U32 * startTime, -U32 taskId +volatile uint32_t * startTime, +uint32_t taskId ) #else S16 SStartTask(startTime, taskId) -VOLATILE U32 * startTime; -U32 taskId; +volatile uint32_t * startTime; +uint32_t taskId; #endif { *startTime = 0; @@ -8808,13 +8929,13 @@ U32 taskId; #ifdef ANSI S16 SStopTask ( -VOLATILE U32 startTime, -U32 taskId +volatile uint32_t startTime, +uint32_t taskId ) #else S16 SStopTask(startTime, taskId) -VOLATILE U32 startTime; -U32 taskId; +volatile uint32_t startTime; +uint32_t taskId; #endif { return ROK; @@ -8834,28 +8955,28 @@ U32 taskId; Void UpdateSocCpuInfo ( CmCpuStatsInfo *cpuInfo, -U8 idx +uint8_t idx ) #else Void UpdateSocCpuInfo(*cpuInfo, idx) CmCpuStatsInfo *cpuInfo; -U8 idx; +uint8_t idx; #endif { FILE *mipsFd; - S8 mipsStr[MIPS_STRING_LEN]; + S8 mipsStr[MIPS_STRING_LEN]; S8 *strPart; - U32 l2FreeCpu; - U32 l2CpuUsed; - U32 l3FreeCpu; - U32 l3CpuUsed; + uint32_t l2FreeCpu; + uint32_t l2CpuUsed; + uint32_t l3FreeCpu; + uint32_t l3CpuUsed; /* Open the file which holds the MIPS available value */ mipsFd = fopen(MIPS_FILE, "r"); if(mipsFd == NULLP) { - RETVOID; + return; } /* Get the free mips available value from the file */ @@ -8863,7 +8984,7 @@ U8 idx; { printf("fgets to get the free mips available failed\n"); fclose(mipsFd); - RETVOID; + return; } strtok(mipsStr, " "); @@ -8877,7 +8998,7 @@ U8 idx; l2FreeCpu = atoi(strPart); l2CpuUsed = 100 - l2FreeCpu; cpuInfo->cpuUtil[0].totCpuUtil += l2CpuUsed; - cpuInfo->cpuUtil[0].maxCpuUtil = GET_CPU_MAX((cpuInfo->cpuUtil[0].maxCpuUtil), l2CpuUsed);; + cpuInfo->cpuUtil[0].maxCpuUtil = GET_CPU_MAX((cpuInfo->cpuUtil[0].maxCpuUtil), l2CpuUsed); cpuInfo->cpuUtil[0].numSamples++; } } @@ -8889,7 +9010,7 @@ U8 idx; l3FreeCpu = atoi(strPart); l3CpuUsed = 100 - l3FreeCpu; cpuInfo->cpuUtil[0].totCpuUtil += l3CpuUsed; - cpuInfo->cpuUtil[0].maxCpuUtil = GET_CPU_MAX((cpuInfo->cpuUtil[0].maxCpuUtil), l3CpuUsed);; + cpuInfo->cpuUtil[0].maxCpuUtil = GET_CPU_MAX((cpuInfo->cpuUtil[0].maxCpuUtil), l3CpuUsed); cpuInfo->cpuUtil[0].numSamples++; } } @@ -8903,7 +9024,7 @@ U8 idx; } fclose(mipsFd); - RETVOID; + return; } #endif /* TENB_T2K3K_SPECIFIC_CHANGES */ #ifdef SS_MULTICORE_SUPPORT @@ -8922,12 +9043,12 @@ U8 idx; * --*/ #ifdef ANSI -PRIVATE SsSTskEntry* ssdReAddTmrSTsk( -U8 idx +static SsSTskEntry* ssdReAddTmrSTsk( +uint8_t idx ) #else -PRIVATE SsSTskEntry* ssdReAddTmrSTsk(idx) -U8 idx; +static SsSTskEntry* ssdReAddTmrSTsk(idx) +uint8_t idx; #endif { SsSTskEntry *sTsk; @@ -9051,13 +9172,13 @@ S16 ssdReInitTmr() pthread_attr_t attr; struct sched_param param_sched; #ifndef XEON_SPECIFIC_CHANGES - U8 ret = ROK; + uint8_t ret = ROK; #endif #ifdef SS_MULTICORE_SUPPORT SsSTskEntry *sTsk; #endif /* SS_MULTICORE_SUPPORT */ #ifdef SS_THR_REG_MAP - U32 threadCreated = FALSE; + uint32_t threadCreated = FALSE; #endif /* SS_THR_REG_MAP */