X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Fmac_msg_hdl.c;h=f167513141664da4c8634efc94ec432ae0c38230;hb=de6a435729e3cad9d4a66329080b8206a64f452c;hp=cc361bbb8c1b5d7de16732de5e0c30b689d7a509;hpb=694adde1a08c393a8443fd5bbd4f036f5cf85403;p=o-du%2Fl2.git diff --git a/src/5gnrmac/mac_msg_hdl.c b/src/5gnrmac/mac_msg_hdl.c index cc361bbb8..f16751314 100644 --- a/src/5gnrmac/mac_msg_hdl.c +++ b/src/5gnrmac/mac_msg_hdl.c @@ -32,15 +32,11 @@ #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 */ -extern MacCb macCb; - -uint16_t buildMacPdu(RlcData *dlData); -#ifdef EGTP_TEST -void macStubBuildUlData(Buffer *mBuf); -#endif +MacCb macCb; /* Function pointer for sending crc ind from MAC to SCH */ MacSchCrcIndFunc macSchCrcIndOpts[]= @@ -74,6 +70,29 @@ MacSchSrUciIndFunc macSchSrUciIndOpts[]= packMacSchSrUciInd }; +/* Function pointer for sending HARQ Uci ind from MAC to SCH */ +MacSchHarqUciIndFunc macSchHarqUciIndOpts[]= +{ + packMacSchHarqUciInd, + MacSchHarqUciInd, + packMacSchHarqUciInd +}; + +/* 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 @@ -143,16 +162,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)); } @@ -175,15 +195,30 @@ uint8_t fapiMacCrcInd(Pst *pst, CrcInd *crcInd) * ****************************************************************/ uint8_t fapiMacRxDataInd(Pst *pst, RxDataInd *rxDataInd) { - uint16_t pduIdx; - DU_LOG("\nMAC : Received Rx Data indication"); + 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); } + MAC_FREE_SHRABL_BUF(pst->region, pst->pool, rxDataInd, sizeof(RxDataInd)); return ROK; } @@ -206,15 +241,24 @@ uint8_t fapiMacRxDataInd(Pst *pst, RxDataInd *rxDataInd) * ****************************************************************/ uint8_t MacProcRlcDlData(Pst* pstInfo, RlcData *dlData) { - uint8_t pduIdx; - uint8_t *txPdu; - uint16_t tbSize; + uint8_t pduIdx = 0; + uint8_t ueId = 0; + uint8_t lcIdx = 0; + uint8_t *txPdu = NULLP; + uint8_t schInfoIdx = 0 ; + uint16_t cellIdx = 0, txPduLen = 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); + + GET_UE_ID(dlData->rnti, ueId); - DU_LOG("\nMAC: Received DL data for sfn=%d slot=%d", \ - dlData->slotInfo.sfn, dlData->slotInfo.slot); /* Copy the pdus to be muxed into mac Dl data */ + macDlData.ueId = ueId; macDlData.numPdu = dlData->numPdu; for(pduIdx = 0; pduIdx < dlData->numPdu; pduIdx++) { @@ -223,23 +267,51 @@ uint8_t MacProcRlcDlData(Pst* pstInfo, RlcData *dlData) macDlData.pduInfo[pduIdx].dlPdu = dlData->pduInfo[pduIdx].pduBuf; } + GET_CELL_IDX(dlData->cellId, cellIdx); /* Store DL data in the scheduled slot */ - currDlSlot = &macCb.macCell[dlData->cellId -1]->dlSlot[dlData->slotInfo.slot]; - if(currDlSlot) + if(macCb.macCell[cellIdx] ==NULLP) { - if(currDlSlot->dlInfo.dlMsgAlloc) + DU_LOG("\nERROR --> MAC : MacProcRlcDlData(): macCell does not exists"); + return RFAILED; + } + currDlSlot = &macCb.macCell[cellIdx]->dlSlot[dlData->slotInfo.slot]; + if(currDlSlot->dlInfo.dlMsgAlloc[ueId-1]) + { + for(schInfoIdx=0; schInfoIdxdlInfo.dlMsgAlloc[ueId-1]->numSchedInfo; schInfoIdx++) { - tbSize = currDlSlot->dlInfo.dlMsgAlloc->dlMsgPdschCfg.codeword[0].tbSize; - MAC_ALLOC(txPdu, tbSize); - if(!txPdu) - { - DU_LOG("\nMAC : Memory allocation failed in MacProcRlcDlData"); - return RFAILED; - } - macMuxPdu(&macDlData, NULLP, txPdu, tbSize); + if((currDlSlot->dlInfo.dlMsgAlloc[ueId-1]->dlMsgSchedInfo[schInfoIdx].pduPres == PDSCH_PDU) || + (currDlSlot->dlInfo.dlMsgAlloc[ueId-1]->dlMsgSchedInfo[schInfoIdx].pduPres == BOTH)) + break; + } - currDlSlot->dlInfo.dlMsgAlloc->dlMsgInfo.dlMsgPduLen = tbSize; - currDlSlot->dlInfo.dlMsgAlloc->dlMsgInfo.dlMsgPdu = txPdu; + txPduLen = currDlSlot->dlInfo.dlMsgAlloc[ueId-1]->dlMsgSchedInfo[schInfoIdx].dlMsgPdschCfg.codeword[0].tbSize\ + - TX_PAYLOAD_HDR_LEN; + MAC_ALLOC(txPdu, txPduLen); + if(!txPdu) + { + DU_LOG("\nERROR --> MAC : Memory allocation failed in MacProcRlcDlData"); + return RFAILED; + } + macMuxPdu(&macDlData, NULLP, txPdu, txPduLen); + + 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++) + { + if(dlData->boStatus[lcIdx].bo) + { + memset(&dlBoInfo, 0, sizeof(DlRlcBoInfo)); + dlBoInfo.cellId = dlData->boStatus[lcIdx].cellId; + GET_CRNTI(dlBoInfo.crnti, dlData->boStatus[lcIdx].ueId); + dlBoInfo.lcId = dlData->boStatus[lcIdx].lcId; + dlBoInfo.dataVolume = dlData->boStatus[lcIdx].bo; + sendDlRlcBoInfoToSch(&dlBoInfo); } } @@ -247,13 +319,12 @@ uint8_t MacProcRlcDlData(Pst* pstInfo, RlcData *dlData) for(pduIdx = 0; pduIdx < dlData->numPdu; pduIdx++) { MAC_FREE_SHRABL_BUF(pstInfo->region, pstInfo->pool, dlData->pduInfo[pduIdx].pduBuf,\ - dlData->pduInfo[pduIdx].pduLen); + dlData->pduInfo[pduIdx].pduLen); } if(pstInfo->selector == ODU_SELECTOR_LWLC) { MAC_FREE_SHRABL_BUF(pstInfo->region, pstInfo->pool, dlData, sizeof(RlcData)); } - return ROK; } @@ -277,30 +348,31 @@ uint8_t MacProcRlcDlData(Pst* pstInfo, RlcData *dlData) * RFAILED - failure * * ****************************************************************/ -uint8_t macProcUlData(uint16_t cellId, uint16_t rnti, SlotIndInfo slotInfo, \ +uint8_t macProcUlData(uint16_t cellId, uint16_t rnti, SlotTimingInfo slotInfo, \ uint8_t lcId, uint16_t pduLen, uint8_t *pdu) { Pst pst; - RlcData *ulData; + RlcData *ulData; /* Filling RLC Ul Data*/ 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(RlcData)); ulData->cellId = cellId; ulData->rnti = rnti; - memcpy(&ulData->slotInfo, &slotInfo, sizeof(SlotIndInfo)); + memcpy(&ulData->slotInfo, &slotInfo, sizeof(SlotTimingInfo)); ulData->slotInfo.cellId = cellId; /* Filling pdu info */ - if(lcId == SRB1_LCID || lcId == SRB2_LCID) - { + 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; @@ -337,10 +409,10 @@ uint8_t MacProcRlcBoStatus(Pst* pst, RlcBoStatus* boStatus) DlRlcBoInfo dlBoInfo; dlBoInfo.cellId = boStatus->cellId; - GET_CRNTI(dlBoInfo.crnti, boStatus->ueIdx); + GET_CRNTI(dlBoInfo.crnti, boStatus->ueId); dlBoInfo.lcId = boStatus->lcId; dlBoInfo.dataVolume = boStatus->bo; - + sendDlRlcBoInfoToSch(&dlBoInfo); if(pst->selector == ODU_SELECTOR_LWLC) @@ -366,7 +438,7 @@ uint8_t MacProcRlcBoStatus(Pst* pst, RlcBoStatus* boStatus) * RFAILED - failure * * ****************************************************************/ -uint8_t sendSchedRptToRlc(DlSchedInfo dlInfo, SlotIndInfo slotInfo) +uint8_t sendSchedRptToRlc(DlSchedInfo dlInfo, SlotTimingInfo slotInfo, uint8_t ueIdx, uint8_t schInfoIdx) { Pst pst; uint8_t lcIdx; @@ -375,29 +447,32 @@ uint8_t sendSchedRptToRlc(DlSchedInfo dlInfo, SlotIndInfo slotInfo) MAC_ALLOC_SHRABL_BUF(schedRpt, sizeof(RlcSchedResultRpt)); if(!schedRpt) { - DU_LOG("\nMAC: Memory allocation failure in sendSchResultRepToRlc"); + DU_LOG("\nERROR --> MAC: Memory allocation failure in sendSchResultRepToRlc"); return RFAILED; } - DU_LOG("\nMAC: Send scheduled result report for sfn %d slot %d", slotInfo.sfn, slotInfo.slot); + 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++) + if(dlInfo.dlMsgAlloc[ueIdx]) { - schedRpt->lcSch[lcIdx].lcId = dlInfo.dlMsgAlloc->lcSchInfo[lcIdx].lcId; - schedRpt->lcSch[lcIdx].bufSize = dlInfo.dlMsgAlloc->lcSchInfo[lcIdx].schBytes; - schedRpt->lcSch[lcIdx].commCh = false; + schedRpt->rnti = dlInfo.dlMsgAlloc[ueIdx]->crnti; + schedRpt->numLc = dlInfo.dlMsgAlloc[ueIdx]->dlMsgSchedInfo[schInfoIdx].numLc; + for(lcIdx = 0; lcIdx < schedRpt->numLc; lcIdx++) + { + 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; + } } /* Fill Pst */ FILL_PST_MAC_TO_RLC(pst, RLC_DL_INST, EVENT_SCHED_RESULT_TO_RLC); if(MacSendSchedResultRptToRlc(&pst, schedRpt) != ROK) { - DU_LOG("\nMAC: Failed to send Schedule result report to RLC"); + 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; } @@ -411,54 +486,61 @@ uint8_t sendSchedRptToRlc(DlSchedInfo dlInfo, SlotIndInfo slotInfo) * * @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; + + DU_LOG("\nINFO --> MAC : Sending cell stop request to Lower Mac"); + GET_CELL_IDX(cellId->cellId, cellIdx); + if(macCb.macCell[cellIdx]) + { + macCb.macCell[cellIdx]->state = CELL_TO_BE_STOPPED; + } #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; } @@ -482,13 +564,13 @@ uint8_t MacProcCellStopReq(Pst *pst, MacCellStopInfo *cellStopInfo) * ****************************************************************/ uint8_t MacProcDlCcchInd(Pst *pst, DlCcchIndInfo *dlCcchIndInfo) { - uint8_t ueIdx = 0; - uint16_t cellIdx; - uint16_t idx; + uint8_t ueId = 0, 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); @@ -498,11 +580,12 @@ uint8_t MacProcDlCcchInd(Pst *pst, DlCcchIndInfo *dlCcchIndInfo) if(dlCcchIndInfo->msgType == RRC_SETUP) { dlBoInfo.lcId = SRB0_LCID; // SRB ID 0 for msg4 - dlBoInfo.dataVolume = dlCcchIndInfo->dlCcchMsgLen; + /* (MSG4 pdu + 3 bytes sub-header) + (Contention resolution id MAC CE + 1 byte sub-header) */ + dlBoInfo.dataVolume = (dlCcchIndInfo->dlCcchMsgLen + 3) + (MAX_CRI_SIZE + 1); /* storing Msg4 Pdu in raCb */ - GET_UE_IDX(dlBoInfo.crnti, ueIdx); - ueIdx = ueIdx -1; + GET_UE_ID(dlBoInfo.crnti, ueId); + ueIdx = ueId -1; if(macCb.macCell[cellIdx]->macRaCb[ueIdx].crnti == dlCcchIndInfo->crnti) { macCb.macCell[cellIdx]->macRaCb[ueIdx].msg4PduLen = dlCcchIndInfo->dlCcchMsgLen; @@ -553,7 +636,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; } @@ -567,7 +650,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; @@ -591,6 +674,8 @@ uint8_t macProcUlCcchInd(uint16_t cellId, uint16_t crnti, uint16_t rrcContSize, * lcg ID * buffer size * + * @return ROK - success + * RFAILED - failure * * ****************************************************************/ uint8_t macProcShortBsr(uint16_t cellId, uint16_t crnti, uint8_t lcgId, uint32_t bufferSize) @@ -612,6 +697,93 @@ uint8_t macProcShortBsr(uint16_t cellId, uint16_t crnti, uint8_t lcgId, uint32_t return(*macSchBsrOpts[pst.selector])(&pst, &bsrInd); } +/******************************************************************* + * + * @brief Processes received short BSR + * + * @details + * + * Function : macProcShortBsr + * + * Functionality: + * MAC sends Short BSR to SCH + * + * @params[in] cell ID + * crnti + * lcg ID + * buffer size + * + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ +uint8_t macProcLongBsr(uint16_t cellId, uint16_t crnti,uint8_t numLcg,\ + DataVolInfo dataVolInfo[MAX_NUM_LOGICAL_CHANNEL_GROUPS]) +{ + Pst pst; + UlBufferStatusRptInd bsrInd; + uint8_t lcgIdx = 0; + + memset(&pst, 0, sizeof(Pst)); + memset(&bsrInd, 0, sizeof(UlBufferStatusRptInd)); + + bsrInd.cellId = cellId; + bsrInd.crnti = crnti; + bsrInd.bsrType = LONG_BSR; + bsrInd.numLcg = numLcg; + + for(lcgIdx = 0; lcgIdx < numLcg; lcgIdx++) + memcpy(&(bsrInd.dataVolInfo[lcgIdx]), &(dataVolInfo[lcgIdx]), sizeof(DataVolInfo)); + + FILL_PST_MAC_TO_SCH(pst, EVENT_LONG_BSR); + return(*macSchBsrOpts[pst.selector])(&pst, &bsrInd); +} + +/******************************************************************* + * + * @brief Builds and send HARQ UCI 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; + HarqUciIndInfo harqUciInd; + memset(&pst, 0, sizeof(Pst)); + memset(&harqUciInd, 0, sizeof(HarqUciIndInfo)); + + harqUciInd.cellId = macCb.macCell[cellIdx]->cellId; + harqUciInd.crnti = crnti; + harqUciInd.slotInd.sfn = slotInd->sfn; + harqUciInd.slotInd.slot = slotInd->slot; + harqUciInd.numHarq = harqInfo->numHarq; + memset(harqUciInd.harqPayload, 0, MAX_SR_BITS_IN_BYTES); + for(harqCounter = 0; harqCounter < harqInfo->numHarq; harqCounter++) + { + harqUciInd.harqPayload[harqCounter] = harqInfo->harqValue[harqCounter]; + } + + /* Fill Pst */ + FILL_PST_MAC_TO_SCH(pst, EVENT_UCI_IND_TO_SCH); + + return(*macSchHarqUciIndOpts[pst.selector])(&pst, &harqUciInd); +} + + /******************************************************************* * * @brief Builds and send SR UCI Indication to SCH @@ -638,7 +810,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; @@ -670,10 +842,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) { @@ -685,17 +855,24 @@ 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("\nMAC : Received SR UCI indication"); - crnti = macUciInd->pdus[pduIdx].uci.uciPucchF0F1.crnti; - ret = buildAndSendSrInd(macUciInd, crnti); + DU_LOG("\nDEBUG --> MAC : 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); + DU_LOG("\nERROR --> MAC: Invalid Pdu Type %d at FapiMacUciInd", macUciInd->pdus[pduIdx].pduType); ret = RFAILED; break; } @@ -705,12 +882,168 @@ 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; +} + +/******************************************************************* + * + * @brief fill Slice Cfg Request info in shared structre + * + * @details + * + * Function : fillSliceCfgInfo + * + * Functionality: + * fill Slice Cfg Request info in shared structre + * + * @params[in] SchSliceCfgReq *schSliceCfgReq + * MacSliceCfgReq *macSliceCfgReq; + * @return ROK - success + * 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; + } +/******************************************************************* + * + * @brief Processes Slice Cfg Request recived from DU + * + * @details + * + * Function : MacProcSliceCfgReq + * + * Functionality: + * Processes Processes Slice Cfg Request recived from DU + * + * @params[in] Post Structure Pointer + * MacSliceCfgReq *macSliceCfgReq; + * @return ROK - success + * RFAILED - failure + * + **********************************************************************/ +uint8_t MacProcSliceCfgReq(Pst *pst, MacSliceCfgReq *macSliceCfgReq) +{ + uint8_t ret = ROK; + Pst schPst; + SchSliceCfgReq *schSliceCfgReq; + + DU_LOG("\nINFO --> MAC : Received Slice Cfg request from DU APP"); + if(macSliceCfgReq) + { + MAC_ALLOC(schSliceCfgReq, sizeof(SchSliceCfgReq)); + if(schSliceCfgReq == NULLP) + { + DU_LOG("\nERROR --> MAC : Memory allocation failed in MacProcSliceCfgReq"); + ret = RFAILED; + } + else + { + if(fillSliceCfgInfo(schSliceCfgReq, macSliceCfgReq) == ROK) + { + FILL_PST_MAC_TO_SCH(schPst, EVENT_SLICE_CFG_REQ_TO_SCH); + ret = (*macSchSliceCfgReqOpts[schPst.selector])(&schPst, schSliceCfgReq); + } + } + freeMacSliceCfgReq(macSliceCfgReq, pst); + } + else + { + DU_LOG("\nINFO --> MAC : Received MacSliceCfgReq is NULL"); + } return ret; } +/******************************************************************* + * + * @brief Processes Slice ReCfg Request recived from DU + * + * @details + * + * Function : MacProcSliceReCfgReq + * + * Functionality: + * Processes Processes Slice ReCfg Request recived from DU + * + * @params[in] Post Structure Pointer + * MacSliceCfgReq *macSliceReCfgReq; + * @return ROK - success + * RFAILED - failure + * + **********************************************************************/ +uint8_t MacProcSliceReCfgReq(Pst *pst, MacSliceCfgReq *macSliceReCfgReq) +{ + uint8_t ret = ROK; + Pst schPst; + SchSliceCfgReq *schSliceReCfgReq; + + DU_LOG("\nINFO --> MAC : Received Slice ReCfg request from DU APP"); + if(macSliceReCfgReq) + { + MAC_ALLOC(schSliceReCfgReq, sizeof(SchSliceCfgReq)); + if(schSliceReCfgReq == NULLP) + { + DU_LOG("\nERROR --> MAC : Memory allocation failed in MacProcSliceReCfgReq"); + ret = RFAILED; + } + else + { + if(fillSliceCfgInfo(schSliceReCfgReq, macSliceReCfgReq) == ROK) + { + FILL_PST_MAC_TO_SCH(schPst, EVENT_SLICE_RECFG_REQ_TO_SCH); + ret = (*macSchSliceReCfgReqOpts[schPst.selector])(&schPst, schSliceReCfgReq); + } + + } + freeMacSliceCfgReq(macSliceReCfgReq, pst); + } + else + { + DU_LOG("\nINFO --> MAC : Received MacSliceCfgReq is NULL"); + } + return ret; +} /********************************************************************** End of file