X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Fmac_msg_hdl.c;h=8210880023b98db0744d8fbe561c35f42cc5f260;hb=6b44407d464a5a4e060999255233a7cfe78bb0fa;hp=aad5fc18b9104103b87e2835e64494c6f2259c75;hpb=4e803fe4bcf3a446b7082675d25d35ad102f16f6;p=o-du%2Fl2.git diff --git a/src/5gnrmac/mac_msg_hdl.c b/src/5gnrmac/mac_msg_hdl.c index aad5fc18b..821088002 100644 --- a/src/5gnrmac/mac_msg_hdl.c +++ b/src/5gnrmac/mac_msg_hdl.c @@ -18,28 +18,21 @@ /* header include files -- defines (.h) */ #include "common_def.h" -#include "rgu.h" -#include "tfu.h" -#include "rg_sch_inf.h" -#include "rg_env.h" #include "lrg.h" -#include "crg.h" -#include "rg.h" -#include "du_log.h" -#include "lwr_mac.h" - -/* header/extern include files (.x) */ -#include "rgu.x" -#include "tfu.x" -#include "rg_sch_inf.x" +#include "rgu.h" #include "lrg.x" -#include "crg.x" -#include "rg_prg.x" +#include "rgu.x" #include "du_app_mac_inf.h" +#include "mac_sch_interface.h" #include "mac_upr_inf_api.h" -#include "rg.x" +#include "lwr_mac.h" +#ifdef INTEL_FAPI +#include "fapi_interface.h" +#endif #include "lwr_mac_fsm.h" +#include "lwr_mac_upr_inf.h" #include "mac.h" +#include "mac_utils.h" /* This file contains message handling functionality for MAC */ @@ -52,7 +45,7 @@ uint16_t buildMacPdu(RlcMacData *dlData); MacSchCrcIndFunc macSchCrcIndOpts[]= { packMacSchCrcInd, - macSchCrcInd, + MacSchCrcInd, packMacSchCrcInd }; @@ -60,10 +53,26 @@ MacSchCrcIndFunc macSchCrcIndOpts[]= MacSchDlRlcBoInfoFunc macSchDlRlcBoInfoOpts[]= { packMacSchDlRlcBoInfo, - macSchDlRlcBoInfo, + 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 +}; + /******************************************************************* * * @brief Sends DL BO Info to SCH @@ -80,13 +89,11 @@ MacSchDlRlcBoInfoFunc macSchDlRlcBoInfoOpts[]= * RFAILED - failure * ****************************************************************/ -int sendDlRlcBoInfoMacToSch(DlRlcBOInfo *dlBoInfo) +uint8_t sendDlRlcBoInfoMacToSch(DlRlcBOInfo *dlBoInfo) { Pst pst; - fillMacToSchPst(&pst); - pst.event = EVENT_DL_RLC_BO_INFO_TO_SCH; - + FILL_PST_MAC_TO_SCH(pst, EVENT_DL_RLC_BO_INFO_TO_SCH); return(*macSchDlRlcBoInfoOpts[pst.selector])(&pst, dlBoInfo); } @@ -106,13 +113,11 @@ int sendDlRlcBoInfoMacToSch(DlRlcBOInfo *dlBoInfo) * RFAILED - failure * ****************************************************************/ -int sendCrcIndMacToSch(CrcIndInfo *crcInd) +uint8_t sendCrcIndMacToSch(CrcIndInfo *crcInd) { Pst pst; - fillMacToSchPst(&pst); - pst.event = EVENT_CRC_IND_TO_SCH; - + FILL_PST_MAC_TO_SCH(pst, EVENT_CRC_IND_TO_SCH); return(*macSchCrcIndOpts[pst.selector])(&pst, crcInd); } @@ -133,14 +138,16 @@ int sendCrcIndMacToSch(CrcIndInfo *crcInd) * RFAILED - failure * * ****************************************************************/ -uint16_t fapiMacCrcInd(Pst *pst, CrcInd *crcInd) +uint8_t fapiMacCrcInd(Pst *pst, CrcInd *crcInd) { + uint16_t cellIdx; CrcIndInfo crcIndInfo; DU_LOG("\nMAC : Received CRC indication"); + GET_CELL_IDX(crcInd->cellId, cellIdx); /* Considering one pdu and one preamble */ - crcIndInfo.cellId = macCb.macCell->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; @@ -167,7 +174,7 @@ uint16_t fapiMacCrcInd(Pst *pst, CrcInd *crcInd) * RFAILED - failure * * ****************************************************************/ -uint16_t fapiMacRxDataInd(Pst *pst, RxDataInd *rxDataInd) +uint8_t fapiMacRxDataInd(Pst *pst, RxDataInd *rxDataInd) { uint16_t pduIdx; @@ -178,7 +185,7 @@ uint16_t fapiMacRxDataInd(Pst *pst, RxDataInd *rxDataInd) for(pduIdx = 0; pduIdx < rxDataInd->numPdus; pduIdx++) { - unpackRxData(&rxDataInd->pdus[pduIdx]); + unpackRxData(rxDataInd->cellId, rxDataInd->timingInfo, &rxDataInd->pdus[pduIdx]); } return ROK; } @@ -205,6 +212,64 @@ uint16_t MacRlcProcDlData(Pst* pst, SpId spId, RlcMacData *dlData) return ROK; } +/******************************************************************* + * + * @brief Builds and Sends UL Data to RLC + * + * @details + * + * Function : macProcUlData + * + * Functionality: Builds and Sends UL Data to RLC + * + * @params[in] CellId + * CRNTI + * Slot information + * LC Id on which payload was received + * Pointer to the payload + * Length of payload + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +uint8_t macProcUlData(uint16_t cellId, uint16_t rnti, SlotIndInfo slotInfo, \ +uint8_t lcId, uint16_t pduLen, uint8_t *pdu) +{ + Pst pst; + RlcMacData *ulData; + + /* Filling RLC Ul Data*/ + MAC_ALLOC_SHRABL_BUF(ulData, sizeof(RlcMacData)); + if(!ulData) + { + DU_LOG("\nMAC : Memory allocation failed while sending UL data to RLC"); + return RFAILED; + } + memset(ulData, 0, sizeof(RlcMacData)); + ulData->cellId = cellId; + ulData->rnti = rnti; + memcpy(&ulData->slotInfo, &slotInfo, sizeof(SlotIndInfo)); + ulData->slotInfo.cellId = cellId; + + /* Filling pdu info */ + if(lcId == SRB1_LCID || lcId == SRB2_LCID) + { + ulData->pduInfo[ulData->numPdu].commCh = true; + } + ulData->pduInfo[ulData->numPdu].lcId = lcId; + ulData->pduInfo[ulData->numPdu].pduBuf = pdu; + ulData->pduInfo[ulData->numPdu].pduLen = pduLen; + ulData->numPdu++; + + /* Filling Post and send to RLC */ + memset(&pst, 0, sizeof(Pst)); + FILL_PST_MAC_TO_RLC(pst, 0, EVTRLCULDAT); + MacSendUlDataToRlc(&pst, ulData); + + return ROK; +} + + /******************************************************************* * * @brief Processes BO status from RLC @@ -234,7 +299,7 @@ uint16_t MacRlcProcBOStatus(Pst* pst, SpId spId, RlcMacBOStatus* boStatus) * * @details * - * Function : MacHdlCellStartReq + * Function : MacProcCellStartReq * * Functionality: * Handles cell start reuqest from DU APP @@ -245,7 +310,7 @@ uint16_t MacRlcProcBOStatus(Pst* pst, SpId spId, RlcMacBOStatus* boStatus) * RFAILED - failure * * ****************************************************************/ -uint16_t MacHdlCellStartReq(Pst *pst, MacCellStartInfo *cellStartInfo) +uint8_t MacProcCellStartReq(Pst *pst, MacCellStartInfo *cellStartInfo) { DU_LOG("\nMAC : Handling cell start request"); sendToLowerMac(START_REQUEST, 0, cellStartInfo); @@ -262,7 +327,7 @@ uint16_t MacHdlCellStartReq(Pst *pst, MacCellStartInfo *cellStartInfo) * * @details * - * Function : MacHdlCellStartReq + * Function : MacProcCellStartReq * * Functionality: * Handles cell stop request from DU APP @@ -273,7 +338,7 @@ uint16_t MacHdlCellStartReq(Pst *pst, MacCellStartInfo *cellStartInfo) * RFAILED - failure * * ****************************************************************/ -uint16_t MacHdlCellStopReq(Pst *pst, MacCellStopInfo *cellStopInfo) +uint8_t MacProcCellStopReq(Pst *pst, MacCellStopInfo *cellStopInfo) { #ifdef INTEL_FAPI DU_LOG("\nMAC : Sending cell stop request to Lower Mac"); @@ -292,7 +357,7 @@ uint16_t MacHdlCellStopReq(Pst *pst, MacCellStopInfo *cellStopInfo) * * @details * - * Function : MacHdlDlCcchInd + * Function : MacProcDlCcchInd * * Functionality: * Handles DL CCCH Ind from DU APP @@ -303,15 +368,17 @@ uint16_t MacHdlCellStopReq(Pst *pst, MacCellStopInfo *cellStopInfo) * RFAILED - failure * * ****************************************************************/ -uint16_t MacHdlDlCcchInd(Pst *pst, DlCcchIndInfo *dlCcchIndInfo) +uint8_t MacProcDlCcchInd(Pst *pst, DlCcchIndInfo *dlCcchIndInfo) { + uint16_t cellIdx; uint16_t idx; DlRlcBOInfo dlBoInfo; memset(&dlBoInfo, 0, sizeof(DlRlcBOInfo)); DU_LOG("\nMAC : Handling DL CCCH IND"); - /* TODO : Fill DL RLC Buffer status info */ + GET_CELL_IDX(dlCcchIndInfo->cellId, cellIdx); + dlBoInfo.cellId = dlCcchIndInfo->cellId; dlBoInfo.crnti = dlCcchIndInfo->crnti; dlBoInfo.numLc = 0; @@ -324,16 +391,16 @@ uint16_t MacHdlDlCcchInd(Pst *pst, DlCcchIndInfo *dlCcchIndInfo) dlBoInfo.numLc++; /* storing Msg4 Pdu in raCb */ - if(macCb.macCell->macRaCb[0].crnti == dlCcchIndInfo->crnti) + if(macCb.macCell[cellIdx]->macRaCb[0].crnti == dlCcchIndInfo->crnti) { - macCb.macCell->macRaCb[0].msg4PduLen = dlCcchIndInfo->dlCcchMsgLen; - MAC_ALLOC(macCb.macCell->macRaCb[0].msg4Pdu, \ - macCb.macCell->macRaCb[0].msg4PduLen); - if(macCb.macCell->macRaCb[0].msg4Pdu) + 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) { for(idx = 0; idx < dlCcchIndInfo->dlCcchMsgLen; idx++) { - macCb.macCell->macRaCb[0].msg4Pdu[idx] =\ + macCb.macCell[cellIdx]->macRaCb[0].msg4Pdu[idx] =\ dlCcchIndInfo->dlCcchMsg[idx]; } } @@ -354,7 +421,7 @@ uint16_t MacHdlDlCcchInd(Pst *pst, DlCcchIndInfo *dlCcchIndInfo) * * @details * - * Function : macSendUlCcchInd + * Function : macProcUlCcchInd * * Functionality: * MAC sends UL CCCH Ind to DU APP @@ -365,7 +432,7 @@ uint16_t MacHdlDlCcchInd(Pst *pst, DlCcchIndInfo *dlCcchIndInfo) * RFAILED - failure * * ****************************************************************/ -uint16_t macSendUlCcchInd(uint8_t *rrcContainer, uint16_t cellId, uint16_t crnti) +uint8_t macProcUlCcchInd(uint16_t cellId, uint16_t crnti, uint16_t rrcContSize, uint8_t *rrcContainer) { Pst pst; uint8_t ret = ROK; @@ -374,40 +441,165 @@ uint16_t macSendUlCcchInd(uint8_t *rrcContainer, uint16_t cellId, uint16_t crnti MAC_ALLOC_SHRABL_BUF(ulCcchIndInfo, sizeof(UlCcchIndInfo)); if(!ulCcchIndInfo) { - DU_LOG("\nMAC: Memory failed in macSendUlCcchInd"); + DU_LOG("\nMAC: Memory failed in macProcUlCcchInd"); return RFAILED; } ulCcchIndInfo->cellId = cellId; ulCcchIndInfo->crnti = crnti; + ulCcchIndInfo->ulCcchMsgLen = rrcContSize; ulCcchIndInfo->ulCcchMsg = rrcContainer; /* Fill Pst */ - pst.selector = ODU_SELECTOR_LWLC; - pst.srcEnt = ENTRG; - pst.dstEnt = ENTDUAPP; - pst.dstInst = 0; - pst.srcInst = macCb.macInst; - pst.dstProcId = rgCb[pst.srcInst].rgInit.procId; - pst.srcProcId = rgCb[pst.srcInst].rgInit.procId; - pst.region = MAC_MEM_REGION; - pst.pool = MAC_POOL; - pst.event = EVENT_MAC_UL_CCCH_IND; - pst.route = 0; - pst.prior = 0; - pst.intfVer = 0; + FILL_PST_MAC_TO_DUAPP(pst, EVENT_MAC_UL_CCCH_IND); if(MacDuAppUlCcchInd(&pst, ulCcchIndInfo) != ROK) { DU_LOG("\nMAC: Failed to send UL CCCH Ind to DU APP"); - MAC_FREE_SHRABL_BUF(MAC_MEM_REGION, MAC_POOL, ulCcchIndInfo->ulCcchMsg, - strlen((const char*)ulCcchIndInfo->ulCcchMsg)); + 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; } return ret; } +/******************************************************************* + * + * @brief Processes received short BSR + * + * @details + * + * Function : macProcShortBsr + * + * Functionality: + * MAC sends Short BSR to SCH + * + * @params[in] cell ID + * crnti + * lcg ID + * buffer size + * + * + * ****************************************************************/ +uint8_t macProcShortBsr(uint16_t cellId, uint16_t crnti, uint8_t lcgId, uint32_t bufferSize) +{ + Pst pst; + UlBufferStatusRptInd bsrInd; + + memset(&pst, 0, sizeof(Pst)); + memset(&bsrInd, 0, sizeof(UlBufferStatusRptInd)); + + bsrInd.cellId = cellId; + bsrInd.crnti = crnti; + bsrInd.bsrType = SHORT_BSR; + bsrInd.numLcg = 1; /* short bsr reports one lcg at a time */ + bsrInd.dataVolInfo[0].lcgId = lcgId; + bsrInd.dataVolInfo[0].dataVol = bufferSize; + + FILL_PST_MAC_TO_SCH(pst, EVENT_SHORT_BSR); + return(*macSchBsrOpts[pst.selector])(&pst, &bsrInd); +} + +/******************************************************************* + * + * @brief Builds and send SR UCI Indication to SCH + * + * @details + * + * Function : buildAndSendSrInd + * + * Functionality: + * Builds and send SR UCI Indication to SCH + * + * @params[in] SrUciIndInfo Pointer + * crnti value + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +uint8_t buildAndSendSrInd(UciInd *macUciInd, uint8_t crnti) +{ + uint16_t cellIdx; + Pst pst; + SrUciIndInfo srUciInd; + memset(&pst, 0, sizeof(Pst)); + memset(&srUciInd, 0, sizeof(SrUciIndInfo)); + + GET_CELL_IDX(macUciInd->cellId, cellIdx); + srUciInd.cellId = macCb.macCell[cellIdx]->cellId;; + srUciInd.crnti = crnti; + srUciInd.slotInd.sfn = macUciInd->slotInd.sfn; + srUciInd.slotInd.slot = macUciInd->slotInd.slot; + srUciInd.numSrBits++; + memset(srUciInd.srPayload, 0, MAX_SR_BITS_IN_BYTES); + + /* Fill Pst */ + FILL_PST_MAC_TO_SCH(pst, EVENT_UCI_IND_TO_SCH); + + return(*macSchSrUciIndOpts[pst.selector])(&pst, &srUciInd); +} + +/******************************************************************* + * + * @brief Processes UCI Indication from PHY + * + * @details + * + * Function : fapiMacUciInd + * + * Functionality: + * Processes UCI Indication from PHY + * + * @params[in] Post Structure Pointer + * UCI Indication Pointer + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +uint8_t FapiMacUciInd(Pst *pst, UciInd *macUciInd) +{ + uint8_t pduIdx = 0; + uint8_t ret = ROK; + uint16_t nPdus; + uint16_t crnti; + + if(macUciInd) + { + nPdus = macUciInd->numUcis; + while(nPdus) + { + switch(macUciInd->pdus[pduIdx].pduType) + { + case UCI_IND_PUSCH: + break; + case UCI_IND_PUCCH_F0F1: + if(macUciInd->pdus[pduIdx].uci.uciPucchF0F1.srInfo.srIndPres) + { + DU_LOG("\nMAC : Received SR UCI indication"); + crnti = macUciInd->pdus[pduIdx].uci.uciPucchF0F1.crnti; + ret = buildAndSendSrInd(macUciInd, crnti); + } + break; + case UCI_IND_PUCCH_F2F3F4: + break; + default: + DU_LOG("\nMAC: Invalid Pdu Type %d at FapiMacUciInd", macUciInd->pdus[pduIdx].pduType); + ret = RFAILED; + break; + } + pduIdx++; + nPdus--; + } + } + else + { + DU_LOG("\nMAC: Received Uci Ind is NULL at FapiMacUciInd()"); + ret = RFAILED; + } + return ret; +} + + /********************************************************************** End of file **********************************************************************/