X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Fsch_ue_mgr.c;h=097e0808cde91d645c96af998acf178f5b245850;hb=3330932565e15a749fd5dd5039cdea2862ca51cc;hp=b78ea4d0d4b81de60e6d47cf69a24734f46cfe13;hpb=2193e4cf01012809495be026097e8d7eacb9f0ac;p=o-du%2Fl2.git diff --git a/src/5gnrsch/sch_ue_mgr.c b/src/5gnrsch/sch_ue_mgr.c index b78ea4d0d..097e0808c 100644 --- a/src/5gnrsch/sch_ue_mgr.c +++ b/src/5gnrsch/sch_ue_mgr.c @@ -53,13 +53,11 @@ SchUeCfgRspFunc SchUeCfgRspOpts[] = * RFAILED - failure * * ****************************************************************/ -void SchSendUeCfgRspToMac(SchUeCfg *ueCfg, Inst inst,\ +void SchSendUeCfgRspToMac(uint16_t event, SchUeCfg *ueCfg, Inst inst,\ SchMacRsp result, SchUeCfgRsp *cfgRsp) { Pst rspPst; - DU_LOG("\nSCH: Sending UE Create response to MAC"); - cfgRsp->cellId = ueCfg->cellId; cfgRsp->crnti = ueCfg->crnti; GET_UE_IDX(ueCfg->crnti, cfgRsp->ueIdx); @@ -68,46 +66,232 @@ void SchSendUeCfgRspToMac(SchUeCfg *ueCfg, Inst inst,\ /* Filling response post */ memset(&rspPst, 0, sizeof(Pst)); FILL_PST_SCH_TO_MAC(rspPst, inst); - rspPst.event = EVENT_UE_CREATE_RSP_TO_MAC; - + if(event == EVENT_ADD_UE_CONFIG_REQ_TO_SCH) + { + rspPst.event = EVENT_UE_CONFIG_RSP_TO_MAC; + DU_LOG("\nINFO --> SCH : Sending UE Config response to MAC"); + } + else if(event == EVENT_MODIFY_UE_CONFIG_REQ_TO_SCH) + { + rspPst.event = EVENT_UE_RECONFIG_RSP_TO_MAC; + DU_LOG("\nINFO --> SCH : Sending UE Reconfig response to MAC"); + } SchUeCfgRspOpts[rspPst.selector](&rspPst, cfgRsp); } /******************************************************************* + * - * @brief Hanles Ue create request from MAC + * @brief Function to fill Dl Lc Context in SCH Ue Cb * * @details * - * Function : MacSchUeCreateReq + * Function : fillSchDlLcCtxt * - * Functionality: Hanles Ue create request from MAC + * Functionality: Function to fill Dl Lc Context in SCH Ue Cb * - * @params[in] - * @return ROK - success - * RFAILED - failure + * @params[in] SchDlLcCtxt pointer, + * SchLcCfg pointer + * @return void * * ****************************************************************/ -uint8_t MacSchUeCreateReq(Pst *pst, SchUeCfg *ueCfg) + +void fillSchDlLcCtxt(SchDlLcCtxt *ueCbLcCfg, SchLcCfg *lcCfg) { - uint8_t idx; - uint8_t lcId; - uint8_t lcIdx; - uint16_t ueIdx; - SchCellCb *cellCb; - SchUeCb *ueCb; - SchUeCfgRsp cfgRsp; - Inst inst = pst->dstInst - 1; + ueCbLcCfg->lcId = lcCfg->lcId; + ueCbLcCfg->lcp = lcCfg->dlLcCfg.lcp; + ueCbLcCfg->lcState = SCH_LC_STATE_ACTIVE; + ueCbLcCfg->bo = 0; +} - DU_LOG("\nSCH : UE Create Request for CRNTI[%d]", ueCfg->crnti); +/******************************************************************* + * + * @brief Function to fill Ul Lc Context in SCH Ue Cb + * + * @details + * + * Function : fillSchUlLcCtxt + * + * Functionality: Function to fill Ul Lc Context in SCH Ue Cb + * + * @params[in] SchUlLcCtxt pointer, + * SchLcCfg pointer + * @return void + * + * ****************************************************************/ - memset(&cfgRsp, 0, sizeof(SchUeCfgRsp)); +void fillSchUlLcCtxt(SchUlLcCtxt *ueCbLcCfg, SchLcCfg *lcCfg) +{ + ueCbLcCfg->lcId = lcCfg->lcId; + ueCbLcCfg->lcState = SCH_LC_STATE_ACTIVE; + ueCbLcCfg->priority = lcCfg->ulLcCfg.priority; + ueCbLcCfg->lcGroup = lcCfg->ulLcCfg.lcGroup; + ueCbLcCfg->schReqId = lcCfg->ulLcCfg.schReqId; + ueCbLcCfg->pbr = lcCfg->ulLcCfg.pbr; + ueCbLcCfg->bsd = lcCfg->ulLcCfg.bsd; - if(!ueCfg) +} + +/******************************************************************* + * + * @brief Function to update Sch Ul Lc Cb + * + * @details + * + * Function : updateSchUlCb + * + * Functionality: Function to update SCH Ul Lc Cb + * + * @returns void + * + * ****************************************************************/ + +void updateSchUlCb(uint8_t delIdx, SchUlCb *ulInfo) +{ + uint8_t lcIdx = 0; + + for(lcIdx = delIdx; lcIdx < ulInfo->numUlLc; lcIdx++) { - DU_LOG("\nSCH : UE create request failed"); - return RFAILED; + memcpy(&ulInfo->ulLcCtxt[lcIdx], &ulInfo->ulLcCtxt[lcIdx+1], sizeof(SchUlLcCtxt)); + memset(&ulInfo->ulLcCtxt[lcIdx+1], 0, sizeof(SchUlLcCtxt)); + } +} + +/******************************************************************* + * + * @brief Function to update SCH Dl Lc Cb + * + * @details + * + * Function : updateSchDlCb + * + * Functionality: Function to update SCH DL Lc Cb + * + * @returns void + * + * ****************************************************************/ + +void updateSchDlCb(uint8_t delIdx, SchDlCb *dlInfo) +{ + uint8_t lcIdx = 0; + + for(lcIdx = delIdx; lcIdx < dlInfo->numDlLc; lcIdx++) + { + memcpy(&dlInfo->dlLcCtxt[lcIdx], &dlInfo->dlLcCtxt[lcIdx+1], sizeof(SchDlLcCtxt)); + memset(&dlInfo->dlLcCtxt[lcIdx+1], 0, sizeof(SchDlLcCtxt)); } +} + +/******************************************************************* + * + * @brief Function to fill SchUeCb + * + * @details + * + * Function : fillSchUeCb + * + * Functionality: Function to fill SchUeCb + * + * @params[in] SchUeCb pointer, + * SchUeCfg pointer + * @return ROK/RFAILED + * + * ****************************************************************/ + +uint8_t fillSchUeCb(SchUeCb *ueCb, SchUeCfg *ueCfg) +{ + uint8_t lcIdx, ueLcIdx; + + ueCb->ueCfg.cellId = ueCfg->cellId; + ueCb->ueCfg.crnti = ueCfg->crnti; + if(ueCfg->macCellGrpCfgPres == true) + { + memcpy(&ueCb->ueCfg.macCellGrpCfg , &ueCfg->macCellGrpCfg, sizeof(SchMacCellGrpCfg)); + ueCb->ueCfg.macCellGrpCfgPres = true; + } + + if(ueCfg->phyCellGrpCfgPres == true) + { + memcpy(&ueCb->ueCfg.phyCellGrpCfg , &ueCfg->phyCellGrpCfg, sizeof(SchPhyCellGrpCfg)); + ueCb->ueCfg.phyCellGrpCfgPres = true; + } + + if(ueCfg->spCellCfgPres == true) + { + memcpy(&ueCb->ueCfg.spCellCfg , &ueCfg->spCellCfg, sizeof(SchSpCellCfg)); + ueCb->ueCfg.spCellCfgPres = true; + } + ueCb->state = SCH_UE_STATE_ACTIVE; + if(ueCfg->ambrCfg != NULLP) + { + SCH_ALLOC(ueCb->ueCfg.ambrCfg , sizeof(SchAmbrCfg)); + memcpy(&ueCb->ueCfg.ambrCfg->ulBr , &ueCfg->ambrCfg->ulBr, sizeof(SchAmbrCfg)); + } + + memcpy(&ueCb->ueCfg.dlModInfo, &ueCfg->dlModInfo , sizeof(SchModulationInfo)); + memcpy(&ueCb->ueCfg.ulModInfo, &ueCfg->ulModInfo , sizeof(SchModulationInfo)); + + //Updating SchUlCb and SchDlCb DB in SchUeCb + for(lcIdx = 0; lcIdx < ueCfg->numLcs; lcIdx++) + { + if(ueCfg->schLcCfg[lcIdx].configType == CONFIG_ADD) + { + fillSchUlLcCtxt(&ueCb->ulInfo.ulLcCtxt[ueCb->ulInfo.numUlLc], &ueCfg->schLcCfg[lcIdx]); + ueCb->ulInfo.numUlLc++; + fillSchDlLcCtxt(&ueCb->dlInfo.dlLcCtxt[ueCb->dlInfo.numDlLc], &ueCfg->schLcCfg[lcIdx]); + ueCb->dlInfo.numDlLc++; + } + else + { + for(ueLcIdx = 0; ueLcIdx < ueCb->ulInfo.numUlLc; ueLcIdx++) //searching for Lc to be Mod + { + if(ueCb->ulInfo.ulLcCtxt[ueLcIdx].lcId == ueCfg->schLcCfg[lcIdx].lcId) + { + if(ueCfg->schLcCfg[lcIdx].configType == CONFIG_MOD) + { + fillSchUlLcCtxt(&ueCb->ulInfo.ulLcCtxt[ueLcIdx], &ueCfg->schLcCfg[lcIdx]); + fillSchDlLcCtxt(&ueCb->dlInfo.dlLcCtxt[ueLcIdx], &ueCfg->schLcCfg[lcIdx]); + break; + } + if(ueCfg->schLcCfg[ueLcIdx].configType == CONFIG_DEL) + { + memset(&ueCb->ulInfo.ulLcCtxt[ueLcIdx], 0, sizeof(SchUlLcCtxt)); + ueCb->ulInfo.numUlLc--; + updateSchUlCb(ueLcIdx, &ueCb->ulInfo); //moving arr elements one idx ahead + memset(&ueCb->dlInfo.dlLcCtxt[ueLcIdx], 0, sizeof(SchDlLcCtxt)); + ueCb->dlInfo.numDlLc--; + updateSchDlCb(ueLcIdx, &ueCb->dlInfo); //moving arr elements one idx ahead + break; + } + } + }/*End of inner for loop */ + } + }/* End of outer for loop */ + return ROK; +} + +/******************************************************************* + * + * @brief Function to get SCH Cell Cb + * + * @details + * + * Function : getSchCellCb + * + * Functionality: Function to get SCH Cell Cb + * + * @params[in] event, SchUeCfg pointer + * @return schUeCb pointer - success + * NULLP - failure + * + * ****************************************************************/ + +SchCellCb *getSchCellCb(uint16_t srcEvent, Inst inst, SchUeCfg *ueCfg) +{ + uint8_t idx; + SchCellCb *cellCb = NULLP; + SchUeCfgRsp cfgRsp; + memset(&cfgRsp, 0, sizeof(SchUeCfgRsp)); /* Search of cell cb */ for(idx = 0; idx < MAX_NUM_CELL; idx++) @@ -118,18 +302,53 @@ uint8_t MacSchUeCreateReq(Pst *pst, SchUeCfg *ueCfg) } if(idx == MAX_NUM_CELL) { - DU_LOG("\nSCH : Ue create request failed. Invalid cell id %d", ueCfg->cellId); - SchSendUeCfgRspToMac(ueCfg, inst, RSP_NOK, &cfgRsp); - return ROK; + DU_LOG("\nERROR --> SCH : Ue create request failed. Invalid cell id %d", ueCfg->cellId); + SchSendUeCfgRspToMac(srcEvent, ueCfg, inst, RSP_NOK, &cfgRsp); + return NULLP; } /* Check if max number of UE configured */ if(cellCb->numActvUe > MAX_NUM_UE) { - DU_LOG("SCH : Max number of UE [%d] already configured", MAX_NUM_UE); - SchSendUeCfgRspToMac(ueCfg, inst, RSP_NOK, &cfgRsp); - return ROK; + DU_LOG("\nERROR --> SCH : Max number of UE [%d] already configured", MAX_NUM_UE); + SchSendUeCfgRspToMac(srcEvent, ueCfg, inst, RSP_NOK, &cfgRsp); + return NULLP; } + return cellCb; +} + + +/******************************************************************* + * + * @brief Function to Add Ue Config Request from MAC + * + * @details + * + * Function : MacSchAddUeConfigReq + * + * Functionality: Function to Add Ue config request from MAC + * + * @params[in] + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +uint8_t MacSchAddUeConfigReq(Pst *pst, SchUeCfg *ueCfg) +{ + uint8_t ueIdx, lcIdx, ret = ROK; + SchCellCb *cellCb = NULLP; + SchUeCb *ueCb = NULLP; + SchUeCfgRsp cfgRsp; + Inst inst = pst->dstInst - 1; + memset(&cfgRsp, 0, sizeof(SchUeCfgRsp)); + + if(!ueCfg) + { + DU_LOG("\nERROR --> SCH : Adding UE Config Request failed at MacSchAddUeConfigReq()"); + return RFAILED; + } + DU_LOG("\nDEBUG --> SCH : Adding UE Config Request for CRNTI[%d]", ueCfg->crnti); + cellCb = getSchCellCb(pst->event, inst, ueCfg); /* Search if UE already configured */ GET_UE_IDX(ueCfg->crnti, ueIdx); @@ -138,44 +357,37 @@ uint8_t MacSchUeCreateReq(Pst *pst, SchUeCfg *ueCfg) { if((ueCb->crnti == ueCfg->crnti) && (ueCb->state == SCH_UE_STATE_ACTIVE)) { - DU_LOG("\n SCH : CRNTI %d already configured ", ueCfg->crnti); - SchSendUeCfgRspToMac(ueCfg, inst, RSP_OK, &cfgRsp); + DU_LOG("\nDEBUG --> SCH : CRNTI %d already configured ", ueCfg->crnti); + SchSendUeCfgRspToMac(pst->event, ueCfg, inst, RSP_OK, &cfgRsp); return ROK; } } + else + { + DU_LOG("\nERROR --> SCH : SchUeCb not found at MacSchAddUeConfigReq() "); + SchSendUeCfgRspToMac(pst->event, ueCfg, inst, RSP_NOK, &cfgRsp); + return RFAILED; + } /* Fill received Ue Configuration in UeCb */ memset(ueCb, 0, sizeof(SchUeCb)); + GET_UE_IDX(ueCfg->crnti, ueIdx); ueCb->ueIdx = ueIdx; ueCb->crnti = ueCfg->crnti; - memcpy(&ueCb->ueCfg, ueCfg, sizeof(SchUeCfg)); ueCb->state = SCH_UE_STATE_ACTIVE; - - /* Fill SRB1 info */ - for(lcIdx = 0; lcIdx < ueCfg->numLc; lcIdx++) + ret = fillSchUeCb(ueCb, ueCfg); + if(ret == ROK) { - lcId = ueCfg->lcCfgList[lcIdx].lcId; - ueCb->dlLcCtxt[lcId].lcp = ueCfg->lcCfgList[lcIdx].dlLcCfg.lcp; - ueCb->dlLcCtxt[lcId].lcState = SCH_LC_STATE_ACTIVE; - ueCb->dlLcCtxt[lcId].bo = 0; - ueCb->numDlLc++; - - if(ueCfg->lcCfgList[lcIdx].ulLcCfg) - { - /* TODO : Fill UL LC Cfg. As of now for SRB1, it is null */ - } + cellCb->numActvUe++; + SET_ONE_BIT(ueCb->ueIdx, cellCb->actvUeBitMap); + ueCb->cellCb = cellCb; + ueCb->srRcvd = false; + for(lcIdx=0; lcIdxbsrInfo[lcIdx].dataVol = 0; + + SchSendUeCfgRspToMac(pst->event, ueCfg, inst, RSP_OK, &cfgRsp); } - - cellCb->numActvUe++; - SET_ONE_BIT(ueCb->ueIdx, cellCb->actvUeBitMap); - - ueCb->cellCb = cellCb; - ueCb->srRcvd = false; - for(idx=0; idxbsrInfo[idx].dataVol = 0; - - SchSendUeCfgRspToMac(ueCfg, inst, RSP_OK, &cfgRsp); - return ROK; + return ret; } /******************************************************************* @@ -198,22 +410,25 @@ uint8_t schFillPuschAlloc(SchUeCb *ueCb, uint16_t pdcchSlot, uint32_t dataVol, S uint16_t puschSlot = 0; uint16_t startRb = 0; uint8_t numRb = 0; - uint8_t mcs = 4; uint8_t numPdschSymbols= 14; uint16_t tbSize = 0; uint8_t buffer = 5; uint8_t idx = 0; SchCellCb *cellCb = ueCb->cellCb; SchUlSlotInfo *schUlSlotInfo = NULLP; - uint8_t k2 = ueCb->ueCfg.spCellCfg.servCellCfg.initUlBwp.puschCfg.timeDomRsrcAllocList[0].k2; - uint8_t startSymb = ueCb->ueCfg.spCellCfg.servCellCfg.initUlBwp.puschCfg.timeDomRsrcAllocList[0].startSymbol; - uint8_t symbLen = ueCb->ueCfg.spCellCfg.servCellCfg.initUlBwp.puschCfg.timeDomRsrcAllocList[0].symbolLength; - - puschSlot = (pdcchSlot + k2) % SCH_NUM_SLOTS; + uint8_t k2=0, startSymb=0 , symbLen=0; + + if(ueCb->ueCfg.spCellCfgPres == true) + { + k2 = ueCb->ueCfg.spCellCfg.servCellCfg.initUlBwp.puschCfg.timeDomRsrcAllocList[0].k2; + startSymb = ueCb->ueCfg.spCellCfg.servCellCfg.initUlBwp.puschCfg.timeDomRsrcAllocList[0].startSymbol; + symbLen = ueCb->ueCfg.spCellCfg.servCellCfg.initUlBwp.puschCfg.timeDomRsrcAllocList[0].symbolLength; + } + puschSlot = (pdcchSlot + k2) % cellCb->numSlots; startRb = cellCb->schUlSlotInfo[puschSlot]->puschCurrentPrb; tbSize = schCalcTbSize(dataVol + buffer); /* 2 bytes header + some buffer */ - numRb = schCalcNumPrb(tbSize, mcs, numPdschSymbols); + numRb = schCalcNumPrb(tbSize, ueCb->ueCfg.ulModInfo.mcsIndex, numPdschSymbols); /* increment PUSCH PRB */ cellCb->schUlSlotInfo[puschSlot]->puschCurrentPrb += numRb; @@ -225,7 +440,9 @@ uint8_t schFillPuschAlloc(SchUeCb *ueCb, uint16_t pdcchSlot, uint32_t dataVol, S puschInfo->fdAlloc.numPrb = numRb; puschInfo->tdAlloc.startSymb = startSymb; puschInfo->tdAlloc.numSymb = symbLen; - puschInfo->tbInfo.mcs = mcs; + puschInfo->tbInfo.qamOrder = ueCb->ueCfg.ulModInfo.modOrder; + puschInfo->tbInfo.mcs = ueCb->ueCfg.ulModInfo.mcsIndex; + puschInfo->tbInfo.mcsTable = ueCb->ueCfg.ulModInfo.mcsTable; puschInfo->tbInfo.ndi = 1; /* new transmission */ puschInfo->tbInfo.rv = 0; puschInfo->tbInfo.tbSize = tbSize; @@ -244,7 +461,7 @@ uint8_t schFillPuschAlloc(SchUeCb *ueCb, uint16_t pdcchSlot, uint32_t dataVol, S SCH_ALLOC(schUlSlotInfo->schPuschInfo, sizeof(SchPuschInfo)); if(!schUlSlotInfo->schPuschInfo) { - DU_LOG("SCH: Memory allocation failed in schAllocMsg3Pusch"); + DU_LOG("\nERROR --> SCH: Memory allocation failed in schAllocMsg3Pusch"); return RFAILED; } memcpy(schUlSlotInfo->schPuschInfo, puschInfo, sizeof(SchPuschInfo)); @@ -270,8 +487,14 @@ uint8_t schFillPuschAlloc(SchUeCb *ueCb, uint16_t pdcchSlot, uint32_t dataVol, S uint8_t schFillUlDci(SchUeCb *ueCb, SchPuschInfo puschInfo, DciInfo *dciInfo) { SchCellCb *cellCb = ueCb->cellCb; - SchControlRsrcSet coreset1 = ueCb->ueCfg.spCellCfg.servCellCfg.initDlBwp.pdcchCfg.cRSetToAddModList[0]; - + SchControlRsrcSet coreset1 ; + + memset(&coreset1, 0, sizeof(SchControlRsrcSet)); + if(ueCb->ueCfg.spCellCfgPres == true) + { + coreset1 = ueCb->ueCfg.spCellCfg.servCellCfg.initDlBwp.pdcchCfg.cRSetToAddModList[0]; + } + dciInfo->cellId = cellCb->cellId; dciInfo->crnti = ueCb->crnti; @@ -334,6 +557,64 @@ uint8_t schFillUlDci(SchUeCb *ueCb, SchPuschInfo puschInfo, DciInfo *dciInfo) return ROK; } +/******************************************************************* + * + * @brief Function to Modify Ue Config request from MAC + * + * @details + * + * Function : MacSchModUeConfigReq + * + * Functionality: Function to modify Ue Config request from MAC + * + * @params[in] + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +uint8_t MacSchModUeConfigReq(Pst *pst, SchUeCfg *ueCfg) +{ + uint8_t ueIdx, lcIdx, ret = ROK; + SchCellCb *cellCb = NULLP; + SchUeCb *ueCb = NULLP; + SchUeCfgRsp cfgRsp; + Inst inst = pst->dstInst - 1; + memset(&cfgRsp, 0, sizeof(SchUeCfgRsp)); + + if(!ueCfg) + { + DU_LOG("\nERROR --> SCH : Modifying Ue Config request failed at MacSchModUeConfigReq()"); + return RFAILED; + } + DU_LOG("\nDEBUG --> SCH : Modifying Ue Config Request for CRNTI[%d]", ueCfg->crnti); + cellCb = getSchCellCb(pst->event, inst, ueCfg); + + /* Search if UE already configured */ + GET_UE_IDX(ueCfg->crnti, ueIdx); + ueCb = &cellCb->ueCb[ueIdx -1]; + + if(!ueCb) + { + DU_LOG("\nERROR --> SCH : SchUeCb not found at MacSchModUeConfigReq() "); + SchSendUeCfgRspToMac(pst->event, ueCfg, inst, RSP_NOK, &cfgRsp); + return RFAILED; + } + if((ueCb->crnti == ueCfg->crnti) && (ueCb->state == SCH_UE_STATE_ACTIVE)) + { + /* Found the UeCb to Reconfig */ + ret = fillSchUeCb(ueCb, ueCfg); + if(ret == ROK) + { + ueCb->cellCb = cellCb; + ueCb->srRcvd = false; + for(lcIdx=0; lcIdxbsrInfo[lcIdx].dataVol = 0; + + SchSendUeCfgRspToMac(pst->event, ueCfg, inst, RSP_OK, &cfgRsp); + } + } + return ret; +} /********************************************************************** End of file