X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Fmac_msg_hdl.c;h=bb8773092f0581bc8cb4b7124a84717d9b430561;hb=7ebfb1f80967fe83bf169c2915cedf2c9fb5cbf7;hp=8210880023b98db0744d8fbe561c35f42cc5f260;hpb=6b44407d464a5a4e060999255233a7cfe78bb0fa;p=o-du%2Fl2.git diff --git a/src/5gnrmac/mac_msg_hdl.c b/src/5gnrmac/mac_msg_hdl.c index 821088002..bb8773092 100644 --- a/src/5gnrmac/mac_msg_hdl.c +++ b/src/5gnrmac/mac_msg_hdl.c @@ -19,11 +19,10 @@ /* header include files -- defines (.h) */ #include "common_def.h" #include "lrg.h" -#include "rgu.h" #include "lrg.x" -#include "rgu.x" #include "du_app_mac_inf.h" #include "mac_sch_interface.h" +#include "rlc_mac_inf.h" #include "mac_upr_inf_api.h" #include "lwr_mac.h" #ifdef INTEL_FAPI @@ -36,10 +35,12 @@ /* This file contains message handling functionality for MAC */ -extern MacCb macCb; +MacCb macCb; -extern void sendToLowerMac(uint16_t msgType, uint32_t msgLen, void *msg); -uint16_t buildMacPdu(RlcMacData *dlData); +uint16_t buildMacPdu(RlcData *dlData); +#ifdef EGTP_TEST +void macStubBuildUlData(Buffer *mBuf); +#endif /* Function pointer for sending crc ind from MAC to SCH */ MacSchCrcIndFunc macSchCrcIndOpts[]= @@ -79,7 +80,7 @@ MacSchSrUciIndFunc macSchSrUciIndOpts[]= * * @details * - * Function : sendDlRlcBoInfoMacToSch + * Function : sendDlRlcBoInfoToSch * * Functionality: * Sends DL BO Info to SCH @@ -89,7 +90,7 @@ MacSchSrUciIndFunc macSchSrUciIndOpts[]= * RFAILED - failure * ****************************************************************/ -uint8_t sendDlRlcBoInfoMacToSch(DlRlcBOInfo *dlBoInfo) +uint8_t sendDlRlcBoInfoToSch(DlRlcBoInfo *dlBoInfo) { Pst pst; @@ -142,18 +143,17 @@ uint8_t fapiMacCrcInd(Pst *pst, CrcInd *crcInd) { uint16_t cellIdx; CrcIndInfo crcIndInfo; - - DU_LOG("\nMAC : Received CRC indication"); - + DU_LOG("\nDEBUG --> MAC : Received CRC indication"); GET_CELL_IDX(crcInd->cellId, cellIdx); /* Considering one pdu and one preamble */ - crcIndInfo.cellId = macCb.macCell[cellIdx]->cellId;; + crcIndInfo.cellId = macCb.macCell[cellIdx]->cellId; crcIndInfo.crnti = crcInd->crcInfo[0].rnti; crcIndInfo.timingInfo.sfn = crcInd->timingInfo.sfn; crcIndInfo.timingInfo.slot = crcInd->timingInfo.slot; crcIndInfo.numCrcInd = crcInd->crcInfo[0].numCb; crcIndInfo.crcInd[0] = crcInd->crcInfo[0].cbCrcStatus[0]; + MAC_FREE_SHRABL_BUF(pst->region, pst->pool, crcInd, sizeof(CrcInd)); return(sendCrcIndMacToSch(&crcIndInfo)); } @@ -177,16 +177,17 @@ uint8_t fapiMacCrcInd(Pst *pst, CrcInd *crcInd) uint8_t fapiMacRxDataInd(Pst *pst, RxDataInd *rxDataInd) { uint16_t pduIdx; - - DU_LOG("\nMAC : Received Rx Data indication"); - + 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]); + MAC_FREE_SHRABL_BUF(pst->region, pst->pool, rxDataInd->pdus[pduIdx].pduData,\ + rxDataInd->pdus[pduIdx].pduLength); } + MAC_FREE_SHRABL_BUF(pst->region, pst->pool, rxDataInd, sizeof(RxDataInd)); return ROK; } @@ -196,7 +197,7 @@ uint8_t fapiMacRxDataInd(Pst *pst, RxDataInd *rxDataInd) * * @details * - * Function : MacRlcProcDlData + * Function : MacProcRlcDlData * * Functionality: * Processes DL data from RLC @@ -207,8 +208,71 @@ uint8_t fapiMacRxDataInd(Pst *pst, RxDataInd *rxDataInd) * RFAILED - failure * * ****************************************************************/ -uint16_t MacRlcProcDlData(Pst* pst, SpId spId, RlcMacData *dlData) +uint8_t MacProcRlcDlData(Pst* pstInfo, RlcData *dlData) { + uint8_t pduIdx =0; + uint8_t lcIdx = 0; + uint8_t *txPdu =NULLP; + uint16_t tbSize =0; + MacDlData macDlData; + MacDlSlot *currDlSlot = NULLP; + DlRlcBoInfo dlBoInfo; + + memset(&macDlData , 0, sizeof(MacDlData)); + DU_LOG("\nDEBUG --> MAC: Received DL data for sfn=%d slot=%d numPdu= %d", \ + dlData->slotInfo.sfn, dlData->slotInfo.slot, dlData->numPdu); + /* Copy the pdus to be muxed into mac Dl data */ + macDlData.numPdu = dlData->numPdu; + for(pduIdx = 0; pduIdx < dlData->numPdu; pduIdx++) + { + macDlData.pduInfo[pduIdx].lcId = dlData->pduInfo[pduIdx].lcId; + macDlData.pduInfo[pduIdx].pduLen = dlData->pduInfo[pduIdx].pduLen; + macDlData.pduInfo[pduIdx].dlPdu = dlData->pduInfo[pduIdx].pduBuf; + } + + /* Store DL data in the scheduled slot */ + currDlSlot = &macCb.macCell[dlData->cellId -1]->dlSlot[dlData->slotInfo.slot]; + if(currDlSlot) + { + if(currDlSlot->dlInfo.dlMsgAlloc) + { + tbSize = currDlSlot->dlInfo.dlMsgAlloc->dlMsgPdschCfg.codeword[0].tbSize; + MAC_ALLOC(txPdu, tbSize); + if(!txPdu) + { + DU_LOG("\nERROR --> MAC : Memory allocation failed in MacProcRlcDlData"); + return RFAILED; + } + macMuxPdu(&macDlData, NULLP, txPdu, tbSize); + + currDlSlot->dlInfo.dlMsgAlloc->dlMsgInfo.dlMsgPduLen = tbSize; + currDlSlot->dlInfo.dlMsgAlloc->dlMsgInfo.dlMsgPdu = txPdu; + } + } + + for(lcIdx = 0; lcIdx < dlData->numLc; lcIdx++) + { + if(dlData->boStatus[lcIdx].bo) + { + memset(&dlBoInfo, 0, sizeof(DlRlcBoInfo)); + dlBoInfo.cellId = dlData->boStatus[lcIdx].cellId; + GET_CRNTI(dlBoInfo.crnti, dlData->boStatus[lcIdx].ueIdx); + dlBoInfo.lcId = dlData->boStatus[lcIdx].lcId; + dlBoInfo.dataVolume = dlData->boStatus[lcIdx].bo; + sendDlRlcBoInfoToSch(&dlBoInfo); + } + } + + /* Free memory */ + for(pduIdx = 0; pduIdx < dlData->numPdu; pduIdx++) + { + MAC_FREE_SHRABL_BUF(pstInfo->region, pstInfo->pool, dlData->pduInfo[pduIdx].pduBuf,\ + dlData->pduInfo[pduIdx].pduLen); + } + if(pstInfo->selector == ODU_SELECTOR_LWLC) + { + MAC_FREE_SHRABL_BUF(pstInfo->region, pstInfo->pool, dlData, sizeof(RlcData)); + } return ROK; } @@ -236,16 +300,16 @@ uint8_t macProcUlData(uint16_t cellId, uint16_t rnti, SlotIndInfo slotInfo, \ uint8_t lcId, uint16_t pduLen, uint8_t *pdu) { Pst pst; - RlcMacData *ulData; + RlcData *ulData; /* Filling RLC Ul Data*/ - MAC_ALLOC_SHRABL_BUF(ulData, sizeof(RlcMacData)); + MAC_ALLOC_SHRABL_BUF(ulData, sizeof(RlcData)); if(!ulData) { - DU_LOG("\nMAC : Memory allocation failed while sending UL data to RLC"); + DU_LOG("\nERROR --> MAC : Memory allocation failed while sending UL data to RLC"); return RFAILED; } - memset(ulData, 0, sizeof(RlcMacData)); + memset(ulData, 0, sizeof(RlcData)); ulData->cellId = cellId; ulData->rnti = rnti; memcpy(&ulData->slotInfo, &slotInfo, sizeof(SlotIndInfo)); @@ -263,7 +327,7 @@ uint8_t lcId, uint16_t pduLen, uint8_t *pdu) /* Filling Post and send to RLC */ memset(&pst, 0, sizeof(Pst)); - FILL_PST_MAC_TO_RLC(pst, 0, EVTRLCULDAT); + FILL_PST_MAC_TO_RLC(pst, 0, EVENT_UL_DATA_TO_RLC); MacSendUlDataToRlc(&pst, ulData); return ROK; @@ -276,7 +340,7 @@ uint8_t lcId, uint16_t pduLen, uint8_t *pdu) * * @details * - * Function : MacRlcProcBOStatus + * Function : MacProcRlcBOStatus * * Functionality: * Processes BO status from RLC @@ -287,11 +351,78 @@ uint8_t lcId, uint16_t pduLen, uint8_t *pdu) * RFAILED - failure * * ****************************************************************/ -uint16_t MacRlcProcBOStatus(Pst* pst, SpId spId, RlcMacBOStatus* boStatus) +uint8_t MacProcRlcBoStatus(Pst* pst, RlcBoStatus* boStatus) { + DlRlcBoInfo dlBoInfo; + + dlBoInfo.cellId = boStatus->cellId; + GET_CRNTI(dlBoInfo.crnti, boStatus->ueIdx); + dlBoInfo.lcId = boStatus->lcId; + dlBoInfo.dataVolume = boStatus->bo; + + sendDlRlcBoInfoToSch(&dlBoInfo); + + if(pst->selector == ODU_SELECTOR_LWLC) + { + MAC_FREE_SHRABL_BUF(pst->region, pst->pool, boStatus, sizeof(RlcBoStatus)); + } + return ROK; } +/******************************************************************* + * + * @brief Send LC schedule result report to RLC + * + * @details + * + * Function : sendSchRptToRlc + * + * Functionality: Send LC schedule result report to RLC + * + * @params[in] + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +uint8_t sendSchedRptToRlc(DlSchedInfo dlInfo, SlotIndInfo slotInfo) +{ + Pst pst; + uint8_t lcIdx; + RlcSchedResultRpt *schedRpt = NULLP; + + MAC_ALLOC_SHRABL_BUF(schedRpt, sizeof(RlcSchedResultRpt)); + if(!schedRpt) + { + DU_LOG("\nERROR --> MAC: Memory allocation failure in sendSchResultRepToRlc"); + return RFAILED; + } + + DU_LOG("\nDEBUG --> MAC: Send scheduled result report for sfn %d slot %d", slotInfo.sfn, slotInfo.slot); + schedRpt->cellId = dlInfo.cellId; + schedRpt->rnti = dlInfo.dlMsgAlloc->crnti; + schedRpt->numLc = dlInfo.dlMsgAlloc->numLc; + schedRpt->slotInfo.sfn = slotInfo.sfn; + schedRpt->slotInfo.slot = slotInfo.slot; + + for(lcIdx = 0; lcIdx < schedRpt->numLc; lcIdx++) + { + schedRpt->lcSch[lcIdx].lcId = dlInfo.dlMsgAlloc->lcSchInfo[lcIdx].lcId; + schedRpt->lcSch[lcIdx].bufSize = dlInfo.dlMsgAlloc->lcSchInfo[lcIdx].schBytes; + schedRpt->lcSch[lcIdx].commCh = false; + } + + /* Fill Pst */ + FILL_PST_MAC_TO_RLC(pst, RLC_DL_INST, EVENT_SCHED_RESULT_TO_RLC); + if(MacSendSchedResultRptToRlc(&pst, schedRpt) != ROK) + { + DU_LOG("\nERROR --> MAC: Failed to send Schedule result report to RLC"); + MAC_FREE_SHRABL_BUF(MAC_MEM_REGION, MAC_POOL, schedRpt, sizeof(RlcSchedResultRpt)); + return RFAILED; + } + + return ROK; +} /******************************************************************* * @@ -299,54 +430,62 @@ uint16_t MacRlcProcBOStatus(Pst* pst, SpId spId, RlcMacBOStatus* boStatus) * * @details * - * Function : MacProcCellStartReq + * Function : MacProcCellStart * * Functionality: * Handles cell start reuqest from DU APP * * @params[in] Post structure pointer - * Cell Start Request info pointer + * Cell Id * @return ROK - success * RFAILED - failure * * ****************************************************************/ -uint8_t MacProcCellStartReq(Pst *pst, MacCellStartInfo *cellStartInfo) +uint8_t MacProcCellStart(Pst *pst, OduCellId *cellId) { - DU_LOG("\nMAC : Handling cell start request"); - sendToLowerMac(START_REQUEST, 0, cellStartInfo); + DU_LOG("\nINFO --> MAC : Handling cell start request"); + gSlotCount = 0; + sendToLowerMac(START_REQUEST, 0, cellId); - MAC_FREE_SHRABL_BUF(pst->region, pst->pool, cellStartInfo, \ - sizeof(MacCellStartInfo)); + MAC_FREE_SHRABL_BUF(pst->region, pst->pool, cellId, \ + sizeof(OduCellId)); return ROK; } /******************************************************************* * - * @brief Handles cell stop request from DU APP + * @brief Handles cell stop from DU APP * * @details * - * Function : MacProcCellStartReq + * Function : MacProcCellStop * * Functionality: - * Handles cell stop request from DU APP + * Handles cell stop from DU APP * * @params[in] Post structure pointer - * Mac Cell stop information + * Cell Id * @return ROK - success * RFAILED - failure * * ****************************************************************/ -uint8_t MacProcCellStopReq(Pst *pst, MacCellStopInfo *cellStopInfo) +uint8_t MacProcCellStop(Pst *pst, OduCellId *cellId) { #ifdef INTEL_FAPI - DU_LOG("\nMAC : Sending cell stop request to Lower Mac"); - sendToLowerMac(FAPI_STOP_REQUEST, 0, cellStopInfo); + uint16_t cellIdx; + SlotIndInfo slotInfo; + + DU_LOG("\nINFO --> MAC : Sending cell stop request to Lower Mac"); + GET_CELL_IDX(cellId->cellId, cellIdx); + slotInfo.cellId = cellId->cellId; + slotInfo.sfn = macCb.macCell[cellIdx]->currTime.sfn; + slotInfo.slot = macCb.macCell[cellIdx]->currTime.slot; + sendToLowerMac(FAPI_STOP_REQUEST, 0, &slotInfo); #endif - MAC_FREE_SHRABL_BUF(pst->region, pst->pool, cellStopInfo, \ - sizeof(MacCellStopInfo)); + MAC_FREE_SHRABL_BUF(pst->region, pst->pool, cellId, \ + sizeof(OduCellId)); return ROK; } @@ -370,43 +509,43 @@ uint8_t MacProcCellStopReq(Pst *pst, MacCellStopInfo *cellStopInfo) * ****************************************************************/ uint8_t MacProcDlCcchInd(Pst *pst, DlCcchIndInfo *dlCcchIndInfo) { - uint16_t cellIdx; - uint16_t idx; - DlRlcBOInfo dlBoInfo; - memset(&dlBoInfo, 0, sizeof(DlRlcBOInfo)); + uint8_t ueIdx = 0; + uint16_t cellIdx; + uint16_t idx; + DlRlcBoInfo dlBoInfo; + memset(&dlBoInfo, 0, sizeof(DlRlcBoInfo)); - DU_LOG("\nMAC : Handling DL CCCH IND"); + DU_LOG("\nDEBUG --> MAC : Handling DL CCCH IND"); GET_CELL_IDX(dlCcchIndInfo->cellId, cellIdx); dlBoInfo.cellId = dlCcchIndInfo->cellId; dlBoInfo.crnti = dlCcchIndInfo->crnti; - dlBoInfo.numLc = 0; if(dlCcchIndInfo->msgType == RRC_SETUP) { - dlBoInfo.boInfo[dlBoInfo.numLc].lcId = SRB_ID_0; // SRB ID 0 for msg4 - dlBoInfo.boInfo[SRB_ID_0].dataVolume = \ - dlCcchIndInfo->dlCcchMsgLen; - dlBoInfo.numLc++; + dlBoInfo.lcId = SRB0_LCID; // SRB ID 0 for msg4 + dlBoInfo.dataVolume = dlCcchIndInfo->dlCcchMsgLen; /* storing Msg4 Pdu in raCb */ - if(macCb.macCell[cellIdx]->macRaCb[0].crnti == dlCcchIndInfo->crnti) + GET_UE_IDX(dlBoInfo.crnti, ueIdx); + ueIdx = ueIdx -1; + if(macCb.macCell[cellIdx]->macRaCb[ueIdx].crnti == dlCcchIndInfo->crnti) { - macCb.macCell[cellIdx]->macRaCb[0].msg4PduLen = dlCcchIndInfo->dlCcchMsgLen; - MAC_ALLOC(macCb.macCell[cellIdx]->macRaCb[0].msg4Pdu, \ - macCb.macCell[cellIdx]->macRaCb[0].msg4PduLen); - if(macCb.macCell[cellIdx]->macRaCb[0].msg4Pdu) + macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4PduLen = dlCcchIndInfo->dlCcchMsgLen; + MAC_ALLOC(macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4Pdu, \ + macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4PduLen); + if(macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4Pdu) { for(idx = 0; idx < dlCcchIndInfo->dlCcchMsgLen; idx++) { - macCb.macCell[cellIdx]->macRaCb[0].msg4Pdu[idx] =\ + macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4Pdu[idx] =\ dlCcchIndInfo->dlCcchMsg[idx]; } } } } - sendDlRlcBoInfoMacToSch(&dlBoInfo); + sendDlRlcBoInfoToSch(&dlBoInfo); MAC_FREE_SHRABL_BUF(pst->region, pst->pool, dlCcchIndInfo->dlCcchMsg, \ dlCcchIndInfo->dlCcchMsgLen); @@ -441,7 +580,7 @@ uint8_t macProcUlCcchInd(uint16_t cellId, uint16_t crnti, uint16_t rrcContSize, MAC_ALLOC_SHRABL_BUF(ulCcchIndInfo, sizeof(UlCcchIndInfo)); if(!ulCcchIndInfo) { - DU_LOG("\nMAC: Memory failed in macProcUlCcchInd"); + DU_LOG("\nERROR --> MAC: Memory failed in macProcUlCcchInd"); return RFAILED; } @@ -455,7 +594,7 @@ uint8_t macProcUlCcchInd(uint16_t cellId, uint16_t crnti, uint16_t rrcContSize, if(MacDuAppUlCcchInd(&pst, ulCcchIndInfo) != ROK) { - DU_LOG("\nMAC: Failed to send UL CCCH Ind to DU APP"); + DU_LOG("\nERROR --> MAC: Failed to send UL CCCH Ind to DU APP"); MAC_FREE_SHRABL_BUF(MAC_MEM_REGION, MAC_POOL, ulCcchIndInfo->ulCcchMsg, ulCcchIndInfo->ulCcchMsgLen); MAC_FREE_SHRABL_BUF(MAC_MEM_REGION, MAC_POOL, ulCcchIndInfo, sizeof(UlCcchIndInfo)); ret = RFAILED; @@ -526,7 +665,7 @@ uint8_t buildAndSendSrInd(UciInd *macUciInd, uint8_t crnti) memset(&srUciInd, 0, sizeof(SrUciIndInfo)); GET_CELL_IDX(macUciInd->cellId, cellIdx); - srUciInd.cellId = macCb.macCell[cellIdx]->cellId;; + srUciInd.cellId = macCb.macCell[cellIdx]->cellId; srUciInd.crnti = crnti; srUciInd.slotInd.sfn = macUciInd->slotInd.sfn; srUciInd.slotInd.slot = macUciInd->slotInd.slot; @@ -575,7 +714,7 @@ uint8_t FapiMacUciInd(Pst *pst, UciInd *macUciInd) case UCI_IND_PUCCH_F0F1: if(macUciInd->pdus[pduIdx].uci.uciPucchF0F1.srInfo.srIndPres) { - DU_LOG("\nMAC : Received SR UCI indication"); + DU_LOG("\nDEBUG --> MAC : Received SR UCI indication"); crnti = macUciInd->pdus[pduIdx].uci.uciPucchF0F1.crnti; ret = buildAndSendSrInd(macUciInd, crnti); } @@ -583,7 +722,7 @@ uint8_t FapiMacUciInd(Pst *pst, UciInd *macUciInd) case UCI_IND_PUCCH_F2F3F4: break; default: - DU_LOG("\nMAC: Invalid Pdu Type %d at FapiMacUciInd", macUciInd->pdus[pduIdx].pduType); + DU_LOG("\nERROR --> MAC: Invalid Pdu Type %d at FapiMacUciInd", macUciInd->pdus[pduIdx].pduType); ret = RFAILED; break; } @@ -593,9 +732,10 @@ uint8_t FapiMacUciInd(Pst *pst, UciInd *macUciInd) } else { - DU_LOG("\nMAC: Received Uci Ind is NULL at FapiMacUciInd()"); + DU_LOG("\nERROR --> MAC: Received Uci Ind is NULL at FapiMacUciInd()"); ret = RFAILED; } + MAC_FREE_SHRABL_BUF(pst->region, pst->pool, macUciInd, sizeof(UciInd)); return ret; }