X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_ue_mgr.c;h=f796cb90523a271e05e2fc1588562de6ac5a48ec;hb=0b405462775bb65021e41dc4494ed38ce3a9c4f4;hp=3a733dfd056bed88c82ffe65603372fe6d1711c1;hpb=3d867a85aa8be3efdb207fd60affc05e26d42128;p=o-du%2Fl2.git diff --git a/src/du_app/du_ue_mgr.c b/src/du_app/du_ue_mgr.c index 3a733dfd0..f796cb905 100644 --- a/src/du_app/du_ue_mgr.c +++ b/src/du_app/du_ue_mgr.c @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # # limitations under the License. # ################################################################################ - *******************************************************************************/ +*******************************************************************************/ /* This file contains UE management handling functionality for DU APP */ #include "common_def.h" #include "lrg.h" @@ -34,6 +34,11 @@ #include "du_f1ap_msg_hdl.h" #include "du_ue_mgr.h" +#ifdef O1_ENABLE +#include "AlarmInterface.h" +#include "CmInterface.h" +#endif + DuMacDlCcchInd packMacDlCcchIndOpts[] = { packMacDlCcchInd, /* Loose coupling */ @@ -97,12 +102,42 @@ DuRlcUeDeleteReq packRlcUeDeleteReqOpts[] = packDuRlcUeDeleteReq /* Light weight-loose coupling */ }; -DuMacCellDeleteReq packMacCellDeleteReqOpts[] = +/****************************************************************** + * + * @brief Function to return Drb LcId + * + * @details + * + * Function : getDrbLcId + * + * Functionality: Function to return Drb LcId + * + * @params[in] drbBitMap + * + * Returns: lcId - SUCCESS + * RFAILED - FAILURE + *****************************************************************/ + +uint8_t getDrbLcId(uint32_t *drbBitMap) { - packDuMacCellDeleteReq, /* Loose coupling */ - MacProcCellDeleteReq, /* TIght coupling */ - packDuMacCellDeleteReq /* Light weight-loose coupling */ -}; + uint8_t bitMask = 1, bitPos = 0; + bitPos = MIN_DRB_LCID; + + while(bitPos <= MAX_DRB_LCID) + { + if((*drbBitMap & (bitMask << bitPos)) == 0) + { + *drbBitMap = ((bitMask << bitPos)| *drbBitMap); + return bitPos; + } + else + { + bitPos++; + } + } + DU_LOG("\nERROR --> DU_APP: Max LC Reached in getDrbLcId()"); + return RFAILED; +} /******************************************************************* * @@ -131,13 +166,13 @@ uint8_t fillDlUserDataInfo(uint32_t teId, RlcDlUserDataInfo *dlDataMsgInfo) { if(duCb.upTnlCfg[drbIdx] && (duCb.upTnlCfg[drbIdx]->tnlCfg1 != NULLP)) { - if(duCb.upTnlCfg[drbIdx]->tnlCfg1->teId == teId) - { - dlDataMsgInfo->cellId = duCb.upTnlCfg[drbIdx]->cellId; - dlDataMsgInfo->ueIdx = duCb.upTnlCfg[drbIdx]->ueIdx; - dlDataMsgInfo->rbId = duCb.upTnlCfg[drbIdx]->drbId; - return ROK; - } + if(duCb.upTnlCfg[drbIdx]->tnlCfg1->teId == teId) + { + dlDataMsgInfo->cellId = duCb.upTnlCfg[drbIdx]->cellId; + dlDataMsgInfo->ueIdx = duCb.upTnlCfg[drbIdx]->ueIdx; + dlDataMsgInfo->rbId = duCb.upTnlCfg[drbIdx]->drbId; + return ROK; + } } } return RFAILED; @@ -185,7 +220,8 @@ uint8_t duBuildAndSendDlUserDataToRlc(uint16_t msgLen, EgtpMsg *egtpMsg) { /* Filling post structure and sending msg */ FILL_PST_DUAPP_TO_RLC(pst, RLC_DL_INST, EVENT_DL_USER_DATA_TRANS_TO_RLC); - DU_LOG("\nDEBUG --> DU_APP : Sending User Data Msg to RLC \n"); + DU_LOG("\nDEBUG --> DU_APP : Sending User Data Msg to RLC [TEID, nPDU]:[%d, %d]\n",\ + egtpMsg->msgHdr.teId, egtpMsg->msgHdr.nPdu.val); ret = (*duSendRlcDlUserDataToRlcOpts[pst.selector])(&pst, dlDataMsgInfo); } if(ret != ROK) @@ -216,6 +252,11 @@ uint8_t duBuildAndSendDlUserDataToRlc(uint16_t msgLen, EgtpMsg *egtpMsg) uint8_t duHdlEgtpDlData(EgtpMsg *egtpMsg) { uint16_t msgLen = 0; + +#ifdef CALL_FLOW_DEBUG_LOG + DU_LOG("\nCall Flow: ENTEGTP -> ENTDUAPP : EVENT_HDL_RECV_DL_DATA\n"); +#endif + DU_LOG("\nDEBUG --> DU_APP : Processing DL data in duHdlEgtpDlData()"); if(!egtpMsg->msg) @@ -282,7 +323,7 @@ uint8_t duBuildAndSendDlCcchInd(uint16_t *cellId, uint16_t *crnti, \ { dlCcchIndInfo->dlCcchMsg[idx2] = dlCcchMsg[idx2]; } - DU_FREE(dlCcchMsg, dlCcchMsgSize); + DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, dlCcchMsg, dlCcchMsgSize); /* Fill Pst */ FILL_PST_DUAPP_TO_MAC(pst, EVENT_MAC_DL_CCCH_IND); @@ -479,11 +520,20 @@ uint8_t duProcDlRrcMsg(F1DlRrcMsg *dlRrcMsg) * @return gnbDuF1apId * * ****************************************************************/ -uint32_t genGnbDuUeF1apId() -{ - static uint32_t gnbDuUeF1apId = 0; - - return ++gnbDuUeF1apId; +int32_t genGnbDuUeF1apId(uint8_t cellId) +{ + uint8_t cellIdx =0; + + GET_CELL_IDX(cellId, cellIdx); + if(duCb.actvCellLst[cellIdx]) + { + return ++duCb.actvCellLst[cellIdx]->gnbDuUeF1apIdGenerator; + } + else + { + DU_LOG("ERROR --> DU_APP : genGnbDuUeF1apId(): CellId[%d] does not exist", cellId); + } + return -1; } /****************************************************************** @@ -505,12 +555,18 @@ uint8_t duProcUlCcchInd(UlCcchIndInfo *ulCcchIndInfo) { uint8_t ret = ROK; - uint32_t gnbDuUeF1apId = 0; + int32_t gnbDuUeF1apId = 0; - gnbDuUeF1apId = genGnbDuUeF1apId(); + gnbDuUeF1apId = genGnbDuUeF1apId(ulCcchIndInfo->cellId); + + if(gnbDuUeF1apId == -1) + { + DU_LOG("ERROR --> DU_APP : duProcUlCcchInd(): Received cellId[%d] does not exist", ulCcchIndInfo->cellId); + return RFAILED; + } /* Store Ue mapping */ - duCb.ueCcchCtxt[duCb.numUe].gnbDuUeF1apId = gnbDuUeF1apId; + duCb.ueCcchCtxt[duCb.numUe].gnbDuUeF1apId = (uint32_t)gnbDuUeF1apId; duCb.ueCcchCtxt[duCb.numUe].crnti = ulCcchIndInfo->crnti; duCb.ueCcchCtxt[duCb.numUe].cellId = ulCcchIndInfo->cellId; @@ -591,7 +647,7 @@ void fillDefaultInitDlBwp(InitialDlBwp *initDlBwp) coreset1StartPrb = coreset0EndPrb +6; coreset1NumPrb = CORESET1_NUM_PRB; /* calculate the PRBs */ - freqDomRscAllocType0(((coreset1StartPrb)/6), (coreset1NumPrb/6), freqDomainResource); + fillCoresetFeqDomAllocMap(((coreset1StartPrb)/6), (coreset1NumPrb/6), freqDomainResource); memcpy(initDlBwp->pdcchCfg.cRSetToAddModList[idx].freqDomainRsrc, freqDomainResource, FREQ_DOM_RSRC_SIZE); @@ -691,17 +747,25 @@ void fillDefaultInitUlBwp(InitialUlBwp *initUlBwp) initUlBwp->puschCfg.dmrsUlCfgForPuschMapTypeA.transPrecodDisabled. \ scramblingId0 = SCRAMBLING_ID; initUlBwp->puschCfg.resourceAllocType = RESOURCEALLOCATION_TYPE1; - initUlBwp->puschCfg.numTimeDomRsrcAlloc = 1; + initUlBwp->puschCfg.numTimeDomRsrcAlloc = 2; idx = 0; if(initUlBwp->puschCfg.numTimeDomRsrcAlloc <= MAX_NUM_UL_ALLOC) { - initUlBwp->puschCfg.timeDomRsrcAllocList[idx].k2 = PUSCH_K2; + initUlBwp->puschCfg.timeDomRsrcAllocList[idx].k2 = PUSCH_K2_CFG1; initUlBwp->puschCfg.timeDomRsrcAllocList[idx].mappingType =\ MAPPING_TYPEA; initUlBwp->puschCfg.timeDomRsrcAllocList[idx].startSymbol = PUSCH_START_SYMBOL; initUlBwp->puschCfg.timeDomRsrcAllocList[idx].symbolLength = PUSCH_LENGTH_SYMBOL; initUlBwp->puschCfg.timeDomRsrcAllocList[idx].startSymbolAndLength =\ calcSliv(PUSCH_START_SYMBOL, PUSCH_LENGTH_SYMBOL); + + idx++; + initUlBwp->puschCfg.timeDomRsrcAllocList[idx].k2 = PUSCH_K2_CFG2; + initUlBwp->puschCfg.timeDomRsrcAllocList[idx].mappingType = MAPPING_TYPEA; + initUlBwp->puschCfg.timeDomRsrcAllocList[idx].startSymbol = PUSCH_START_SYMBOL; + initUlBwp->puschCfg.timeDomRsrcAllocList[idx].symbolLength = PUSCH_LENGTH_SYMBOL; + initUlBwp->puschCfg.timeDomRsrcAllocList[idx].startSymbolAndLength =\ + calcSliv(PUSCH_START_SYMBOL, PUSCH_LENGTH_SYMBOL); } initUlBwp->puschCfg.transformPrecoder = TRANSFORM_PRECODER_DISABLED; } @@ -722,14 +786,21 @@ void fillDefaultInitUlBwp(InitialUlBwp *initUlBwp) * * Functionality: Fills Sp Cell Group Info * - * @params[in] SpCellCfg *spCell + * @params[in] MacUeCfg *macUeCfg * @return void * *****************************************************************/ -void fillDefaultSpCellGrpInfo(SpCellCfg *spCell) +void fillDefaultSpCellGrpInfo(MacUeCfg *macUeCfg) { + SpCellCfg *spCell = NULL; + + if(macUeCfg) + spCell = &macUeCfg->spCellCfg; + if(spCell) { + macUeCfg->spCellCfgPres = true; + spCell->servCellIdx = SERV_CELL_IDX; /* Filling Initial Dl Bwp */ fillDefaultInitDlBwp(&spCell->servCellCfg.initDlBwp); @@ -765,14 +836,20 @@ void fillDefaultSpCellGrpInfo(SpCellCfg *spCell) * * Functionality: Fills Physical Cell Group Info * - * @params[in] PhyCellGrpCfg *cellGrp + * @params[in] MacUeCfg *macUeCfg * @return void * *****************************************************************/ -void fillDefaultPhyCellGrpInfo(PhyCellGrpCfg *cellGrp) +void fillDefaultPhyCellGrpInfo(MacUeCfg *macUeCfg) { + PhyCellGrpCfg *cellGrp = NULL; + + if(macUeCfg) + cellGrp = &macUeCfg->phyCellGrpCfg; + if(cellGrp) { + macUeCfg->phyCellGrpCfgPres = true; cellGrp->pdschHarqAckCodebook = PDSCH_HARQ_ACK_CODEBOOK_DYNAMIC; cellGrp->pNrFr1 = P_NR_FR1; } @@ -792,16 +869,22 @@ void fillDefaultPhyCellGrpInfo(PhyCellGrpCfg *cellGrp) * * Functionality: Fills Mac Cell Group Info * - * @params[in] MacCellGrpCfg *cellGrp + * @params[in] MacUeCfg *macUeCfg * @return void * *****************************************************************/ -void fillDefaultMacCellGrpInfo(MacCellGrpCfg *cellGrp) +void fillDefaultMacCellGrpInfo(MacUeCfg *macUeCfg) { uint8_t idx; + MacCellGrpCfg *cellGrp = NULL; + + if(macUeCfg) + cellGrp = &macUeCfg->macCellGrpCfg; if(cellGrp) { + macUeCfg->macCellGrpCfgPres = true; + /* Filling Scheduling Request Config */ cellGrp->schReqCfg.addModListCount = 1; if(cellGrp->schReqCfg.addModListCount <= MAX_NUM_SR_CFG_PER_CELL_GRP) @@ -867,11 +950,11 @@ void fillDefaultMacCellGrpInfo(MacCellGrpCfg *cellGrp) void fillDefaultModulation(MacUeCfg *ueCfg) { ueCfg->dlModInfo.modOrder = MOD_ORDER_QPSK; - ueCfg->dlModInfo.mcsIndex = SIB1_MCS; + ueCfg->dlModInfo.mcsIndex = DEFAULT_MCS; ueCfg->dlModInfo.mcsTable = MCS_TABLE_QAM64; /* Spec 38.214-Table 5.1.3.1-1 */ ueCfg->ulModInfo.modOrder = MOD_ORDER_QPSK; - ueCfg->ulModInfo.mcsIndex = SIB1_MCS; + ueCfg->ulModInfo.mcsIndex = DEFAULT_MCS; ueCfg->ulModInfo.mcsTable = MCS_TABLE_QAM64; /* Spec 38.214-Table 5.1.3.1-1 */ } @@ -914,69 +997,73 @@ void fillMacSrb1LcCfg(LcCfg *macLcCfg) * *****************************************************************/ -uint8_t fillMacLcCfgToAddMod(LcCfg *lcCfg, LcCfg *ueSetReqDb) +uint8_t fillMacLcCfgToAddMod(LcCfg *macLcCfgToSend, LcCfg *ueLcCfgDb, LcCfg *oldLcCfg, Bool toUpdate) { - uint8_t ret = ROK; - lcCfg->lcId = ueSetReqDb->lcId; - lcCfg->configType = ueSetReqDb->configType; - /* Filling DRBQOS */ - if(ueSetReqDb->drbQos) + if(!toUpdate) { - if(!lcCfg->drbQos) - { - DU_ALLOC_SHRABL_BUF(lcCfg->drbQos, sizeof(DrbQosInfo)); - if(!lcCfg->drbQos) - { - DU_LOG("\nERROR --> DU APP : Memory Alloc failed at drQos at fillMacLcCfgToAddMod()"); - return RFAILED; - } - } - if(ret == ROK) + if(macLcCfgToSend) { - memcpy(lcCfg->drbQos, ueSetReqDb->drbQos, sizeof(DrbQosInfo)); + macLcCfgToSend->lcId = ueLcCfgDb->lcId; + macLcCfgToSend->configType = ueLcCfgDb->configType; + + if(ueLcCfgDb->drbQos) + macLcCfgToSend->drbQos = ueLcCfgDb->drbQos; + else if(oldLcCfg) + macLcCfgToSend->drbQos = oldLcCfg->drbQos; + else + macLcCfgToSend->drbQos = NULL; + + if(ueLcCfgDb->snssai) + macLcCfgToSend->snssai = ueLcCfgDb->snssai; + else if(oldLcCfg) + macLcCfgToSend->snssai = oldLcCfg->snssai; + else + macLcCfgToSend->snssai = NULL; + + macLcCfgToSend->ulLcCfgPres = ueLcCfgDb->ulLcCfgPres; + memcpy(&macLcCfgToSend->ulLcCfg, &ueLcCfgDb->ulLcCfg, sizeof(UlLcCfg)); + memcpy(&macLcCfgToSend->dlLcCfg, &ueLcCfgDb->dlLcCfg, sizeof(DlLcCfg)); } } else { - lcCfg->drbQos = NULLP; - } + oldLcCfg->lcId = ueLcCfgDb->lcId; + oldLcCfg->configType = ueLcCfgDb->configType; - if(ret == ROK) - { - if(ueSetReqDb->snssai) + if(ueLcCfgDb->drbQos) { - if(!lcCfg->snssai) + if(oldLcCfg->drbQos) + DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, oldLcCfg->drbQos, sizeof(DrbQosInfo)); + + DU_ALLOC_SHRABL_BUF(oldLcCfg->drbQos, sizeof(DrbQosInfo)); + if(oldLcCfg->drbQos == NULL) { - DU_ALLOC_SHRABL_BUF(lcCfg->snssai, sizeof(Snssai)); - if(!lcCfg->snssai) - { - DU_LOG("\nERROR --> DU APP : Memory Alloc failed at snnsai at fillMacLcCfgToAddMod()"); - ret = RFAILED; - } + DU_LOG("\nERROR --> DU APP : Memory Alloc Failed at fillMacLcCfgToAddMod()"); + return RFAILED; } - if(ret == ROK) + memcpy(oldLcCfg->drbQos, ueLcCfgDb->drbQos, sizeof(DrbQosInfo)); + } + + if(ueLcCfgDb->snssai) + { + if(oldLcCfg->snssai) + DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, oldLcCfg->snssai, sizeof(Snssai)); + + DU_ALLOC_SHRABL_BUF(oldLcCfg->snssai, sizeof(Snssai)); + if(oldLcCfg->snssai == NULL) { - /* Filling SNSSAI */ - memcpy(lcCfg->snssai, ueSetReqDb->snssai, sizeof(Snssai)); + DU_LOG("\nERROR --> DU APP : Memory Alloc Failed at fillMacLcCfgToAddMod()"); + DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, oldLcCfg->drbQos, sizeof(DrbQosInfo)); + return RFAILED; } - else - { - lcCfg->snssai = NULLP; - if(lcCfg->drbQos) - { - DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, lcCfg->drbQos, sizeof(DrbQosInfo)); - lcCfg->drbQos = NULLP; - } - return ret; - } + memcpy(oldLcCfg->snssai, ueLcCfgDb->snssai, sizeof(Snssai)); } - else - lcCfg->snssai = NULLP; + + oldLcCfg->ulLcCfgPres = ueLcCfgDb->ulLcCfgPres; + memcpy(&oldLcCfg->ulLcCfg, &ueLcCfgDb->ulLcCfg, sizeof(UlLcCfg)); + memcpy(&oldLcCfg->dlLcCfg, &ueLcCfgDb->dlLcCfg, sizeof(DlLcCfg)); } - lcCfg->ulLcCfgPres = ueSetReqDb->ulLcCfgPres; - memcpy(&lcCfg->ulLcCfg, &ueSetReqDb->ulLcCfg, sizeof(UlLcCfg)); - memcpy(&lcCfg->dlLcCfg, &ueSetReqDb->dlLcCfg, sizeof(DlLcCfg)); - return ret; + return ROK; } /****************************************************************** @@ -994,26 +1081,36 @@ uint8_t fillMacLcCfgToAddMod(LcCfg *lcCfg, LcCfg *ueSetReqDb) * *****************************************************************/ -uint8_t fillAmbr(AmbrCfg **macAmbr, AmbrCfg *ueDbAmbr) +uint8_t fillAmbr(AmbrCfg **macAmbrCfgToSend, AmbrCfg *ueDbAmbr, AmbrCfg **oldMacAmbrCfg, Bool toUpdate) { - if(ueDbAmbr) + if(!toUpdate) { - if(*macAmbr == NULLP) + if(ueDbAmbr) { - DU_ALLOC_SHRABL_BUF(*macAmbr, sizeof(AmbrCfg)); - if(*macAmbr == NULLP) + *macAmbrCfgToSend = ueDbAmbr; + } + else + *macAmbrCfgToSend = *oldMacAmbrCfg; + } + else + { + if(ueDbAmbr) + { + if(*oldMacAmbrCfg) + { + DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, *oldMacAmbrCfg, sizeof(AmbrCfg)); + } + DU_ALLOC_SHRABL_BUF(*oldMacAmbrCfg, sizeof(AmbrCfg)); + if(*oldMacAmbrCfg == NULLP) { DU_LOG("\nERROR --> DU APP : Memory Alloc Failed at fillAmbr()"); return RFAILED; } + memset(*oldMacAmbrCfg, 0, sizeof(AmbrCfg)); + (*oldMacAmbrCfg)->ulBr = ueDbAmbr->ulBr; } - memset(*macAmbr, 0, sizeof(AmbrCfg)); - (*macAmbr)->ulBr = ueDbAmbr->ulBr; - } - else - { - *macAmbr = NULLP; } + return ROK; } @@ -1060,40 +1157,7 @@ uint8_t sendUeReCfgReqToMac(MacUeCfg *macUeCfg) return ret; } -/****************************************************************** - * - * @brief Function to return Drb LcId - * - * @details - * - * Function : getDrbLcId - * - * Functionality: Function to return Drb LcId - * - * Returns: lcId - SUCCESS - * RFAILED - FAILURE - *****************************************************************/ -uint8_t getDrbLcId(uint32_t *drbBitMap) -{ - uint8_t bitMask = 1, bitPos = 0; - bitPos = MIN_DRB_LCID; - - while(bitPos <= MAX_DRB_LCID) - { - if((*drbBitMap & (bitMask << bitPos)) == 0) - { - *drbBitMap = ((bitMask << bitPos)| *drbBitMap); - return bitPos; - } - else - { - bitPos++; - } - } - DU_LOG("\nERROR --> DU_APP: Max LC Reached in getDrbLcId()"); - return RFAILED; -} /****************************************************************** * @@ -1125,12 +1189,13 @@ uint8_t fillMacUeCfg(uint16_t cellId, uint8_t ueIdx, uint16_t crnti, \ macUeCfg->cellId = cellId; macUeCfg->ueIdx = ueIdx; macUeCfg->crnti = crnti; - fillDefaultMacCellGrpInfo(&macUeCfg->macCellGrpCfg); - fillDefaultPhyCellGrpInfo(&macUeCfg->phyCellGrpCfg); - fillDefaultSpCellGrpInfo(&macUeCfg->spCellCfg); + + fillDefaultMacCellGrpInfo(macUeCfg); + fillDefaultPhyCellGrpInfo(macUeCfg); + fillDefaultSpCellGrpInfo(macUeCfg); macUeCfg->ambrCfg = NULLP; - fillMacSrb1LcCfg(&macUeCfg->lcCfgList[0]); fillDefaultModulation(macUeCfg); + fillMacSrb1LcCfg(&macUeCfg->lcCfgList[0]); macUeCfg->numLcs++; } else @@ -1143,7 +1208,7 @@ uint8_t fillMacUeCfg(uint16_t cellId, uint8_t ueIdx, uint16_t crnti, \ macUeCfg->cellId = cellId; macUeCfg->ueIdx = ueIdx; macUeCfg->crnti = crnti; - ret = procUeReCfgCellInfo(macUeCfg, ueCfgDb->cellGrpCfg); + ret = procUeReCfgCellInfo(macUeCfg, duMacDb, ueCfgDb->cellGrpCfg); if(ret == ROK) { if(macUeCfg->spCellCfgPres == true) @@ -1159,7 +1224,7 @@ uint8_t fillMacUeCfg(uint16_t cellId, uint8_t ueIdx, uint16_t crnti, \ NULL, &macUeCfg->spCellCfg.servCellCfg.initUlBwp.puschCfg); } } - ret = fillAmbr(&macUeCfg->ambrCfg, ueCfgDb->ambrCfg); + ret = fillAmbr(&macUeCfg->ambrCfg, ueCfgDb->ambrCfg , &duMacDb->ambrCfg, FALSE); duFillModulationDetails(macUeCfg, duMacDb, ueCfgDb->ueNrCapability); } @@ -1181,7 +1246,8 @@ uint8_t fillMacUeCfg(uint16_t cellId, uint8_t ueIdx, uint16_t crnti, \ (ueCfgDb->macLcCfg[dbIdx].configType == CONFIG_MOD)) { ueCfgDb->macLcCfg[dbIdx].configType = CONFIG_MOD; - ret = fillMacLcCfgToAddMod(&macUeCfg->lcCfgList[dbIdx], &ueCfgDb->macLcCfg[dbIdx]); + ret = fillMacLcCfgToAddMod(&macUeCfg->lcCfgList[dbIdx], &ueCfgDb->macLcCfg[dbIdx],\ + &duMacDb->lcCfgList[lcIdx], FALSE); } } else @@ -1190,7 +1256,7 @@ uint8_t fillMacUeCfg(uint16_t cellId, uint8_t ueIdx, uint16_t crnti, \ if(!lcIdFound) { /* ADD/DEL CONFIG */ - ret = fillMacLcCfgToAddMod(&macUeCfg->lcCfgList[dbIdx], &ueCfgDb->macLcCfg[dbIdx]); + ret = fillMacLcCfgToAddMod(&macUeCfg->lcCfgList[dbIdx], &ueCfgDb->macLcCfg[dbIdx], NULL, FALSE); } if(ret == ROK) { @@ -1202,6 +1268,7 @@ uint8_t fillMacUeCfg(uint16_t cellId, uint8_t ueIdx, uint16_t crnti, \ break; } }/*End of Outer FOR loop */ + memcpy(&ueCfgDb->copyOfmacUeCfg, macUeCfg, sizeof(MacUeCfg)); } return ret; } @@ -1315,69 +1382,68 @@ void fillDefaultUmDlInfo(UmUniDirDlBearerCfg *UmDlCfg) uint8_t fillDefaultRlcModeCfg(uint8_t rlcMode, RlcBearerCfg *lcCfg) { - if(lcCfg) { switch(rlcMode) { case RLC_AM : { - if(!lcCfg->u.amCfg) - { - DU_ALLOC_SHRABL_BUF(lcCfg->u.amCfg, sizeof(AmBearerCfg)); - if(lcCfg->u.amCfg) - fillDefaultAmInfo(lcCfg->u.amCfg); - else - { - DU_LOG("\n ERROR --> DU APP : Memory Alloc failed at AmCfg at fillDefaultRlcModeCfg()"); - return RFAILED; - } - } + if(!lcCfg->u.amCfg) + { + DU_ALLOC_SHRABL_BUF(lcCfg->u.amCfg, sizeof(AmBearerCfg)); + if(lcCfg->u.amCfg) + fillDefaultAmInfo(lcCfg->u.amCfg); + else + { + DU_LOG("\n ERROR --> DU APP : Memory Alloc failed at AmCfg at fillDefaultRlcModeCfg()"); + return RFAILED; + } + } break; } case RLC_UM_BI_DIRECTIONAL : { - if(!lcCfg->u.umBiDirCfg) - { - DU_ALLOC_SHRABL_BUF(lcCfg->u.umBiDirCfg, sizeof(UmBiDirBearerCfg)); - if(lcCfg->u.umBiDirCfg) - fillDefaultUmBiInfo(lcCfg->u.umBiDirCfg); - else - { - DU_LOG("\n ERROR --> DU APP : Memory Alloc failed at UmBiDirCfg at fillDefaultRlcModeCfg()"); - return RFAILED; - } - } + if(!lcCfg->u.umBiDirCfg) + { + DU_ALLOC_SHRABL_BUF(lcCfg->u.umBiDirCfg, sizeof(UmBiDirBearerCfg)); + if(lcCfg->u.umBiDirCfg) + fillDefaultUmBiInfo(lcCfg->u.umBiDirCfg); + else + { + DU_LOG("\n ERROR --> DU APP : Memory Alloc failed at UmBiDirCfg at fillDefaultRlcModeCfg()"); + return RFAILED; + } + } break; } case RLC_UM_UNI_DIRECTIONAL_UL : { - if(!lcCfg->u.umUniDirUlCfg) - { + if(!lcCfg->u.umUniDirUlCfg) + { DU_ALLOC_SHRABL_BUF(lcCfg->u.umUniDirUlCfg, sizeof(UmUniDirUlBearerCfg)); - if(lcCfg->u.umUniDirUlCfg) - fillDefaultUmUlInfo(lcCfg->u.umUniDirUlCfg); + if(lcCfg->u.umUniDirUlCfg) + fillDefaultUmUlInfo(lcCfg->u.umUniDirUlCfg); else - { + { DU_LOG("\n ERROR --> DU APP : Memory Alloc failed at UmUniDirUlCfg at fillDefaultRlcModeCfg()"); - return RFAILED; - } - } + return RFAILED; + } + } break; } case RLC_UM_UNI_DIRECTIONAL_DL : { - if(!lcCfg->u.umUniDirDlCfg) - { + if(!lcCfg->u.umUniDirDlCfg) + { DU_ALLOC_SHRABL_BUF(lcCfg->u.umUniDirDlCfg, sizeof(UmUniDirDlBearerCfg)); if(lcCfg->u.umUniDirDlCfg) - fillDefaultUmDlInfo(lcCfg->u.umUniDirDlCfg); + fillDefaultUmDlInfo(lcCfg->u.umUniDirDlCfg); else - { + { DU_LOG("\n ERROR --> DU APP : Memory Alloc failed at UmUniDirDlCfg at fillDefaultRlcModeCfg()"); - return RFAILED; - } - } + return RFAILED; + } + } break; } default: @@ -1466,6 +1532,51 @@ uint8_t sendUeReCfgReqToRlc(RlcUeCfg *rlcUeCfg) return ret; } +/****************************************************************** + * + * @brief Fills Snssai information + * + * @details + * + * Function : fillSnssaiInfo + * + * Functionality: Fills Snssai information + * + * @params[in] LcCfg *snssaiTobeSend, LcCfg *snssaiDb, LcCfg *oldSnssai, + * Bool toUpdateg + * @return ROK - success + * RFAILED - failure + * + *****************************************************************/ +uint8_t fillSnssaiInfo(Snssai *snssaiTobeSend, Snssai *snssaiDb, Snssai **oldSnssai, Bool toUpdate) +{ + if(!toUpdate) + { + if(snssaiDb) + snssaiTobeSend = snssaiDb; + else if(oldSnssai) + snssaiTobeSend = *oldSnssai; + else + snssaiTobeSend = NULL; + } + else + { + if(snssaiDb) + { + if(*oldSnssai) + DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, *oldSnssai, sizeof(Snssai)); + + DU_ALLOC_SHRABL_BUF(*oldSnssai, sizeof(Snssai)); + if(*oldSnssai == NULL) + { + DU_LOG("\nERROR --> DU APP : Memory Alloc Failed at fillSnssaiInfo()"); + return RFAILED; + } + memcpy(*oldSnssai, snssaiDb, sizeof(Snssai)); + } + } + return ROK; +} /****************************************************************** * * @brief Fills RlcBearerCfg structure @@ -1495,7 +1606,7 @@ uint8_t fillRlcUeCfg(uint16_t cellId, uint8_t ueIdx,\ if(ret == ROK) rlcUeCfg->numLcs++; else - memset(rlcUeCfg, 0, sizeof(RlcUeCfg)); + memset(rlcUeCfg, 0, sizeof(RlcUeCfg)); } else { @@ -1527,6 +1638,8 @@ uint8_t fillRlcUeCfg(uint16_t cellId, uint8_t ueIdx,\ /* MOD */ ueCfgDb->rlcLcCfg[dbIdx].configType = CONFIG_MOD; /* update Db for MOD type */ memcpy(&rlcUeCfg->rlcLcCfg[dbIdx], &ueCfgDb->rlcLcCfg[dbIdx], sizeof(RlcBearerCfg)); + fillSnssaiInfo(rlcUeCfg->rlcLcCfg[dbIdx].snssai, ueCfgDb->rlcLcCfg[dbIdx].snssai,\ + &duRlcDb->rlcLcCfg[lcIdx].snssai,false); } } else @@ -1536,6 +1649,7 @@ uint8_t fillRlcUeCfg(uint16_t cellId, uint8_t ueIdx,\ { /* ADD/ DEL Config Type */ memcpy(&rlcUeCfg->rlcLcCfg[dbIdx], &ueCfgDb->rlcLcCfg[dbIdx], sizeof(RlcBearerCfg)); + fillSnssaiInfo(rlcUeCfg->rlcLcCfg[dbIdx].snssai, ueCfgDb->rlcLcCfg[dbIdx].snssai, NULL, false); } rlcUeCfg->numLcs++; } @@ -1595,6 +1709,7 @@ uint8_t duCreateUeCb(UeCcchCtxt *ueCcchCtxt, uint32_t gnbCuUeF1apId) duCb.actvCellLst[cellIdx]->numActvUes++; memset(ueCcchCtxt, 0, sizeof(UeCcchCtxt)); + duCb.numUe--; } } return ret; @@ -1679,9 +1794,12 @@ uint8_t duUpdateMacCfg(MacUeCfg *macUeCfg, F1UeContextSetupDb *f1UeDb) uint8_t ret, lcIdx, dbIdx, numLcs, lcDelIdx, cellIdx; MacUeCfg *oldMacUeCfg; ret = ROK; + + GET_CELL_IDX(macUeCfg->cellId, cellIdx); + oldMacUeCfg = &duCb.actvCellLst[cellIdx]->ueCb[macUeCfg->ueIdx-1].macUeCfg; /*Filling Cell Group Cfg*/ - ret = procUeReCfgCellInfo(macUeCfg, f1UeDb->duUeCfg.cellGrpCfg); + ret = procUeReCfgCellInfo(macUeCfg, &f1UeDb->duUeCfg.copyOfmacUeCfg, f1UeDb->duUeCfg.cellGrpCfg); if(ret == ROK) { if(macUeCfg->spCellCfg.servCellCfg.initDlBwp.pdschPresent) @@ -1694,10 +1812,7 @@ uint8_t duUpdateMacCfg(MacUeCfg *macUeCfg, F1UeContextSetupDb *f1UeDb) fillStartSymbolAndLen(macUeCfg->spCellCfg.servCellCfg.initUlBwp.puschCfg.numTimeDomRsrcAlloc,\ NULL, &macUeCfg->spCellCfg.servCellCfg.initUlBwp.puschCfg); } - ret = fillAmbr(&macUeCfg->ambrCfg, f1UeDb->duUeCfg.ambrCfg); - - GET_CELL_IDX(macUeCfg->cellId, cellIdx); - oldMacUeCfg = &duCb.actvCellLst[cellIdx]->ueCb[macUeCfg->ueIdx-1].macUeCfg; + ret = fillAmbr(NULL, f1UeDb->duUeCfg.ambrCfg, &oldMacUeCfg->ambrCfg, true); duFillModulationDetails(macUeCfg, oldMacUeCfg, f1UeDb->duUeCfg.ueNrCapability); } @@ -1711,7 +1826,7 @@ uint8_t duUpdateMacCfg(MacUeCfg *macUeCfg, F1UeContextSetupDb *f1UeDb) { if(f1UeDb->duUeCfg.macLcCfg[dbIdx].configType == CONFIG_MOD) { - ret = fillMacLcCfgToAddMod(&macUeCfg->lcCfgList[lcIdx],&f1UeDb->duUeCfg.macLcCfg[dbIdx]); + ret = fillMacLcCfgToAddMod(NULL, &f1UeDb->duUeCfg.macLcCfg[dbIdx], &macUeCfg->lcCfgList[lcIdx], true); } else if(f1UeDb->duUeCfg.macLcCfg[dbIdx].configType == CONFIG_DEL) { @@ -1721,7 +1836,7 @@ uint8_t duUpdateMacCfg(MacUeCfg *macUeCfg, F1UeContextSetupDb *f1UeDb) for(lcDelIdx = lcIdx; lcDelIdx < macUeCfg->numLcs; lcDelIdx++) { /* moving all elements one index ahead */ - ret = fillMacLcCfgToAddMod(&macUeCfg->lcCfgList[lcDelIdx], &macUeCfg->lcCfgList[lcDelIdx+1]); + ret = fillMacLcCfgToAddMod(NULL, &macUeCfg->lcCfgList[lcDelIdx+1], &macUeCfg->lcCfgList[lcDelIdx], true); freeMacLcCfg(&macUeCfg->lcCfgList[lcDelIdx+1]); if(ret == RFAILED) { @@ -1734,7 +1849,7 @@ uint8_t duUpdateMacCfg(MacUeCfg *macUeCfg, F1UeContextSetupDb *f1UeDb) } if(f1UeDb->duUeCfg.macLcCfg[dbIdx].configType == CONFIG_ADD) { - ret = fillMacLcCfgToAddMod(&macUeCfg->lcCfgList[numLcs], &f1UeDb->duUeCfg.macLcCfg[dbIdx]); + ret = fillMacLcCfgToAddMod(NULL, &f1UeDb->duUeCfg.macLcCfg[dbIdx], &macUeCfg->lcCfgList[numLcs], true); if(ret == RFAILED) { DU_LOG("\nERROR --> DU APP : Failed to add LC at Idx %d in duUpdateMacCfg()", numLcs); @@ -1768,71 +1883,72 @@ uint8_t fillRlcCfgToAddMod(RlcBearerCfg *lcCfg, RlcBearerCfg *f1UeDbLcCfg) lcCfg->lcId = f1UeDbLcCfg->lcId; lcCfg->lcType = f1UeDbLcCfg->lcType; lcCfg->rlcMode = f1UeDbLcCfg->rlcMode; + switch(lcCfg->rlcMode) { case RLC_AM : - { - if(!lcCfg->u.amCfg) - { - DU_ALLOC_SHRABL_BUF(lcCfg->u.amCfg, sizeof(AmBearerCfg)); + { if(!lcCfg->u.amCfg) - return RFAILED; - } - /* DL AM */ - lcCfg->u.amCfg->dlAmCfg.snLenDl = f1UeDbLcCfg->u.amCfg->dlAmCfg.snLenDl; - lcCfg->u.amCfg->dlAmCfg.pollRetxTmr = f1UeDbLcCfg->u.amCfg->dlAmCfg.pollRetxTmr; - lcCfg->u.amCfg->dlAmCfg.pollPdu = f1UeDbLcCfg->u.amCfg->dlAmCfg.pollPdu; - lcCfg->u.amCfg->dlAmCfg.pollByte = f1UeDbLcCfg->u.amCfg->dlAmCfg.pollByte; - lcCfg->u.amCfg->dlAmCfg.maxRetxTh = f1UeDbLcCfg->u.amCfg->dlAmCfg.maxRetxTh; - - /* UL AM */ - lcCfg->u.amCfg->ulAmCfg.snLenUl = f1UeDbLcCfg->u.amCfg->ulAmCfg.snLenUl; - lcCfg->u.amCfg->ulAmCfg.reAssemTmr = f1UeDbLcCfg->u.amCfg->ulAmCfg.reAssemTmr; - lcCfg->u.amCfg->ulAmCfg.statProhTmr = f1UeDbLcCfg->u.amCfg->ulAmCfg.statProhTmr; - break; - } + { + DU_ALLOC_SHRABL_BUF(lcCfg->u.amCfg, sizeof(AmBearerCfg)); + if(!lcCfg->u.amCfg) + return RFAILED; + } + /* DL AM */ + lcCfg->u.amCfg->dlAmCfg.snLenDl = f1UeDbLcCfg->u.amCfg->dlAmCfg.snLenDl; + lcCfg->u.amCfg->dlAmCfg.pollRetxTmr = f1UeDbLcCfg->u.amCfg->dlAmCfg.pollRetxTmr; + lcCfg->u.amCfg->dlAmCfg.pollPdu = f1UeDbLcCfg->u.amCfg->dlAmCfg.pollPdu; + lcCfg->u.amCfg->dlAmCfg.pollByte = f1UeDbLcCfg->u.amCfg->dlAmCfg.pollByte; + lcCfg->u.amCfg->dlAmCfg.maxRetxTh = f1UeDbLcCfg->u.amCfg->dlAmCfg.maxRetxTh; + + /* UL AM */ + lcCfg->u.amCfg->ulAmCfg.snLenUl = f1UeDbLcCfg->u.amCfg->ulAmCfg.snLenUl; + lcCfg->u.amCfg->ulAmCfg.reAssemTmr = f1UeDbLcCfg->u.amCfg->ulAmCfg.reAssemTmr; + lcCfg->u.amCfg->ulAmCfg.statProhTmr = f1UeDbLcCfg->u.amCfg->ulAmCfg.statProhTmr; + break; + } case RLC_UM_BI_DIRECTIONAL : - { - if(!lcCfg->u.umBiDirCfg) - { - DU_ALLOC_SHRABL_BUF(lcCfg->u.umBiDirCfg, sizeof(UmBiDirBearerCfg)); - if(!lcCfg->u.umBiDirCfg) - return RFAILED; + { + if(!lcCfg->u.umBiDirCfg) + { + DU_ALLOC_SHRABL_BUF(lcCfg->u.umBiDirCfg, sizeof(UmBiDirBearerCfg)); + if(!lcCfg->u.umBiDirCfg) + return RFAILED; + } + /* UL UM BI DIR INFO */ + lcCfg->u.umBiDirCfg->ulUmCfg.snLenUlUm = f1UeDbLcCfg->u.umBiDirCfg->ulUmCfg.snLenUlUm; + lcCfg->u.umBiDirCfg->ulUmCfg.reAssemTmr = f1UeDbLcCfg->u.umBiDirCfg->ulUmCfg.reAssemTmr; + /* DL UM BI DIR INFO */ + lcCfg->u.umBiDirCfg->dlUmCfg.snLenDlUm = f1UeDbLcCfg->u.umBiDirCfg->dlUmCfg.snLenDlUm; + break; } - /* UL UM BI DIR INFO */ - lcCfg->u.umBiDirCfg->ulUmCfg.snLenUlUm = f1UeDbLcCfg->u.umBiDirCfg->ulUmCfg.snLenUlUm; - lcCfg->u.umBiDirCfg->ulUmCfg.reAssemTmr = f1UeDbLcCfg->u.umBiDirCfg->ulUmCfg.reAssemTmr; - /* DL UM BI DIR INFO */ - lcCfg->u.umBiDirCfg->dlUmCfg.snLenDlUm = f1UeDbLcCfg->u.umBiDirCfg->dlUmCfg.snLenDlUm; - break; - } case RLC_UM_UNI_DIRECTIONAL_UL : - { - if(!lcCfg->u.umUniDirUlCfg) - { - DU_ALLOC_SHRABL_BUF(lcCfg->u.umUniDirUlCfg, sizeof(UmUniDirUlBearerCfg)); - if(!lcCfg->u.umUniDirUlCfg) - return RFAILED; - } - lcCfg->u.umUniDirUlCfg->ulUmCfg.snLenUlUm = f1UeDbLcCfg->u.umUniDirUlCfg->ulUmCfg.snLenUlUm; - lcCfg->u.umUniDirUlCfg->ulUmCfg.reAssemTmr = f1UeDbLcCfg->u.umUniDirUlCfg->ulUmCfg.reAssemTmr; - break; + { + if(!lcCfg->u.umUniDirUlCfg) + { + DU_ALLOC_SHRABL_BUF(lcCfg->u.umUniDirUlCfg, sizeof(UmUniDirUlBearerCfg)); + if(!lcCfg->u.umUniDirUlCfg) + return RFAILED; + } + lcCfg->u.umUniDirUlCfg->ulUmCfg.snLenUlUm = f1UeDbLcCfg->u.umUniDirUlCfg->ulUmCfg.snLenUlUm; + lcCfg->u.umUniDirUlCfg->ulUmCfg.reAssemTmr = f1UeDbLcCfg->u.umUniDirUlCfg->ulUmCfg.reAssemTmr; + break; - } + } case RLC_UM_UNI_DIRECTIONAL_DL : - { - if(!lcCfg->u.umUniDirDlCfg) - { - DU_ALLOC_SHRABL_BUF(lcCfg->u.umUniDirDlCfg, sizeof(UmUniDirDlBearerCfg)); - if(!lcCfg->u.umUniDirDlCfg) - return RFAILED; + { + if(!lcCfg->u.umUniDirDlCfg) + { + DU_ALLOC_SHRABL_BUF(lcCfg->u.umUniDirDlCfg, sizeof(UmUniDirDlBearerCfg)); + if(!lcCfg->u.umUniDirDlCfg) + return RFAILED; + } + lcCfg->u.umUniDirDlCfg->dlUmCfg.snLenDlUm = f1UeDbLcCfg->u.umUniDirDlCfg->dlUmCfg.snLenDlUm; + break; } - lcCfg->u.umUniDirDlCfg->dlUmCfg.snLenDlUm = f1UeDbLcCfg->u.umUniDirDlCfg->dlUmCfg.snLenDlUm; - break; - } default: DU_LOG("\nERROR --> DU_APP: Invalid Rlc Mode %d at fillRlcCfgToAddMod()", lcCfg->rlcMode); - return RFAILED; + return RFAILED; } return ROK; } @@ -1863,41 +1979,52 @@ uint8_t duUpdateRlcLcCfg(RlcUeCfg *rlcUeCfg, F1UeContextSetupDb *f1UeDb) numLcs = rlcUeCfg->numLcs; for(lcIdx = 0; lcIdx < numLcs; lcIdx++) { - if(f1UeDb->duUeCfg.rlcLcCfg[dbIdx].lcId == rlcUeCfg->rlcLcCfg[lcIdx].lcId) - { - if(f1UeDb->duUeCfg.rlcLcCfg[dbIdx].configType == CONFIG_MOD) - { - ret = fillRlcCfgToAddMod(&rlcUeCfg->rlcLcCfg[lcIdx], &f1UeDb->duUeCfg.rlcLcCfg[dbIdx]); - } - else if(f1UeDb->duUeCfg.rlcLcCfg[dbIdx].configType == CONFIG_DEL) - { - /* Free memory at matched lcIdx index */ - freeRlcLcCfg(&rlcUeCfg->rlcLcCfg[lcIdx]); - rlcUeCfg->numLcs--; - for(lcDelIdx = lcIdx; lcDelIdx < rlcUeCfg->numLcs; lcDelIdx++) - { - ret = fillRlcCfgToAddMod(&rlcUeCfg->rlcLcCfg[lcDelIdx], &rlcUeCfg->rlcLcCfg[lcDelIdx+1]); - freeRlcLcCfg(&rlcUeCfg->rlcLcCfg[lcDelIdx+1]); - if(ret == RFAILED) - { + if(f1UeDb->duUeCfg.rlcLcCfg[dbIdx].lcId == rlcUeCfg->rlcLcCfg[lcIdx].lcId) + { + if(f1UeDb->duUeCfg.rlcLcCfg[dbIdx].configType == CONFIG_MOD) + { + ret = fillRlcCfgToAddMod(&rlcUeCfg->rlcLcCfg[lcIdx], &f1UeDb->duUeCfg.rlcLcCfg[dbIdx]); + if(ret == RFAILED) + { + DU_LOG("\nERROR --> DU APP : Failed to modify LC at Idx %d in duUpdateRlcCfg()", lcDelIdx); + break; + } + fillSnssaiInfo(NULL, f1UeDb->duUeCfg.rlcLcCfg[dbIdx].snssai, &rlcUeCfg->rlcLcCfg[lcIdx].snssai, true); + } + else if(f1UeDb->duUeCfg.rlcLcCfg[dbIdx].configType == CONFIG_DEL) + { + /* Free memory at matched lcIdx index */ + freeRlcLcCfg(&rlcUeCfg->rlcLcCfg[lcIdx]); + rlcUeCfg->numLcs--; + for(lcDelIdx = lcIdx; lcDelIdx < rlcUeCfg->numLcs; lcDelIdx++) + { + ret = fillRlcCfgToAddMod(&rlcUeCfg->rlcLcCfg[lcDelIdx], &rlcUeCfg->rlcLcCfg[lcDelIdx+1]); + fillSnssaiInfo(NULL, rlcUeCfg->rlcLcCfg[lcDelIdx+1].snssai, &rlcUeCfg->rlcLcCfg[lcDelIdx].snssai,\ + true); + freeRlcLcCfg(&rlcUeCfg->rlcLcCfg[lcDelIdx+1]); + if(ret == RFAILED) + { DU_LOG("\nERROR --> DU APP : Failed to delete LC at Idx %d in duUpdateRlcCfg()", lcDelIdx); - break; - } - } - } - } + break; + } + } + } + } } if(f1UeDb->duUeCfg.rlcLcCfg[dbIdx].configType == CONFIG_ADD) { - ret = fillRlcCfgToAddMod(&rlcUeCfg->rlcLcCfg[lcIdx], &f1UeDb->duUeCfg.rlcLcCfg[dbIdx]); - if(ret == ROK) - rlcUeCfg->numLcs++; + ret = fillRlcCfgToAddMod(&rlcUeCfg->rlcLcCfg[lcIdx], &f1UeDb->duUeCfg.rlcLcCfg[dbIdx]); + if(ret == ROK) + { + fillSnssaiInfo(NULL, f1UeDb->duUeCfg.rlcLcCfg[dbIdx].snssai, &rlcUeCfg->rlcLcCfg[ rlcUeCfg->numLcs].snssai,\ + true); + rlcUeCfg->numLcs++; + } } } return ret; } - /******************************************************************* * * @brief Function to fill Tunnel Config to Add/Mod @@ -1917,6 +2044,12 @@ uint8_t duUpdateRlcLcCfg(RlcUeCfg *rlcUeCfg, F1UeContextSetupDb *f1UeDb) * ****************************************************************/ uint8_t fillTnlCfgToAddMod(UpTnlCfg **ueCbTnlCfg, UpTnlCfg *f1TnlCfg) { + if(*ueCbTnlCfg) + { + DU_FREE((*ueCbTnlCfg)->tnlCfg1, sizeof(GtpTnlCfg)); + DU_FREE(*ueCbTnlCfg, sizeof(UpTnlCfg)); + } + if(*ueCbTnlCfg == NULLP) { /* copying to DuCb Tnl Cfg */ @@ -1981,40 +2114,43 @@ uint8_t duProcEgtpTunnelCfg(uint8_t ueCbIdx, UpTnlCfg *duTnlCfg, UpTnlCfg *f1Tnl { if(duSendEgtpTnlMgmtReq(EGTP_TNL_MGMT_ADD, NULLP, f1TnlCfg->tnlCfg1) == ROK) { - if(fillTnlCfgToAddMod(&duCb.upTnlCfg[duCb.numDrb], f1TnlCfg) == ROK) - { - duCb.numDrb++; - ret = ROK; - } + if(fillTnlCfgToAddMod(&duCb.upTnlCfg[duCb.numDrb], f1TnlCfg) == ROK) + { + duCb.numDrb++; + ret = ROK; + } } } else if(f1TnlCfg->configType == CONFIG_MOD) { if(duSendEgtpTnlMgmtReq(EGTP_TNL_MGMT_MOD, duTnlCfg->tnlCfg1->teId, f1TnlCfg->tnlCfg1) == ROK) { - if(fillTnlCfgToAddMod(&duTnlCfg, f1TnlCfg) == ROK) - { - ret = ROK; - } + if(fillTnlCfgToAddMod(&duTnlCfg, f1TnlCfg) == ROK) + { + ret = ROK; + } } } else if(f1TnlCfg->configType == CONFIG_DEL) { if(duSendEgtpTnlMgmtReq(EGTP_TNL_MGMT_DEL, duTnlCfg->tnlCfg1->teId, f1TnlCfg->tnlCfg1) == ROK) { - /* Free memory at drbIdx */ - DU_FREE(duTnlCfg->tnlCfg1, sizeof(GtpTnlCfg)); - DU_FREE(duTnlCfg, sizeof(UpTnlCfg)); - duCb.numDrb--; - for(delIdx = ueCbIdx; delIdx < duCb.numDrb; delIdx++) - { - /* moving all elements one index ahead */ - ret = fillTnlCfgToAddMod(&duCb.upTnlCfg[delIdx], duCb.upTnlCfg[delIdx+1]); - if(ret != ROK) - { - return ret; - } - } + /* Free memory at drbIdx */ + duCb.numDrb--; + for(delIdx = ueCbIdx; delIdx < duCb.numDrb; delIdx++) + { + /* moving all elements one index ahead */ + ret = fillTnlCfgToAddMod(&duCb.upTnlCfg[delIdx], duCb.upTnlCfg[delIdx+1]); + if(ret != ROK) + { + return ret; + } + } + if(duCb.upTnlCfg[delIdx]) + { + DU_FREE(duCb.upTnlCfg[delIdx]->tnlCfg1, sizeof(GtpTnlCfg)); + DU_FREE(duCb.upTnlCfg[delIdx], sizeof(UpTnlCfg)); + } } } return ret; @@ -2052,29 +2188,31 @@ uint8_t duUpdateTunnelCfgDb(uint8_t ueIdx, uint8_t cellId, DuUeCfg *duUeCfg) duUeCfg->upTnlInfo[drbIdx].ueIdx = ueIdx; for(duCbDrbIdx = 0; duCbDrbIdx < duCb.numDrb; duCbDrbIdx++) { - if(duCb.upTnlCfg[duCbDrbIdx]->drbId == duUeCfg->upTnlInfo[drbIdx].drbId) - { - drbFound = true; /* existing DRB */ - if(duProcEgtpTunnelCfg(duCbDrbIdx, duCb.upTnlCfg[duCbDrbIdx], &duUeCfg->upTnlInfo[drbIdx]) != ROK) - { - DU_LOG("\nERROR -> DU_APP : duUpdateTunnelCfgDb: Failed to modify tunnel req for Drb id[%d]", - duUeCfg->upTnlInfo[drbIdx].drbId); - ret = RFAILED; - } - break; - } - else - drbFound = false; + if((duCb.upTnlCfg[duCbDrbIdx]->ueIdx == duUeCfg->upTnlInfo[drbIdx].ueIdx) && \ + (duCb.upTnlCfg[duCbDrbIdx]->drbId == duUeCfg->upTnlInfo[drbIdx].drbId)) + { + drbFound = true; /* existing DRB */ + if(duProcEgtpTunnelCfg(duCbDrbIdx, duCb.upTnlCfg[duCbDrbIdx], &duUeCfg->upTnlInfo[drbIdx]) != ROK) + { + DU_LOG("\nERROR -> DU_APP : duUpdateTunnelCfgDb: Failed to modify tunnel req for Drb id[%d]", + duUeCfg->upTnlInfo[drbIdx].drbId); + ret = RFAILED; + } + break; + } + else + drbFound = false; } + if(!drbFound && ret == ROK)/* new DRB to Add */ { - if(duProcEgtpTunnelCfg(NULLP, NULLP, &duUeCfg->upTnlInfo[drbIdx]) != ROK) - { + if(duProcEgtpTunnelCfg(NULLP, NULLP, &duUeCfg->upTnlInfo[drbIdx]) != ROK) + { DU_LOG("\nERROR -> DU_APP : duUpdateTunnelCfgDb: Failed to add tunnel req for Drb id[%d]", - duUeCfg->upTnlInfo[drbIdx].drbId); - ret = RFAILED; - break; - } + duUeCfg->upTnlInfo[drbIdx].drbId); + ret = RFAILED; + break; + } } else break; @@ -2132,7 +2270,7 @@ uint8_t duUpdateDuUeCbCfg(uint8_t ueIdx, uint8_t cellId) if(duUpdateTunnelCfgDb(ueIdx, cellId, &ueCb->f1UeDb->duUeCfg) != ROK) { DU_LOG("\nERROR --> DU_APP : Failed to establish tunnel in duUpdateDuUeCbCfg()"); - return RFAILED; + return RFAILED; } } } @@ -2180,7 +2318,7 @@ uint8_t DuProcMacUeCfgRsp(Pst *pst, MacUeCfgRsp *cfgRsp) macUeCfg.macUeCfgState = UE_RECFG_COMPLETE; if((ret = duUpdateDuUeCbCfg(cfgRsp->ueIdx, cfgRsp->cellId)) == ROK) { - BuildAndSendUeCtxtRsp(cfgRsp->ueIdx, cfgRsp->cellId); + BuildAndSendUeCtxtRsp(cfgRsp->cellId, cfgRsp->ueIdx); } } } @@ -2301,7 +2439,7 @@ uint8_t DuProcRlcUeCfgRsp(Pst *pst, RlcUeCfgRsp *cfgRsp) rlcUeCfg.rlcUeCfgState = UE_RECFG_COMPLETE; if((ret = duUpdateDuUeCbCfg(cfgRsp->ueIdx, cfgRsp->cellId)) == ROK) { - BuildAndSendUeCtxtRsp(cfgRsp->ueIdx, cfgRsp->cellId); + BuildAndSendUeCtxtRsp(cfgRsp->cellId, cfgRsp->ueIdx); } } } @@ -2468,32 +2606,49 @@ uint8_t duBuildAndSendUeContextSetupReq(uint16_t cellId, uint16_t crnti, DuUeCfg uint8_t DuProcRlcDlRrcMsgRsp(Pst *pst, RlcDlRrcMsgRsp *dlRrcMsg) { uint8_t ret = ROK, ueIdx = 0; + uint16_t cellId, crnti; DuUeCb *ueCb = NULLP; + DlMsgState state; - if(dlRrcMsg->state == TRANSMISSION_COMPLETE) + state = dlRrcMsg->state; + cellId = dlRrcMsg->cellId; + crnti = dlRrcMsg->crnti; + DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, dlRrcMsg, sizeof(RlcDlRrcMsgRsp)); + + if(state == TRANSMISSION_COMPLETE) { - GET_UE_IDX(dlRrcMsg->crnti, ueIdx); - ueCb = &duCb.actvCellLst[dlRrcMsg->cellId -1]->ueCb[ueIdx -1]; + GET_UE_IDX(crnti, ueIdx); + ueCb = &duCb.actvCellLst[cellId -1]->ueCb[ueIdx -1]; + if(ueCb->f1UeDb && ueCb->f1UeDb->dlRrcMsgPres) { if(ueCb->f1UeDb->actionType == UE_CTXT_SETUP) { - ret = duBuildAndSendUeContextSetupReq(dlRrcMsg->cellId, dlRrcMsg->crnti, &ueCb->f1UeDb->duUeCfg); + ret = duBuildAndSendUeContextSetupReq(cellId, crnti, &ueCb->f1UeDb->duUeCfg); if(ret == RFAILED) DU_LOG("\nERROR --> DU APP : Failed to process UE Context Setup Request in DuProcRlcDlRrcMsgRsp()"); } + if(ueCb->f1UeDb->actionType == UE_CTXT_MOD) { - ret = duBuildAndSendUeContextModReq(dlRrcMsg->cellId, dlRrcMsg->crnti, &ueCb->f1UeDb->duUeCfg); + ret = duBuildAndSendUeContextModReq(cellId, crnti, &ueCb->f1UeDb->duUeCfg); if(ret == RFAILED) DU_LOG("\nERROR --> DU APP : Failed to process UE Context Mod Request in DuProcRlcDlRrcMsgRsp()"); } + + if(ueCb->f1UeDb->actionType == UE_CTXT_RELEASE && ueCb->ueState == UE_ACTIVE) + { + ret = duBuildAndSendUeDeleteReq(cellId, crnti); + if(ret == RFAILED) + { + DU_LOG("\nERROR --> DU APP : Failed to process UE Context Release Request in DuProcRlcDlRrcMsgRsp()"); + } + } } } else DU_LOG("\nERROR --> DU APP : Failed to transmit DL RRC Msg"); - DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, dlRrcMsg, sizeof(RlcDlRrcMsgRsp)); return ret; } /******************************************************************* @@ -2688,88 +2843,16 @@ void deletePdschServCellCfg(PdschServCellCfg *pdschServCellCfg) void deleteMacUeCfg(MacUeCfg *ueCfg) { - uint8_t lcCfgIdx; - uint8_t resrcIdx; - ServCellCfgInfo *servCellCfg; - PucchResrcInfo *resrcToAddModList; - - if(ueCfg) + uint8_t lcCfgIdx=0; + + DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL,ueCfg->ambrCfg, sizeof(AmbrCfg)); + if(ueCfg->spCellCfgPres) { - DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL,ueCfg->ambrCfg, sizeof(AmbrCfg)); - if(ueCfg->spCellCfgPres) - { - servCellCfg = &ueCfg->spCellCfg.servCellCfg; - DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL,servCellCfg->bwpInactivityTmr, sizeof(uint8_t)); - DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL,servCellCfg->initUlBwp.pucchCfg.resrcSet,\ - sizeof(PucchResrcSetCfg)); - if(servCellCfg->initUlBwp.pucchCfg.resrc) - { - /*freeing the PucchResrcCfg*/ - for(resrcIdx= 0; resrcIdx< servCellCfg->initUlBwp.pucchCfg.resrc->resrcToAddModListCount; resrcIdx++) - { - resrcToAddModList=&servCellCfg->initUlBwp.pucchCfg.resrc->resrcToAddModList[resrcIdx]; - switch(resrcToAddModList->pucchFormat) - { - case PUCCH_FORMAT_0: - { - DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL,resrcToAddModList->PucchFormat.format0 ,\ - sizeof(PucchFormat0)); - break; - } - case PUCCH_FORMAT_1: - { - DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL,resrcToAddModList->PucchFormat.format1 ,\ - sizeof(PucchFormat1)); - break; - } - case PUCCH_FORMAT_2: - { - DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL,resrcToAddModList->PucchFormat.format2 ,\ - sizeof(PucchFormat2_3)); - break; - } - case PUCCH_FORMAT_3: - { - DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL,resrcToAddModList->PucchFormat.format3 ,\ - sizeof(PucchFormat2_3)); - break; - } - case PUCCH_FORMAT_4: - { - DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL,resrcToAddModList->PucchFormat.format4 ,\ - sizeof(PucchFormat4)); - break; - } - } - } - DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL,servCellCfg->initUlBwp.pucchCfg.resrc,\ - sizeof(PucchResrcCfg)); - } - DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL,servCellCfg->initUlBwp.pucchCfg.format1,\ - sizeof(PucchFormatCfg)); - DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL,servCellCfg->initUlBwp.pucchCfg.format2,\ - sizeof(PucchFormatCfg)); - DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL,servCellCfg->initUlBwp.pucchCfg.format3,\ - sizeof(PucchFormatCfg)); - DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL,servCellCfg->initUlBwp.pucchCfg.format4,\ - sizeof(PucchFormatCfg)); - DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL,servCellCfg->initUlBwp.pucchCfg.schedReq,\ - sizeof(PucchSchedReqCfg)); - DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL,servCellCfg->initUlBwp.pucchCfg.multiCsiCfg,\ - sizeof(PucchMultiCsiCfg)); - DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL,servCellCfg->initUlBwp.pucchCfg.spatialInfo,\ - sizeof(PucchSpatialCfg)); - DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL,servCellCfg->initUlBwp.pucchCfg.dlDataToUlAck ,\ - sizeof(PucchDlDataToUlAck)); - DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL,servCellCfg->initUlBwp.pucchCfg.powerControl,\ - sizeof(PucchPowerControl)); - deletePdschServCellCfg(&servCellCfg->pdschServCellCfg); - } - for(lcCfgIdx=0; lcCfgIdx< ueCfg->numLcs; lcCfgIdx++) - { - DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL,ueCfg->lcCfgList[lcCfgIdx].drbQos, sizeof(DrbQosInfo)); - DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL,ueCfg->lcCfgList[lcCfgIdx].snssai, sizeof(Snssai)); - } + freeUeReCfgCellGrpInfo(ueCfg); + } + for(lcCfgIdx=0; lcCfgIdx< ueCfg->numLcs; lcCfgIdx++) + { + freeMacLcCfg(&ueCfg->lcCfgList[lcCfgIdx]); } memset(ueCfg, 0, sizeof(MacUeCfg)); } @@ -2791,7 +2874,9 @@ void deleteMacUeCfg(MacUeCfg *ueCfg) * ****************************************************************/ uint8_t deleteUeCfg(uint16_t cellIdx, uint8_t ueIdx) { + uint8_t tnlIdx = 0; DuUeCb *ueCb = NULLP; + if(duCb.actvCellLst[cellIdx] != NULLP) { if((duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].macUeCfg.macUeCfgState == UE_DELETE_COMPLETE)\ @@ -2804,18 +2889,27 @@ uint8_t deleteUeCfg(uint16_t cellIdx, uint8_t ueIdx) { freeF1UeDb(ueCb->f1UeDb); } + for(tnlIdx = 0; tnlIdx < duCb.numDrb; ) + { + if(duCb.upTnlCfg[tnlIdx]->ueIdx == ueIdx) + { + duCb.upTnlCfg[tnlIdx]->configType = CONFIG_DEL; + duProcEgtpTunnelCfg(tnlIdx, duCb.upTnlCfg[tnlIdx], duCb.upTnlCfg[tnlIdx]); + } + else + tnlIdx++; + } duCb.actvCellLst[cellIdx]->numActvUes--; memset(ueCb, 0, sizeof(DuUeCb)); } else { - DU_LOG("INFO --> DU APP : deleteUeCfg(): MAC or RLC UE configuration state not UE_DELETE_COMPLETE"); return RFAILED; } } else { - DU_LOG("ERROR --> DU APP : deleteUeCfg(): CellIdx[%d] is not found", cellIdx); + DU_LOG("\nERROR --> DU APP : deleteUeCfg(): CellIdx[%d] is not found", cellIdx); return RFAILED; } return ROK; @@ -2840,36 +2934,37 @@ uint8_t deleteUeCfg(uint16_t cellIdx, uint8_t ueIdx) uint8_t DuProcMacUeDeleteRsp(Pst *pst, MacUeDeleteRsp *deleteRsp) { - uint8_t ueIdx = 0,ret =ROK; + uint8_t ret =ROK,ueId=0; uint16_t cellIdx=0; - uint32_t gnbCuUeF1apId=0, gnbDuUeF1apId =0; - + uint32_t gnbCuUeF1apId =0 , gnbDuUeF1apId =0; + if(deleteRsp) { if(deleteRsp->result == SUCCESS) { - DU_LOG("\nINFO --> DU APP : MAC UE Delete Response : SUCCESS [UE IDX : %d]", deleteRsp->ueIdx); + DU_LOG("\nINFO --> DU APP : MAC UE Delete Response : SUCCESS [UE IDX : %d]", deleteRsp->ueId); GET_CELL_IDX(deleteRsp->cellId, cellIdx); - ueIdx = deleteRsp->ueIdx; if(duCb.actvCellLst[cellIdx]) { - duCb.actvCellLst[cellIdx]->ueCb[deleteRsp->ueIdx -1].macUeCfg.macUeCfgState = UE_DELETE_COMPLETE; - gnbCuUeF1apId = duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].gnbDuUeF1apId; - gnbDuUeF1apId = duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].gnbCuUeF1apId; - if(deleteUeCfg(cellIdx, ueIdx) == ROK) + duCb.actvCellLst[cellIdx]->ueCb[deleteRsp->ueId -1].macUeCfg.macUeCfgState = UE_DELETE_COMPLETE; + ueId = deleteRsp->ueId; + gnbCuUeF1apId = duCb.actvCellLst[cellIdx]->ueCb[ueId-1].gnbDuUeF1apId; + gnbDuUeF1apId = duCb.actvCellLst[cellIdx]->ueCb[ueId-1].gnbCuUeF1apId; + if(deleteUeCfg(cellIdx, ueId) == ROK) { - ret = BuildAndSendUeContextReleaseComplete(gnbCuUeF1apId, gnbDuUeF1apId); - if(ret !=ROK) - { - DU_LOG("\nERROR --> DU APP : DuProcMacUeDeleteRsp(): failed to send UE context release complete"); - } + ret = BuildAndSendUeContextReleaseComplete(deleteRsp->cellId, gnbCuUeF1apId, gnbDuUeF1apId); + if(ret != ROK) + { + DU_LOG("\nERROR --> DU APP : DuProcMacUeDeleteRsp(): failed to send UE context release complete"); + } } + } } else { DU_LOG("\nERROR --> DU APP : DuProcMacUeDeleteRsp(): MAC UE Delete Response : FAILURE [UE IDX : %d]",\ - deleteRsp->ueIdx); + deleteRsp->ueId); ret = RFAILED; } DU_FREE_SHRABL_BUF(pst->region, pst->pool, deleteRsp, sizeof(MacUeDeleteRsp)); @@ -2902,36 +2997,32 @@ uint8_t DuProcMacUeDeleteRsp(Pst *pst, MacUeDeleteRsp *deleteRsp) uint8_t DuProcRlcUeDeleteRsp(Pst *pst, RlcUeDeleteRsp *delRsp) { - uint8_t ueIdx = 0, ret = ROK; - uint16_t cellIdx = 0; - uint32_t gnbCuUeF1apId=0, gnbDuUeF1apId =0; + uint8_t ueId = 0, ret = ROK; + uint16_t cellIdx = 0,crnti=0; if(delRsp) { - ueIdx = delRsp->ueIdx; + ueId = delRsp->ueId; GET_CELL_IDX(delRsp->cellId, cellIdx); if(delRsp->result == SUCCESSFUL) { - DU_LOG("\nINFO --> DU_APP: RLC UE Delete Response : SUCCESS [UE IDX:%d]", ueIdx); + DU_LOG("\nINFO --> DU_APP: RLC UE Delete Response : SUCCESS [UE IDX:%d]", ueId); if(duCb.actvCellLst[cellIdx]!=NULLP) { - duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].rlcUeCfg.rlcUeCfgState = UE_DELETE_COMPLETE; - gnbCuUeF1apId = duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].gnbDuUeF1apId; - gnbDuUeF1apId = duCb.actvCellLst[cellIdx]->ueCb[ueIdx-1].gnbCuUeF1apId; - if(deleteUeCfg(cellIdx, ueIdx) == ROK) + duCb.actvCellLst[cellIdx]->ueCb[ueId-1].rlcUeCfg.rlcUeCfgState = UE_DELETE_COMPLETE; + GET_CRNTI(crnti, ueId); + if(sendUeDeleteReqToMac(delRsp->cellId, ueId, crnti) == RFAILED) { - ret = BuildAndSendUeContextReleaseComplete(gnbCuUeF1apId, gnbDuUeF1apId); - if(ret != ROK) - { - DU_LOG("\nERROR --> DU APP : DuProcMacUeDeleteRsp(): failed to send UE context release complete"); - } + DU_LOG("\nERROR --> DU APP : duBuildAndSendUeDeleteReq(): Failed to build UE delete req for MAC "); + return RFAILED; } + } } else { - DU_LOG("\nERROR --> DU_APP: RLC UE Delete Response : FAILED [UE IDX:%d]", ueIdx); + DU_LOG("\nERROR --> DU_APP: RLC UE Delete Response : FAILED [UE IDX:%d]", ueId); ret = RFAILED; } DU_FREE_SHRABL_BUF(pst->region, pst->pool, delRsp, sizeof(RlcUeDeleteRsp)); @@ -2951,13 +3042,13 @@ uint8_t DuProcRlcUeDeleteRsp(Pst *pst, RlcUeDeleteRsp *delRsp) * Functionality: * sending UE Delete Req To Mac * -* @params[in] cellId, ueIdx, crnti +* @params[in] cellId, ueId, crnti * @return ROK - success * RFAILED - failure * *****************************************************************/ -uint8_t sendUeDeleteReqToMac(uint16_t cellId, uint8_t ueIdx, uint16_t crnti) +uint8_t sendUeDeleteReqToMac(uint16_t cellId, uint8_t ueId, uint16_t crnti) { Pst pst; uint8_t ret=ROK; @@ -2967,11 +3058,10 @@ uint8_t sendUeDeleteReqToMac(uint16_t cellId, uint8_t ueIdx, uint16_t crnti) if(ueDelete) { ueDelete->cellId = cellId; - ueDelete->ueIdx = ueIdx; + ueDelete->ueId = ueId; ueDelete->crnti = crnti; FILL_PST_DUAPP_TO_MAC(pst, EVENT_MAC_UE_DELETE_REQ); - /* Processing one Ue at a time to MAC */ DU_LOG("\nDEBUG --> DU_APP: Sending UE delete Request to MAC "); ret = (*packMacUeDeleteReqOpts[pst.selector])(&pst, ueDelete); if(ret == RFAILED) @@ -2999,13 +3089,13 @@ uint8_t sendUeDeleteReqToMac(uint16_t cellId, uint8_t ueIdx, uint16_t crnti) * Functionality: * Sending UE Delete Req To Rlc * - * @params[in] cellId, ueIdx + * @params[in] cellId, ueId * @return ROK - success * RFAILED - failure * *****************************************************************/ -uint8_t sendUeDeleteReqToRlc(uint16_t cellId, uint8_t ueIdx) +uint8_t sendUeDeleteReqToRlc(uint16_t cellId, uint8_t ueId) { uint8_t ret; Pst pst; @@ -3015,7 +3105,7 @@ uint8_t sendUeDeleteReqToRlc(uint16_t cellId, uint8_t ueIdx) if(ueDelete !=NULLP) { ueDelete->cellId = cellId; - ueDelete->ueIdx = ueIdx; + ueDelete->ueId = ueId; FILL_PST_DUAPP_TO_RLC(pst, RLC_UL_INST, EVENT_RLC_UE_DELETE_REQ); ret = (*packRlcUeDeleteReqOpts[pst.selector])(&pst, ueDelete); @@ -3039,7 +3129,7 @@ uint8_t sendUeDeleteReqToRlc(uint16_t cellId, uint8_t ueIdx) * * @details * - * Function : duProcUeDeleteReq + * Function : duBuildAndSendUeDeleteReq * * Functionality: DU processes UE delete req from CU and sends to MAC * and RLC @@ -3050,37 +3140,33 @@ uint8_t sendUeDeleteReqToRlc(uint16_t cellId, uint8_t ueIdx) * * ****************************************************************/ -uint8_t duProcUeDeleteReq(uint16_t cellId) +uint8_t duBuildAndSendUeDeleteReq(uint16_t cellId, uint16_t crnti) { - uint8_t ueIdx = 0, ueId =0; - uint16_t cellIdx = 0, crnti = 0; + uint8_t ueId =0; + uint16_t cellIdx = 0; - DU_LOG("\nDEBUG --> DU_APP: Processing UE Delete Request "); + DU_LOG("\nDEBUG --> DU_APP: Processing UE Delete Request "); GET_CELL_IDX(cellId, cellIdx); - GET_CRNTI(crnti,ueIdx); + GET_UE_IDX(crnti, ueId); if(duCb.actvCellLst[cellIdx] != NULLP) { - for(ueIdx =0;ueIdx< duCb.actvCellLst[cellIdx]->numActvUes; ueIdx++) + if(crnti != duCb.actvCellLst[cellIdx]->ueCb[ueId - 1].crnti) { - ueId = ueIdx+1; - if(sendUeDeleteReqToRlc(cellId, ueId) == RFAILED) - { - DU_LOG("\nERROR --> DU APP : duProcUeDeleteReq():Failed to build UE delete req for RLC "); - return RFAILED; - } + DU_LOG("\nERROR --> DU APP : duBuildAndSendUeDeleteReq(): CRNTI [%d] not found", crnti); + return RFAILED; + } - GET_CRNTI(crnti,ueId); - if(sendUeDeleteReqToMac(cellId, ueId, crnti) == RFAILED) - { - DU_LOG("\nERROR --> DU APP : duProcUeDeleteReq(): Failed to build UE delete req for MAC "); - return RFAILED; - } + duCb.actvCellLst[cellIdx]->ueCb[ueId - 1].ueState = UE_DELETION_IN_PROGRESS; + if(sendUeDeleteReqToRlc(cellId, ueId) == RFAILED) + { + DU_LOG("\nERROR --> DU APP : DuProcMacUeDeleteRsp():Failed to build UE delete req for RLC "); + return RFAILED; } } else { - DU_LOG("\nERROR --> DU APP : duProcUeDeleteReq(): Cell Id is not found"); + DU_LOG("\nERROR --> DU APP : duBuildAndSendUeDeleteReq(): Cell Id is not found"); return RFAILED; } @@ -3137,200 +3223,72 @@ void deleteRlcUeCfg(RlcUeCfg *ueCfg) break; } } + DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, lcCfg->snssai, sizeof(Snssai)); } memset(ueCfg, 0, sizeof(RlcUeCfg)); } } /******************************************************************* - * - * @brief Delete DU CellCb information - * - * @details - * - * Function : deleteDuCellCb - * - * Functionality: Delete DU CellCb information - * - * @params[in] DuCellCb *cellCb - * @return ROK - success - * RFAILED - failure - * - * ****************************************************************/ - -void deleteDuCellCb(DuCellCb *cellCb) -{ - - if(cellCb->duMacCellCfg) - { - if(cellCb->duMacCellCfg->prachCfg.fdm[0].unsuedRootSeq) - { - DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, cellCb->duMacCellCfg->prachCfg.fdm[0].unsuedRootSeq,\ - cellCb->duMacCellCfg->prachCfg.fdm[0].numUnusedRootSeq); - } - if(cellCb->duMacCellCfg->sib1Cfg.sib1Pdu) - { - DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL,cellCb->duMacCellCfg->sib1Cfg.sib1Pdu,\ - cellCb->duMacCellCfg->sib1Cfg.sib1PduLen); - } - DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, cellCb->duMacCellCfg, sizeof(MacCellCfg)); - } - memset(cellCb, 0, sizeof(DuCellCb)); - -} - -/******************************************************************* - * - * @brief Handle Cell delete response from MAC - * - * @details - * - * Function : DuProcMacCellDeleteRsp - * - * Functionality: Handle Cell delete response from MAC - * - * @params[in] Pointer to MacCellDeleteRsp and Pst - * @return ROK - success - * RFAILED - failure - * - * ****************************************************************/ - -uint8_t DuProcMacCellDeleteRsp(Pst *pst, MacCellDeleteRsp *deleteRsp) +* +* @brief Du process Ue Context Release Command +* +* @details +* +* Function : duProcUeContextReleaseCommand +* +* Functionality: Du process Ue Context Release Command +* +* @params[in] DuUeCb *duUeCb +* @return ROK - success +* RFAILED - failure +* +* ****************************************************************/ +uint8_t duProcUeContextReleaseCommand(DuUeCb *duUeCb) { - uint8_t ret = ROK; - uint16_t cellIdx=0; - if(deleteRsp) + uint8_t ret =ROK, ueIdx=0; + uint16_t cellId=0,crnti =0; + if(duUeCb == NULLP) { - if(deleteRsp->result == SUCCESSFUL_RSP) - { - GET_CELL_IDX(deleteRsp->cellId, cellIdx); - DU_LOG("\nINFO --> DU APP : MAC CELL Delete Response : SUCCESS [CELL IDX : %d]", deleteRsp->cellId); - if(duCb.actvCellLst[cellIdx]->cellId == deleteRsp->cellId) - { - deleteDuCellCb(duCb.actvCellLst[cellIdx]); - duCb.numActvCells--; - DU_FREE(duCb.actvCellLst[cellIdx], sizeof(DuCellCb)); - } - else - { - DU_LOG("\nERROR --> DU APP : DuProcMacCellDeleteRsp(): CellId [%d] doesnot exist", deleteRsp->cellId); - ret = RFAILED; - } - } - else - { - DU_LOG("\nERROR --> DU APP : DuProcMacCellDeleteRsp(): MAC CELL Delete Response : FAILED\ - [CELL IDX : %d]", deleteRsp->cellId); - ret = RFAILED; - } - DU_FREE_SHRABL_BUF(pst->region, pst->pool, deleteRsp, sizeof(MacUeDeleteRsp)); + DU_LOG("\nERROR --> DU APP : duProcUeContextReleaseCommand() : duUeCb is null"); + return RFAILED; } - else + if(duUeCb->f1UeDb == NULLP) { - DU_LOG("\nERROR --> DU APP : DuProcMacCellDeleteRsp(): Received MAC cell delete response is NULL"); - ret = RFAILED; + DU_LOG("\nERROR --> DU APP : duProcUeContextReleaseCommand() : f1UeDb is null"); + return RFAILED; } - return ret; -} - -/******************************************************************* - * - * @brief Sending Cell Delete Req To Mac - * - * @details - * - * Function : sendCellDeleteReqToMac - * - * Functionality: - * sending Cell Delete Req To Mac - * - * @params[in] uint16_t cellId - * @return ROK - success - * RFAILED - failure - * - * - *****************************************************************/ - -uint8_t sendCellDeleteReqToMac(uint16_t cellId) -{ - Pst pst; - uint8_t ret=ROK; - MacCellDelete *cellDelete = NULLP; - DU_ALLOC(cellDelete, sizeof(MacCellDelete)); - if(cellDelete) + cellId = duCb.actvCellLst[duUeCb->f1UeDb->cellIdx]->cellId; + crnti = duUeCb->crnti; + GET_UE_IDX(crnti, ueIdx); + + /* Send DL RRC msg for RRC release */ + if(duUeCb->f1UeDb->dlRrcMsg) { - cellDelete->cellId = cellId; - FILL_PST_DUAPP_TO_MAC(pst, EVENT_MAC_CELL_DELETE_REQ); - - DU_LOG("\nINFO --> DU APP : Sending Cell Delete Request to MAC"); - /* Processing one Cell at a time to MAC */ - ret = (*packMacCellDeleteReqOpts[pst.selector])(&pst, cellDelete); - if(ret == RFAILED) + if(duUeCb->f1UeDb->dlRrcMsg->rrcMsgPdu != NULLP) { - DU_LOG("\nERROR --> DU APP : sendCellDeleteReqToMac(): Failed to send Cell delete Req to MAC"); - DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, cellDelete, sizeof(MacCellDelete)); + ret = duBuildAndSendDlRrcMsgToRlc(cellId, duCb.actvCellLst[duUeCb->f1UeDb->cellIdx]->ueCb[ueIdx-1].rlcUeCfg,\ + duUeCb->f1UeDb->dlRrcMsg); + if(ret == RFAILED) + { + DU_LOG("\nERROR --> DU APP : duProcUeContextReleaseCommand() : Failed to send DL RRC msg"); + DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, duUeCb->f1UeDb->dlRrcMsg->rrcMsgPdu,\ + duUeCb->f1UeDb->dlRrcMsg->rrcMsgSize); + DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, duUeCb->f1UeDb->dlRrcMsg, sizeof(F1DlRrcMsg)); + } } } else { - DU_LOG("\nERROR --> DU APP : sendCellDeleteReqToMac(): Failed to allocate memory"); - ret = RFAILED; - } - return ret; -} - -/******************************************************************* - * - * @brief DU preocess Cell Delete Req to MAC - * - * @details - * - * Function : duProcCellDeleteReq - * - * Functionality: DU process Cell Delete Req to MAC - * - * @params[in] uint16_t cellId - * @return ROK - success - * RFAILED - failure - * - * ****************************************************************/ - -uint8_t duProcCellDeleteReq(uint16_t cellId) -{ - uint16_t cellIdx = 0; - - DU_LOG("\nINFO --> DU APP : Processing Cell Delete Request "); - GET_CELL_IDX(cellId, cellIdx); - - if(duCb.actvCellLst[cellIdx] != NULLP) - { - if(duBuildAndSendMacCellStop() == RFAILED) - { - DU_LOG("\nERROR --> DU APP : duProcCellDeleteReq(): Failed to process Cell delete req for cellId[%d]",cellId); - return RFAILED; - } - - if(duCb.actvCellLst[cellIdx]->numActvUes) - { - DU_LOG("\nERROR --> DU APP : duProcCellDeleteReq(): Active UEs present Failed to process cell Delete\ - Req for cellID[%d]", cellId); - return RFAILED; - } - if(sendCellDeleteReqToMac(cellId) == RFAILED) + ret = duBuildAndSendUeDeleteReq(cellId,crnti); + if(ret == RFAILED) { - DU_LOG("\nERROR --> DU APP : duProcCellDeleteReq(): Failed to build and send Cell delete req for MAC for\ - cellId[%d]",cellId); - return RFAILED; + DU_LOG("\nERROR --> DU APP : duProcUeContextReleaseCommand(): Failed to build and send Ue Delete request"); } } - else - { - DU_LOG("\nERROR --> DU APP : duProcCellDeleteReq(): CellId[%d] is not found", cellId); - return RFAILED; - } - return ROK; + return ret; } /**********************************************************************