X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Fmac_msg_hdl.c;h=d5544ba2dea18d54708b65883b747048bebb3390;hb=f78bb742344bb919e27f38c2d7bc2d11fc37b184;hp=7e015afee1effc76afe8983e7e7ee470ed8088a6;hpb=fa6899dae4aee415bbcfd00760b6e2b312ddceec;p=o-du%2Fl2.git diff --git a/src/5gnrmac/mac_msg_hdl.c b/src/5gnrmac/mac_msg_hdl.c index 7e015afee..d5544ba2d 100644 --- a/src/5gnrmac/mac_msg_hdl.c +++ b/src/5gnrmac/mac_msg_hdl.c @@ -38,6 +38,14 @@ MacCb macCb; +MacDuStatsIndFunc macDuStatsIndOpts[] = +{ + packDuMacStatsInd, /* packing for loosely coupled */ + DuProcMacStatsInd, /* packing for tightly coupled */ + packDuMacStatsInd /* packing for light weight loosly coupled */ +}; + + /******************************************************************* * * @brief Sends DL BO Info to SCH @@ -86,6 +94,78 @@ uint8_t sendCrcIndMacToSch(CrcIndInfo *crcInd) return(SchMessageRouter(&pst, (void *)crcInd)); } +/******************************************************************* + * + * @brief Sends UL CQI Indication to SCH + * + * @details + * + * Function : sendUlCqiIndMacToSch + * + * Functionality: + * Sends Ul Cqi Indication to SCH + * + * @params[in] + * @return ROK - success + * RFAILED - failure + * + ****************************************************************/ +uint8_t sendUlCqiIndMacToSch(SchUlCqiInd *ulCqiInd) +{ + Pst pst; + + FILL_PST_MAC_TO_SCH(pst, EVENT_UL_CQI_TO_SCH); + return(SchMessageRouter(&pst, (void *)ulCqiInd)); +} + +/******************************************************************* + * + * @brief Sends DL CQI Indication to SCH + * + * @details + * + * Function : sendDlCqiIndMacToSch + * + * Functionality: + * Sends Dl Cqi Indication to SCH + * + * @params[in] + * @return ROK - success + * RFAILED - failure + * + ****************************************************************/ +uint8_t sendDlCqiIndMacToSch(SchDlCqiInd *dlCqiInd) +{ + Pst pst; + + FILL_PST_MAC_TO_SCH(pst, EVENT_DL_CQI_TO_SCH); + return(SchMessageRouter(&pst, (void *)dlCqiInd)); +} + +/******************************************************************* + * + * @brief Sends Power Headroom Indication to SCH + * + * @details + * + * Function : sendPhrIndToSch + * + * Functionality: + * Sends Phr Indication to SCH + * + * @params[in] + * @return ROK - success + * RFAILED - failure + * + ****************************************************************/ +uint8_t sendPhrIndToSch(SchPwrHeadroomInd *macPhrInd) +{ + Pst pst; + + FILL_PST_MAC_TO_SCH(pst, EVENT_PHR_IND_TO_SCH); + return(SchMessageRouter(&pst, (void *)macPhrInd)); +} + /******************************************************************* * * @brief Processes CRC Indication from PHY @@ -190,7 +270,6 @@ uint8_t MacProcRlcDlData(Pst* pstInfo, RlcDlData *dlData) 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; @@ -222,29 +301,25 @@ uint8_t MacProcRlcDlData(Pst* pstInfo, RlcDlData *dlData) currDlSlot = &macCb.macCell[cellIdx]->dlSlot[dlData->slotInfo.slot]; if(currDlSlot->dlInfo.dlMsgAlloc[ueId-1]) { - for(schInfoIdx=0; schInfoIdxdlInfo.dlMsgAlloc[ueId-1]->numSchedInfo; schInfoIdx++) - { - if((currDlSlot->dlInfo.dlMsgAlloc[ueId-1]->dlMsgSchedInfo[schInfoIdx].pduPres == PDSCH_PDU) || - (currDlSlot->dlInfo.dlMsgAlloc[ueId-1]->dlMsgSchedInfo[schInfoIdx].pduPres == BOTH)) - break; - } - - txPduLen = currDlSlot->dlInfo.dlMsgAlloc[ueId-1]->dlMsgSchedInfo[schInfoIdx].dlMsgPdschCfg.codeword[0].tbSize\ - - TX_PAYLOAD_HDR_LEN; - MAC_ALLOC(txPdu, txPduLen); - if(!txPdu) + if(currDlSlot->dlInfo.dlMsgAlloc[ueId-1]->dlMsgPdschCfg) { - DU_LOG("\nERROR --> MAC : Memory allocation failed in MacProcRlcDlData"); - return RFAILED; + txPduLen = currDlSlot->dlInfo.dlMsgAlloc[ueId-1]->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]->dlMsgPduLen = txPduLen; + currDlSlot->dlInfo.dlMsgAlloc[ueId-1]->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]->dlMsgPdschCfg->codeword[0].tbSize, txPdu); } - 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++) @@ -399,11 +474,11 @@ uint8_t sendSchedRptToRlc(DlSchedInfo dlInfo, SlotTimingInfo slotInfo, uint8_t u if(dlInfo.dlMsgAlloc[ueIdx]) { schedRpt->rnti = dlInfo.dlMsgAlloc[ueIdx]->crnti; - schedRpt->numLc = dlInfo.dlMsgAlloc[ueIdx]->dlMsgSchedInfo[schInfoIdx].numLc; + schedRpt->numLc = dlInfo.dlMsgAlloc[ueIdx]->transportBlock[0].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].lcId = dlInfo.dlMsgAlloc[ueIdx]->transportBlock[0].lcSchInfo[lcIdx].lcId; + schedRpt->lcSch[lcIdx].bufSize = dlInfo.dlMsgAlloc[ueIdx]->transportBlock[0].lcSchInfo[lcIdx].schBytes; } } @@ -697,7 +772,7 @@ uint8_t macProcLongBsr(uint16_t cellId, uint16_t crnti,uint8_t numLcg,\ * RFAILED - failure * * ****************************************************************/ -uint8_t buildAndSendHarqInd(HarqInfoF0F1 *harqInfo, uint8_t crnti, uint16_t cellIdx, SlotTimingInfo *slotInd) +uint8_t buildAndSendHarqInd(HarqInfoF0F1 *harqInfo, uint16_t crnti, uint16_t cellIdx, SlotTimingInfo *slotInd) { uint16_t harqCounter=0; Pst pst; @@ -740,7 +815,7 @@ uint8_t buildAndSendHarqInd(HarqInfoF0F1 *harqInfo, uint8_t crnti, uint16_t cell * RFAILED - failure * * ****************************************************************/ -uint8_t buildAndSendSrInd(UciInd *macUciInd, uint8_t crnti) +uint8_t buildAndSendSrInd(UciInd *macUciInd, uint16_t crnti) { uint16_t cellIdx; Pst pst; @@ -847,8 +922,8 @@ uint8_t FapiMacUciInd(Pst *pst, UciInd *macUciInd) **********************************************************************/ uint8_t fillSliceCfgInfo(SchSliceCfgReq *schSliceCfgReq, MacSliceCfgReq *macSliceCfgReq) { - uint8_t cfgIdx = 0, memberListIdx = 0, totalSliceCfgRecvd = 0; - + uint8_t rrmPolicyIdx= 0,cfgIdx = 0, memberListIdx = 0, totalSliceCfgRecvd = 0; + if(macSliceCfgReq->listOfRrmPolicy) { for(cfgIdx = 0; cfgIdxnumOfRrmPolicy; cfgIdx++) @@ -863,11 +938,13 @@ uint8_t fillSliceCfgInfo(SchSliceCfgReq *schSliceCfgReq, MacSliceCfgReq *macSlic DU_LOG("\nERROR --> MAC : Memory allocation failed in fillSliceCfgInfo"); return RFAILED; } - for(cfgIdx = 0; cfgIdxnumOfConfiguredSlice; cfgIdx++) + cfgIdx = 0; + + for(rrmPolicyIdx = 0; rrmPolicyIdxnumOfRrmPolicy; rrmPolicyIdx++) { - for(memberListIdx = 0; memberListIdxlistOfRrmPolicy[cfgIdx]->numOfRrmPolicyMem; memberListIdx++) + for(memberListIdx = 0; memberListIdxlistOfRrmPolicy[rrmPolicyIdx]->numOfRrmPolicyMem; memberListIdx++) { - if(macSliceCfgReq->listOfRrmPolicy[cfgIdx]->rRMPolicyMemberList[memberListIdx]) + if(macSliceCfgReq->listOfRrmPolicy[rrmPolicyIdx]->rRMPolicyMemberList[memberListIdx]) { MAC_ALLOC(schSliceCfgReq->listOfSlices[cfgIdx], sizeof(SchRrmPolicyOfSlice)); @@ -877,11 +954,12 @@ uint8_t fillSliceCfgInfo(SchSliceCfgReq *schSliceCfgReq, MacSliceCfgReq *macSlic return RFAILED; } - memcpy(&schSliceCfgReq->listOfSlices[cfgIdx]->snssai, &macSliceCfgReq->listOfRrmPolicy[cfgIdx]->rRMPolicyMemberList[memberListIdx]->snssai, sizeof(Snssai)); + memcpy(&schSliceCfgReq->listOfSlices[cfgIdx]->snssai, &macSliceCfgReq->listOfRrmPolicy[rrmPolicyIdx]->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; + schSliceCfgReq->listOfSlices[cfgIdx]->rrmPolicyRatioInfo.maxRatio = macSliceCfgReq->listOfRrmPolicy[rrmPolicyIdx]->policyRatio.maxRatio; + schSliceCfgReq->listOfSlices[cfgIdx]->rrmPolicyRatioInfo.minRatio = macSliceCfgReq->listOfRrmPolicy[rrmPolicyIdx]->policyRatio.minRatio; + schSliceCfgReq->listOfSlices[cfgIdx]->rrmPolicyRatioInfo.dedicatedRatio = macSliceCfgReq->listOfRrmPolicy[rrmPolicyIdx]->policyRatio.dedicatedRatio; + cfgIdx++; } } } @@ -987,6 +1065,77 @@ uint8_t MacProcSliceRecfgReq(Pst *pst, MacSliceRecfgReq *macSliceRecfgReq) return ret; } +/** + * @brief Mac process the statistics indication received from sch. + * + * @details + * + * Function : MacProcSchStatsInd + * + * This function process the statistics indication received from sch + * + * @param[in] Pst *pst + * @param[in] SchStatsInd *schStatsInd + * @return int + * -# ROK + **/ +uint8_t MacProcSchStatsInd(Pst *pst, SchStatsInd *schStatsInd) +{ + uint8_t statsIdx = 0; + Pst indPst; + MacStatsInd *macStatsInd; + +#ifdef DEBUG_PRINT + DU_LOG("\nDEBUG --> MAC : MacProcSchStatsInd: Received Statistics Indication from SCH"); +#endif + + if(schStatsInd == NULLP) + { + DU_LOG("\nERROR --> MAC : MacProcSchStatsInd: NULL pointer :schStatsInd"); + return RFAILED; + } + + MAC_ALLOC_SHRABL_BUF(macStatsInd, sizeof(MacStatsInd)); + if(macStatsInd == NULLP) + { + DU_LOG("\nERROR --> MAC : Failed to allocate memory in MacProcSchStatsInd"); + return RFAILED; + } + + macStatsInd->subscriptionId = schStatsInd->subscriptionId; + macStatsInd->groupId = schStatsInd->groupId; + + for(statsIdx = 0; statsIdx < schStatsInd->numStats; statsIdx++) + { + switch(schStatsInd->measuredStatsList[statsIdx].type) + { + case SCH_DL_TOTAL_PRB_USAGE: + { + macStatsInd->measuredStatsList[statsIdx].type = MAC_DL_TOTAL_PRB_USAGE; + break; + } + case SCH_UL_TOTAL_PRB_USAGE: + { + macStatsInd->measuredStatsList[statsIdx].type = MAC_UL_TOTAL_PRB_USAGE; + break; + } + default: + { + DU_LOG("\nERROR --> MAC : MacProcSchStatsInd: Invalid measurement type [%d]", \ + schStatsInd->measuredStatsList[statsIdx].type); + MAC_FREE_SHRABL_BUF(MAC_MEM_REGION, MAC_POOL, macStatsInd, sizeof(MacStatsInd)); + return RFAILED; + } + } + macStatsInd->measuredStatsList[statsIdx].value = schStatsInd->measuredStatsList[statsIdx].value; + } + macStatsInd->numStats = schStatsInd->numStats; + + memset(&indPst, 0, sizeof(Pst)); + FILL_PST_MAC_TO_DUAPP(indPst, EVENT_MAC_STATISTICS_IND); + return (*macDuStatsIndOpts[indPst.selector])(&indPst, macStatsInd); +} + /********************************************************************** End of file **********************************************************************/