X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Fmac_msg_hdl.c;h=7e015afee1effc76afe8983e7e7ee470ed8088a6;hb=531da47c7bfb6ce138a454f66eb184729860beef;hp=37755d8198fd39ae87e18e9bd922bc3e8281ab0d;hpb=9940b262cb8423e9af0f6a19cc1f3f6fd61eaacd;p=o-du%2Fl2.git diff --git a/src/5gnrmac/mac_msg_hdl.c b/src/5gnrmac/mac_msg_hdl.c index 37755d819..7e015afee 100644 --- a/src/5gnrmac/mac_msg_hdl.c +++ b/src/5gnrmac/mac_msg_hdl.c @@ -32,58 +32,12 @@ #include "lwr_mac_upr_inf.h" #include "mac.h" #include "mac_utils.h" +#include "mac_harq_dl.h" /* This file contains message handling functionality for MAC */ MacCb macCb; -/* Function pointer for sending crc ind from MAC to SCH */ -MacSchCrcIndFunc macSchCrcIndOpts[]= -{ - packMacSchCrcInd, - MacSchCrcInd, - packMacSchCrcInd -}; - -/* Function pointer for sending DL RLC BO Info from MAC to SCH */ -MacSchDlRlcBoInfoFunc macSchDlRlcBoInfoOpts[]= -{ - packMacSchDlRlcBoInfo, - MacSchDlRlcBoInfo, - packMacSchDlRlcBoInfo -}; - -/* Function pointer for sending short BSR from MAC to SCH */ -MacSchBsrFunc macSchBsrOpts[]= -{ - packMacSchBsr, - MacSchBsr, - packMacSchBsr -}; - -/* Function pointer for sending SR Uci ind from MAC to SCH */ -MacSchSrUciIndFunc macSchSrUciIndOpts[]= -{ - packMacSchSrUciInd, - MacSchSrUciInd, - packMacSchSrUciInd -}; - -/* Function pointer for sending Slice cfg ind from MAC to SCH */ -MacSchSliceCfgReqFunc macSchSliceCfgReqOpts[]= -{ - packMacSchSliceCfgReq, - MacSchSliceCfgReq, - packMacSchSliceCfgReq -}; - -/* Function pointer for sending Slice cfg ind from MAC to SCH */ -MacSchSliceReCfgReqFunc macSchSliceReCfgReqOpts[]= -{ - packMacSchSliceReCfgReq, - MacSchSliceReCfgReq, - packMacSchSliceReCfgReq -}; /******************************************************************* * * @brief Sends DL BO Info to SCH @@ -105,7 +59,7 @@ uint8_t sendDlRlcBoInfoToSch(DlRlcBoInfo *dlBoInfo) Pst pst; FILL_PST_MAC_TO_SCH(pst, EVENT_DL_RLC_BO_INFO_TO_SCH); - return(*macSchDlRlcBoInfoOpts[pst.selector])(&pst, dlBoInfo); + return(SchMessageRouter(&pst, (void *)dlBoInfo)); } /******************************************************************* @@ -129,7 +83,7 @@ uint8_t sendCrcIndMacToSch(CrcIndInfo *crcInd) Pst pst; FILL_PST_MAC_TO_SCH(pst, EVENT_CRC_IND_TO_SCH); - return(*macSchCrcIndOpts[pst.selector])(&pst, crcInd); + return(SchMessageRouter(&pst, (void *)crcInd)); } /******************************************************************* @@ -186,14 +140,26 @@ uint8_t fapiMacCrcInd(Pst *pst, CrcInd *crcInd) * ****************************************************************/ uint8_t fapiMacRxDataInd(Pst *pst, RxDataInd *rxDataInd) { - uint16_t pduIdx; + uint8_t ueId = 0; + uint16_t pduIdx, cellIdx = 0; DU_LOG("\nDEBUG --> MAC : Received Rx Data indication"); /* TODO : compare the handle received in RxDataInd with handle send in PUSCH * PDU, which is stored in raCb */ for(pduIdx = 0; pduIdx < rxDataInd->numPdus; pduIdx++) { - unpackRxData(rxDataInd->cellId, rxDataInd->timingInfo, &rxDataInd->pdus[pduIdx]); + + GET_CELL_IDX(rxDataInd->cellId, cellIdx); + GET_UE_ID(rxDataInd->pdus[pduIdx].rnti, ueId); + + if(macCb.macCell[cellIdx] && macCb.macCell[cellIdx]->ueCb[ueId -1].transmissionAction == STOP_TRANSMISSION) + { + DU_LOG("\nINFO --> MAC : UL data transmission not allowed for UE %d", macCb.macCell[cellIdx]->ueCb[ueId -1].ueId); + } + else + { + unpackRxData(rxDataInd->cellId, rxDataInd->timingInfo, &rxDataInd->pdus[pduIdx]); + } MAC_FREE_SHRABL_BUF(pst->region, pst->pool, rxDataInd->pdus[pduIdx].pduData,\ rxDataInd->pdus[pduIdx].pduLength); } @@ -218,7 +184,7 @@ uint8_t fapiMacRxDataInd(Pst *pst, RxDataInd *rxDataInd) * RFAILED - failure * * ****************************************************************/ -uint8_t MacProcRlcDlData(Pst* pstInfo, RlcData *dlData) +uint8_t MacProcRlcDlData(Pst* pstInfo, RlcDlData *dlData) { uint8_t pduIdx = 0; uint8_t ueId = 0; @@ -275,6 +241,10 @@ uint8_t MacProcRlcDlData(Pst* pstInfo, RlcData *dlData) currDlSlot->dlInfo.dlMsgAlloc[ueId-1]->dlMsgSchedInfo[schInfoIdx].dlMsgInfo.dlMsgPduLen = txPduLen; currDlSlot->dlInfo.dlMsgAlloc[ueId-1]->dlMsgSchedInfo[schInfoIdx].dlMsgInfo.dlMsgPdu = txPdu; + /* Add muxed TB to DL HARQ Proc CB. This will be used if retranmission of + * TB is requested in future. */ + updateNewTbInDlHqProcCb(dlData->slotInfo, &macCb.macCell[cellIdx]->ueCb[ueId -1], \ + currDlSlot->dlInfo.dlMsgAlloc[ueId-1]->dlMsgSchedInfo[schInfoIdx].dlMsgPdschCfg.codeword[0].tbSize, txPdu); } for(lcIdx = 0; lcIdx < dlData->numLc; lcIdx++) @@ -298,7 +268,7 @@ uint8_t MacProcRlcDlData(Pst* pstInfo, RlcData *dlData) } if(pstInfo->selector == ODU_SELECTOR_LWLC) { - MAC_FREE_SHRABL_BUF(pstInfo->region, pstInfo->pool, dlData, sizeof(RlcData)); + MAC_FREE_SHRABL_BUF(pstInfo->region, pstInfo->pool, dlData, sizeof(RlcDlData)); } return ROK; } @@ -327,27 +297,22 @@ uint8_t macProcUlData(uint16_t cellId, uint16_t rnti, SlotTimingInfo slotInfo, \ uint8_t lcId, uint16_t pduLen, uint8_t *pdu) { Pst pst; - RlcData *ulData; + RlcUlData *ulData; /* Filling RLC Ul Data*/ - MAC_ALLOC_SHRABL_BUF(ulData, sizeof(RlcData)); + MAC_ALLOC_SHRABL_BUF(ulData, sizeof(RlcUlData)); if(!ulData) { DU_LOG("\nERROR --> MAC : Memory allocation failed while sending UL data to RLC"); return RFAILED; } - memset(ulData, 0, sizeof(RlcData)); + memset(ulData, 0, sizeof(RlcUlData)); ulData->cellId = cellId; ulData->rnti = rnti; memcpy(&ulData->slotInfo, &slotInfo, sizeof(SlotTimingInfo)); ulData->slotInfo.cellId = cellId; /* Filling pdu info */ - if(lcId != SRB0_LCID) - ulData->pduInfo[ulData->numPdu].commCh = false; - else - ulData->pduInfo[ulData->numPdu].commCh = true; - ulData->pduInfo[ulData->numPdu].lcId = lcId; ulData->pduInfo[ulData->numPdu].pduBuf = pdu; ulData->pduInfo[ulData->numPdu].pduLen = pduLen; @@ -439,7 +404,6 @@ uint8_t sendSchedRptToRlc(DlSchedInfo dlInfo, SlotTimingInfo slotInfo, uint8_t u { schedRpt->lcSch[lcIdx].lcId = dlInfo.dlMsgAlloc[ueIdx]->dlMsgSchedInfo[schInfoIdx].lcSchInfo[lcIdx].lcId; schedRpt->lcSch[lcIdx].bufSize = dlInfo.dlMsgAlloc[ueIdx]->dlMsgSchedInfo[schInfoIdx].lcSchInfo[lcIdx].schBytes; - schedRpt->lcSch[lcIdx].commCh = false; } } @@ -472,14 +436,14 @@ uint8_t sendSchedRptToRlc(DlSchedInfo dlInfo, SlotTimingInfo slotInfo, uint8_t u * RFAILED - failure * * ****************************************************************/ -uint8_t MacProcCellStart(Pst *pst, OduCellId *cellId) +uint8_t MacProcCellStart(Pst *pst, CellStartInfo *cellStart) { DU_LOG("\nINFO --> MAC : Handling cell start request"); gSlotCount = 0; - sendToLowerMac(START_REQUEST, 0, cellId); + sendToLowerMac(START_REQUEST, 0, cellStart); - MAC_FREE_SHRABL_BUF(pst->region, pst->pool, cellId, \ - sizeof(OduCellId)); + MAC_FREE_SHRABL_BUF(pst->region, pst->pool, cellStart, \ + sizeof(CellStartInfo)); return ROK; } @@ -501,21 +465,21 @@ uint8_t MacProcCellStart(Pst *pst, OduCellId *cellId) * RFAILED - failure * * ****************************************************************/ -uint8_t MacProcCellStop(Pst *pst, OduCellId *cellId) +uint8_t MacProcCellStop(Pst *pst, CellStopInfo *cellStop) { #ifdef INTEL_FAPI uint16_t cellIdx; DU_LOG("\nINFO --> MAC : Sending cell stop request to Lower Mac"); - GET_CELL_IDX(cellId->cellId, cellIdx); + GET_CELL_IDX(cellStop->cellId, cellIdx); if(macCb.macCell[cellIdx]) { macCb.macCell[cellIdx]->state = CELL_TO_BE_STOPPED; } #endif - MAC_FREE_SHRABL_BUF(pst->region, pst->pool, cellId, \ - sizeof(OduCellId)); + MAC_FREE_SHRABL_BUF(pst->region, pst->pool, cellStop, \ + sizeof(CellStopInfo)); return ROK; } @@ -669,7 +633,7 @@ uint8_t macProcShortBsr(uint16_t cellId, uint16_t crnti, uint8_t lcgId, uint32_t bsrInd.dataVolInfo[0].dataVol = bufferSize; FILL_PST_MAC_TO_SCH(pst, EVENT_SHORT_BSR); - return(*macSchBsrOpts[pst.selector])(&pst, &bsrInd); + return(SchMessageRouter(&pst, (void *)&bsrInd)); } /******************************************************************* @@ -711,9 +675,54 @@ uint8_t macProcLongBsr(uint16_t cellId, uint16_t crnti,uint8_t numLcg,\ memcpy(&(bsrInd.dataVolInfo[lcgIdx]), &(dataVolInfo[lcgIdx]), sizeof(DataVolInfo)); FILL_PST_MAC_TO_SCH(pst, EVENT_LONG_BSR); - return(*macSchBsrOpts[pst.selector])(&pst, &bsrInd); + return(SchMessageRouter(&pst, (void *)&bsrInd)); } +/******************************************************************* + * + * @brief Builds and send DL HARQ Indication to SCH + * + * @details + * + * Function : buildAndSendHarqInd + * + * Functionality: + * Builds and send HARQ UCI Indication to SCH + * + * @params[in] harqInfo Pointer + * crnti value + * cell Index value + * slot Ind Pointer + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +uint8_t buildAndSendHarqInd(HarqInfoF0F1 *harqInfo, uint8_t crnti, uint16_t cellIdx, SlotTimingInfo *slotInd) +{ + uint16_t harqCounter=0; + Pst pst; + DlHarqInd dlHarqInd; + memset(&pst, 0, sizeof(Pst)); + memset(&dlHarqInd, 0, sizeof(DlHarqInd)); + + dlHarqInd.cellId = macCb.macCell[cellIdx]->cellId; + dlHarqInd.crnti = crnti; + dlHarqInd.slotInd.sfn = slotInd->sfn; + dlHarqInd.slotInd.slot = slotInd->slot; + dlHarqInd.numHarq = harqInfo->numHarq; + memset(dlHarqInd.harqPayload, 0, MAX_SR_BITS_IN_BYTES); + for(harqCounter = 0; harqCounter < harqInfo->numHarq; harqCounter++) + { + dlHarqInd.harqPayload[harqCounter] = harqInfo->harqValue[harqCounter]; + } + + /* Fill Pst */ + FILL_PST_MAC_TO_SCH(pst, EVENT_DL_HARQ_IND_TO_SCH); + + return SchMessageRouter(&pst, (void *)&dlHarqInd); +} + + /******************************************************************* * * @brief Builds and send SR UCI Indication to SCH @@ -750,7 +759,7 @@ uint8_t buildAndSendSrInd(UciInd *macUciInd, uint8_t crnti) /* Fill Pst */ FILL_PST_MAC_TO_SCH(pst, EVENT_UCI_IND_TO_SCH); - return(*macSchSrUciIndOpts[pst.selector])(&pst, &srUciInd); + return(SchMessageRouter(&pst, (void *)&srUciInd)); } /******************************************************************* @@ -772,10 +781,8 @@ uint8_t buildAndSendSrInd(UciInd *macUciInd, uint8_t crnti) * ****************************************************************/ uint8_t FapiMacUciInd(Pst *pst, UciInd *macUciInd) { - uint8_t pduIdx = 0; - uint8_t ret = ROK; - uint16_t nPdus; - uint16_t crnti; + uint8_t pduIdx = 0, ret = ROK; + uint16_t nPdus = 0, crnti = 0, cellIdx = 0; if(macUciInd) { @@ -787,12 +794,19 @@ uint8_t FapiMacUciInd(Pst *pst, UciInd *macUciInd) case UCI_IND_PUSCH: break; case UCI_IND_PUCCH_F0F1: + { + { + DU_LOG("\nDEBUG --> MAC : Received HARQ UCI Indication\n"); + GET_CELL_IDX(macUciInd->cellId, cellIdx); + buildAndSendHarqInd(&macUciInd->pdus[pduIdx].uci.uciPucchF0F1.harqInfo, macUciInd->pdus[pduIdx].uci.uciPucchF0F1.crnti, cellIdx, &macUciInd->slotInd); + } if(macUciInd->pdus[pduIdx].uci.uciPucchF0F1.srInfo.srIndPres) { DU_LOG("\nDEBUG --> MAC : Received SR UCI indication"); - crnti = macUciInd->pdus[pduIdx].uci.uciPucchF0F1.crnti; - ret = buildAndSendSrInd(macUciInd, crnti); + crnti = macUciInd->pdus[pduIdx].uci.uciPucchF0F1.crnti; + ret = buildAndSendSrInd(macUciInd, crnti); } + } break; case UCI_IND_PUCCH_F2F3F4: break; @@ -831,46 +845,50 @@ uint8_t FapiMacUciInd(Pst *pst, UciInd *macUciInd) * RFAILED - failure * **********************************************************************/ - uint8_t fillSliceCfgInfo(SchSliceCfgReq *schSliceCfgReq, MacSliceCfgReq *macSliceCfgReq) - { - uint8_t cfgIdx = 0; - - if(macSliceCfgReq->listOfSliceCfg) - { - schSliceCfgReq->numOfConfiguredSlice = macSliceCfgReq->numOfConfiguredSlice; - MAC_ALLOC(schSliceCfgReq->listOfConfirguration, schSliceCfgReq->numOfConfiguredSlice *sizeof(SchRrmPolicyOfSlice*)); - if(schSliceCfgReq->listOfConfirguration == NULLP) - { - DU_LOG("\nERROR --> MAC : Memory allocation failed in fillSliceCfgInfo"); - return RFAILED; - } - for(cfgIdx = 0; cfgIdxnumOfConfiguredSlice; cfgIdx++) - { - MAC_ALLOC(schSliceCfgReq->listOfConfirguration[cfgIdx], sizeof(SchRrmPolicyOfSlice)); - if(schSliceCfgReq->listOfConfirguration[cfgIdx] == NULLP) - { - DU_LOG("\nERROR --> MAC : Memory allocation failed in fillSliceCfgInfo"); - return RFAILED; - } - - memcpy(&schSliceCfgReq->listOfConfirguration[cfgIdx]->snssai, &macSliceCfgReq->listOfSliceCfg[cfgIdx]->snssai, sizeof(Snssai)); - - if(macSliceCfgReq->listOfSliceCfg[cfgIdx]->rrmPolicyRatio) - { - MAC_ALLOC(schSliceCfgReq->listOfConfirguration[cfgIdx]->rrmPolicyRatioInfo, sizeof(SchRrmPolicyRatio)); - if(schSliceCfgReq->listOfConfirguration[cfgIdx]->rrmPolicyRatioInfo == NULLP) - { - DU_LOG("\nERROR --> MAC : Memory allocation failed in fillSliceCfgInfo"); - return RFAILED; - } - schSliceCfgReq->listOfConfirguration[cfgIdx]->rrmPolicyRatioInfo->policyMaxRatio = macSliceCfgReq->listOfSliceCfg[cfgIdx]->rrmPolicyRatio->policyMaxRatio; - schSliceCfgReq->listOfConfirguration[cfgIdx]->rrmPolicyRatioInfo->policyMinRatio = macSliceCfgReq->listOfSliceCfg[cfgIdx]->rrmPolicyRatio->policyMinRatio; - schSliceCfgReq->listOfConfirguration[cfgIdx]->rrmPolicyRatioInfo->policyDedicatedRatio = macSliceCfgReq->listOfSliceCfg[cfgIdx]->rrmPolicyRatio->policyDedicatedRatio; - } - } - } - return ROK; - } +uint8_t fillSliceCfgInfo(SchSliceCfgReq *schSliceCfgReq, MacSliceCfgReq *macSliceCfgReq) +{ + uint8_t cfgIdx = 0, memberListIdx = 0, totalSliceCfgRecvd = 0; + + if(macSliceCfgReq->listOfRrmPolicy) + { + for(cfgIdx = 0; cfgIdxnumOfRrmPolicy; cfgIdx++) + { + totalSliceCfgRecvd += macSliceCfgReq->listOfRrmPolicy[cfgIdx]->numOfRrmPolicyMem; + } + + schSliceCfgReq->numOfConfiguredSlice = totalSliceCfgRecvd; + MAC_ALLOC(schSliceCfgReq->listOfSlices, schSliceCfgReq->numOfConfiguredSlice *sizeof(SchRrmPolicyOfSlice*)); + if(schSliceCfgReq->listOfSlices == NULLP) + { + DU_LOG("\nERROR --> MAC : Memory allocation failed in fillSliceCfgInfo"); + return RFAILED; + } + for(cfgIdx = 0; cfgIdxnumOfConfiguredSlice; cfgIdx++) + { + for(memberListIdx = 0; memberListIdxlistOfRrmPolicy[cfgIdx]->numOfRrmPolicyMem; memberListIdx++) + { + if(macSliceCfgReq->listOfRrmPolicy[cfgIdx]->rRMPolicyMemberList[memberListIdx]) + { + + MAC_ALLOC(schSliceCfgReq->listOfSlices[cfgIdx], sizeof(SchRrmPolicyOfSlice)); + if(schSliceCfgReq->listOfSlices[cfgIdx] == NULLP) + { + DU_LOG("\nERROR --> MAC : Memory allocation failed in fillSliceCfgInfo"); + return RFAILED; + } + + memcpy(&schSliceCfgReq->listOfSlices[cfgIdx]->snssai, &macSliceCfgReq->listOfRrmPolicy[cfgIdx]->rRMPolicyMemberList[memberListIdx]->snssai, sizeof(Snssai)); + + schSliceCfgReq->listOfSlices[cfgIdx]->rrmPolicyRatioInfo.maxRatio = macSliceCfgReq->listOfRrmPolicy[cfgIdx]->policyRatio.maxRatio; + schSliceCfgReq->listOfSlices[cfgIdx]->rrmPolicyRatioInfo.minRatio = macSliceCfgReq->listOfRrmPolicy[cfgIdx]->policyRatio.minRatio; + schSliceCfgReq->listOfSlices[cfgIdx]->rrmPolicyRatioInfo.dedicatedRatio = macSliceCfgReq->listOfRrmPolicy[cfgIdx]->policyRatio.dedicatedRatio; + } + } + } + } + return ROK; +} + /******************************************************************* * * @brief Processes Slice Cfg Request recived from DU @@ -908,7 +926,7 @@ uint8_t MacProcSliceCfgReq(Pst *pst, MacSliceCfgReq *macSliceCfgReq) if(fillSliceCfgInfo(schSliceCfgReq, macSliceCfgReq) == ROK) { FILL_PST_MAC_TO_SCH(schPst, EVENT_SLICE_CFG_REQ_TO_SCH); - ret = (*macSchSliceCfgReqOpts[schPst.selector])(&schPst, schSliceCfgReq); + ret = SchMessageRouter(&schPst, (void *)schSliceCfgReq); } } freeMacSliceCfgReq(macSliceCfgReq, pst); @@ -926,46 +944,45 @@ uint8_t MacProcSliceCfgReq(Pst *pst, MacSliceCfgReq *macSliceCfgReq) * * @details * - * Function : MacProcSliceReCfgReq + * Function : MacProcSliceRecfgReq * * Functionality: * Processes Processes Slice ReCfg Request recived from DU * * @params[in] Post Structure Pointer - * MacSliceCfgReq *macSliceReCfgReq; + * MacSliceCfgReq *macSliceRecfgReq; * @return ROK - success * RFAILED - failure * **********************************************************************/ -uint8_t MacProcSliceReCfgReq(Pst *pst, MacSliceCfgReq *macSliceReCfgReq) +uint8_t MacProcSliceRecfgReq(Pst *pst, MacSliceRecfgReq *macSliceRecfgReq) { uint8_t ret = ROK; Pst schPst; - SchSliceCfgReq *schSliceReCfgReq; + SchSliceRecfgReq *schSliceRecfgReq; DU_LOG("\nINFO --> MAC : Received Slice ReCfg request from DU APP"); - if(macSliceReCfgReq) + if(macSliceRecfgReq) { - MAC_ALLOC(schSliceReCfgReq, sizeof(SchSliceCfgReq)); - if(schSliceReCfgReq == NULLP) + MAC_ALLOC(schSliceRecfgReq, sizeof(SchSliceRecfgReq)); + if(schSliceRecfgReq == NULLP) { - DU_LOG("\nERROR --> MAC : Memory allocation failed in MacProcSliceReCfgReq"); + DU_LOG("\nERROR --> MAC : Memory allocation failed in MacProcSliceRecfgReq"); ret = RFAILED; } else { - if(fillSliceCfgInfo(schSliceReCfgReq, macSliceReCfgReq) == ROK) + if(fillSliceCfgInfo(schSliceRecfgReq, macSliceRecfgReq) == ROK) { FILL_PST_MAC_TO_SCH(schPst, EVENT_SLICE_RECFG_REQ_TO_SCH); - ret = (*macSchSliceReCfgReqOpts[schPst.selector])(&schPst, schSliceReCfgReq); + ret = SchMessageRouter(&schPst, (void *)schSliceRecfgReq); } - } - freeMacSliceCfgReq(macSliceReCfgReq, pst); + freeMacSliceCfgReq(macSliceRecfgReq, pst); } else { - DU_LOG("\nINFO --> MAC : Received MacSliceCfgReq is NULL"); + DU_LOG("\nINFO --> MAC : Received MacSliceRecfgReq is NULL"); } return ret; }