X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Flwr_mac_fsm.c;h=47a681e4b6c46383407c291b1098820d269501f7;hb=4fc13842d17b3cce83876c95cba9eef4b2a413dd;hp=820a73f26d32b249587338d1b4dc2558c1f24d83;hpb=9fc4986e02c1ab2be2a9276cdfbf049c55af88e6;p=o-du%2Fl2.git diff --git a/src/5gnrmac/lwr_mac_fsm.c b/src/5gnrmac/lwr_mac_fsm.c index 820a73f26..47a681e4b 100644 --- a/src/5gnrmac/lwr_mac_fsm.c +++ b/src/5gnrmac/lwr_mac_fsm.c @@ -68,9 +68,13 @@ #define PDCCH_PDU_TYPE 0 #define PDSCH_PDU_TYPE 1 #define SSB_PDU_TYPE 3 +#define PRACH_PDU_TYPE 0 +#define PDU_PRESENT 1 #define SETLENGTH(x, size) x += size extern void fapiMacConfigRsp(); +extern uint8_t UnrestrictedSetNcsTable[MAX_ZERO_CORR_CFG_IDX]; + /* Global variables */ SlotIndInfo slotIndInfo; uint8_t slotIndIdx; @@ -2482,15 +2486,274 @@ uint8_t calculatePduCount(DlBrdcstAlloc *cellBroadcastInfo) S16 handleDlTtiReq(CmLteTimingInfo *dlTtiReqtimingInfo) { #ifdef FAPI - uint8_t idx; + uint8_t idx; uint8_t nPdu = 0; + uint8_t numPduEncoded = 0; + uint32_t msgLen = 0; + fapi_dl_tti_req_t *dlTtiReq = NULLP; + fapi_dl_tti_req_pdu_t *dlTtiReqPdu = NULLP; + RgCellCb *cellCbParams = NULLP; + MacDlSlot *currDlSlot = NULLP; + MacCellCfg macCellCfg; + memset(&macCellCfg, 0, sizeof(MacCellCfg)); + Inst inst = 0; + + if(clGlobalCp.phyState == PHY_STATE_RUNNING) + { + cellCbParams = rgCb[inst].cell; + macCellCfg = cellCbParams->macCellCfg; + + if(dlTtiReqtimingInfo != NULLP) + { +#ifdef INTEL_WLS + WLS_MEM_ALLOC(dlTtiReq, sizeof(fapi_dl_tti_req_t)); +#else + MAC_ALLOC(dlTtiReq, sizeof(fapi_dl_tti_req_t)); +#endif + if(dlTtiReq != NULLP) + { + dlTtiReq->sfn = dlTtiReqtimingInfo->sfn; + dlTtiReq->slot = dlTtiReqtimingInfo->slot; + currDlSlot = &macCb.macCell->dlSlot[dlTtiReq->slot % MAX_SLOT_SUPPORTED]; + dlTtiReq->nPdus = calculatePduCount(&currDlSlot->cellBroadcastInfo); /* get total Pdus */ + nPdu = dlTtiReq->nPdus; + dlTtiReq->nGroup = 0; + if(dlTtiReq->nPdus > 0) + { +#ifdef INTEL_WLS + WLS_MEM_ALLOC(dlTtiReqPdu, (nPdu * sizeof(fapi_dl_tti_req_pdu_t))); +#else + MAC_ALLOC(dlTtiReqPdu, (nPdu * sizeof(fapi_dl_tti_req_pdu_t))); +#endif + if(currDlSlot->cellBroadcastInfo.ssbTrans) + { + if(dlTtiReqPdu != NULLP) + { + for(idx = 0; idx < currDlSlot->cellBroadcastInfo.ssbIdxSupported; idx++) + { + if(idx > 0) + dlTtiReq->pdus++; + fillSsbPdu(dlTtiReqPdu, &macCellCfg, currDlSlot, &msgLen, idx); + dlTtiReq->pdus = dlTtiReqPdu; + numPduEncoded++; + } + } + } + if(currDlSlot->cellBroadcastInfo.sib1Trans) + { + /* Filling SIB1 param */ + if(dlTtiReqPdu != NULLP) + { + if(numPduEncoded != nPdu) + { + dlTtiReq->pdus++; + dlTtiReqPdu = dlTtiReq->pdus; + fillPdcchPdu(dlTtiReqPdu, &currDlSlot->cellBroadcastInfo.\ + sib1Alloc.sib1PdcchCfg, &msgLen); + dlTtiReq->pdus = dlTtiReqPdu; + numPduEncoded++; + dlTtiReq->pdus++; + dlTtiReqPdu = dlTtiReq->pdus; + fillPdschPdu(dlTtiReqPdu,&currDlSlot->cellBroadcastInfo.\ + sib1Alloc.sib1PdschCfg, &msgLen); + dlTtiReq->pdus = dlTtiReqPdu; + numPduEncoded++; + } + } + } + msgLen += sizeof(fapi_dl_tti_req_t) - sizeof(fapi_msg_t); + fillMsgHeader(&dlTtiReq->header, FAPI_DL_TTI_REQUEST, msgLen); + /* TODO : Recheck the size / msglen to be sent to WLS_Put*/ + LwrMacSendToPhy(dlTtiReq->header.message_type_id, msgLen, (void *)dlTtiReq); + if(currDlSlot->cellBroadcastInfo.sib1Trans) + { + if(currDlSlot->cellBroadcastInfo.ssbTrans) + { + + MAC_FREE(dlTtiReq->pdus[1].u.pdcch_pdu.dlDci, + sizeof(fapi_dl_dci_t)); + } + else + { + + MAC_FREE(dlTtiReq->pdus[0].u.pdcch_pdu.dlDci, + sizeof(fapi_dl_dci_t)); + } + } + + MAC_FREE(dlTtiReqPdu, (nPdu * sizeof(fapi_dl_tti_req_pdu_t))); + } + else + { + msgLen = sizeof(fapi_dl_tti_req_t) - sizeof(fapi_msg_t); + fillMsgHeader(&dlTtiReq->header, FAPI_DL_TTI_REQUEST, msgLen); + /* TODO : Recheck the size / msglen to be sent to WLS_Put*/ + LwrMacSendToPhy(dlTtiReq->header.message_type_id, msgLen, (void *)dlTtiReq); + } + MAC_FREE(dlTtiReq, sizeof(fapi_dl_tti_req_t)); + return ROK; + } + else + { + DU_LOG("\nLOWER MAC: Failed to allocate memory for DL TTI Request"); + return RFAILED; + } + } + else + { + DU_LOG("\nLOWER MAC: Current TTI Info is NULL"); + return RFAILED; + } + } + else + { + lwr_mac_handleInvalidEvt(dlTtiReqtimingInfo); + } +#endif + return ROK; +} + +/*********************************************************************** + * + * @brief calculates the total size to be allocated for UL TTI Req + * + * @details + * + * Function : getnPdus + * + * Functionality: + * -calculates the total pdu count to be allocated for UL TTI Req + * + * @params[in] Pointer to fapi Ul TTI Req + * Pointer to CurrUlSlot + * @return count + * ********************************************************************/ +#ifdef FAPI +uint8_t getnPdus(fapi_ul_tti_req_t *ulTtiReq, MacUlSlot *currUlSlot) +{ + uint8_t pduCount = 0; + + if(currUlSlot != NULLP) + { + if(currUlSlot->ulCellInfo.dataType & SCH_DATATYPE_PRACH) + { + pduCount++; + ulTtiReq->rachPresent = PDU_PRESENT; + } + if(currUlSlot->ulCellInfo.dataType & SCH_DATATYPE_PUSCH_UCI) + { + pduCount++; + ulTtiReq->nUlsch = PDU_PRESENT; + } + if(currUlSlot->ulCellInfo.dataType & SCH_DATATYPE_UCI) + { + pduCount++; + ulTtiReq->nUlcch = PDU_PRESENT; + } + if(currUlSlot->ulCellInfo.dataType & SCH_DATATYPE_SRS) + { + pduCount++; + } + } + return pduCount; +} +#endif + +/*********************************************************************** + * + * @brief Set the value of zero correlation config in PRACH PDU + * + * @details + * + * Function : setNumCs + * + * Functionality: + * -Set the value of zero correlation config in PRACH PDU + * + * @params[in] Pointer to zero correlation config + * Pointer to MacCellCfg + * ********************************************************************/ + +void setNumCs(uint8_t *numCs, MacCellCfg *macCellCfg) +{ +#ifdef FAPI + uint8_t idx; + if(macCellCfg != NULLP) + { + idx = macCellCfg->prachCfg.fdm[0].zeroCorrZoneCfg; + *numCs = UnrestrictedSetNcsTable[idx]; + } +#endif +} + +/*********************************************************************** + * + * @brief Fills the PRACH PDU in UL TTI Request + * + * @details + * + * Function : fillPrachPdu + * + * Functionality: + * -Fills the PRACH PDU in UL TTI Request + * + * @params[in] Pointer to Prach Pdu + * Pointer to CurrUlSlot + * Pointer to macCellCfg + * Pointer to msgLen + * ********************************************************************/ + +#ifdef FAPI +void fillPrachPdu(fapi_ul_tti_req_pdu_t *ulTtiReqPdu, MacCellCfg *macCellCfg, MacUlSlot *currUlSlot, uint32_t *msgLen) +{ + if(ulTtiReqPdu != NULLP) + { + ulTtiReqPdu->pduType = PRACH_PDU_TYPE; + ulTtiReqPdu->u.prach_pdu.physCellId = macCellCfg->phyCellId; + ulTtiReqPdu->u.prach_pdu.numPrachOcas = currUlSlot->ulCellInfo.prachSchInfo.numPrachOcas; + ulTtiReqPdu->u.prach_pdu.prachFormat = \ + currUlSlot->ulCellInfo.prachSchInfo.prachFormat; + ulTtiReqPdu->u.prach_pdu.numRa = currUlSlot->ulCellInfo.prachSchInfo.numRa; + ulTtiReqPdu->u.prach_pdu.prachStartSymbol = \ + currUlSlot->ulCellInfo.prachSchInfo.prachStartSymb; + setNumCs(&ulTtiReqPdu->u.prach_pdu.numCs, macCellCfg); + ulTtiReqPdu->u.prach_pdu.beamforming.numPrgs = 0; + ulTtiReqPdu->u.prach_pdu.beamforming.prgSize = 0; + ulTtiReqPdu->u.prach_pdu.beamforming.digBfInterfaces = 0; + ulTtiReqPdu->u.prach_pdu.beamforming.pmi_bfi[0].pmIdx = 0; + ulTtiReqPdu->u.prach_pdu.beamforming.pmi_bfi[0].beamIdx[0].beamidx = 0; + ulTtiReqPdu->pduSize = sizeof(fapi_ul_prach_pdu_t); + SETLENGTH(*msgLen, sizeof(fapi_dl_pdsch_pdu_t)); + } +} +#endif + +/******************************************************************* + * + * @brief Sends UL TTI Request to PHY + * + * @details + * + * Function : handleUlTtiReq + * + * Functionality: + * -Sends FAPI Param req to PHY + * + * @params[in] Pointer to CmLteTimingInfo + * @return ROK - success + * RFAILED - failure + * + ******************************************************************/ +S16 handleUlTtiReq(CmLteTimingInfo *currTimingInfo) +{ +#ifdef FAPI uint32_t msgLen = 0; - fapi_dl_tti_req_t *dlTtiReq = NULLP; - fapi_dl_tti_req_pdu_t *dlTtiReqPdu = NULLP; + fapi_ul_tti_req_t *ulTtiReq = NULLP; + fapi_ul_tti_req_pdu_t *ulTtiReqPdu = NULLP; RgCellCb *cellCbParams = NULLP; - MacDlSlot *currDlSlot = NULLP; + MacUlSlot *currUlSlot = NULLP; MacCellCfg macCellCfg; - cmMemset((U8 *)&macCellCfg, 0, sizeof(MacCellCfg)); + memset(&macCellCfg, 0, sizeof(MacCellCfg)); Inst inst = 0; if(clGlobalCp.phyState == PHY_STATE_RUNNING) @@ -2498,89 +2761,65 @@ S16 handleDlTtiReq(CmLteTimingInfo *dlTtiReqtimingInfo) cellCbParams = rgCb[inst].cell; macCellCfg = cellCbParams->macCellCfg; - if(dlTtiReqtimingInfo != NULLP) + if(currTimingInfo != NULLP) { #ifdef INTEL_WLS - WLS_MEM_ALLOC(dlTtiReq, sizeof(fapi_dl_tti_req_t)); + WLS_MEM_ALLOC(ulTtiReq, sizeof(fapi_ul_tti_req_t)); #else - MAC_ALLOC(dlTtiReq, sizeof(fapi_dl_tti_req_t)); + MAC_ALLOC(ulTtiReq, sizeof(fapi_ul_tti_req_t)); #endif - if(dlTtiReq != NULLP) + if(ulTtiReq != NULLP) { - dlTtiReq->sfn = dlTtiReqtimingInfo->sfn; - dlTtiReq->slot = dlTtiReqtimingInfo->slot; - currDlSlot = &macCb.macCell->dlSlot[dlTtiReq->slot % MAX_SLOT_SUPPORTED]; - dlTtiReq->nPdus = calculatePduCount(&currDlSlot->cellBroadcastInfo); /* get total Pdus */ - nPdu = dlTtiReq->nPdus; - dlTtiReq->nGroup = 0; - if(dlTtiReq->nPdus > 0) + ulTtiReq->sfn = currTimingInfo->sfn; + ulTtiReq->slot = currTimingInfo->slot; + currUlSlot = &macCb.macCell->ulSlot[ulTtiReq->slot % MAX_SLOT_SUPPORTED]; + ulTtiReq->nPdus = getnPdus(ulTtiReq, currUlSlot); + ulTtiReq->nGroup = 0; + if(ulTtiReq->nPdus > 0) { #ifdef INTEL_WLS - WLS_MEM_ALLOC(dlTtiReqPdu, (nPdu * sizeof(fapi_dl_tti_req_pdu_t))); + WLS_MEM_ALLOC(ulTtiReqPdu, (ulTtiReq->nPdus * sizeof(fapi_ul_tti_req_pdu_t))); #else - MAC_ALLOC(dlTtiReqPdu, (nPdu * sizeof(fapi_dl_tti_req_pdu_t))); + MAC_ALLOC(ulTtiReqPdu, (ulTtiReq->nPdus * sizeof(fapi_ul_tti_req_pdu_t))); #endif - if(currDlSlot->cellBroadcastInfo.ssbTrans) + /* Fill Prach Pdu */ + if(ulTtiReq->rachPresent) { - if(dlTtiReqPdu != NULLP) + if(ulTtiReqPdu != NULLP) { - for(idx = 0; idx < currDlSlot->cellBroadcastInfo.ssbIdxSupported; idx++) - { - if(idx > 0) - dlTtiReq->pdus++; - fillSsbPdu(dlTtiReqPdu, &macCellCfg, currDlSlot, &msgLen, idx); - dlTtiReq->pdus = dlTtiReqPdu; - } + fillPrachPdu(ulTtiReqPdu, &macCellCfg, currUlSlot, &msgLen); + ulTtiReq->pdus = ulTtiReqPdu; } + msgLen = sizeof(fapi_ul_tti_req_t) - sizeof(fapi_msg_t); + fillMsgHeader(&ulTtiReq->header, FAPI_UL_TTI_REQUEST, msgLen); + LwrMacSendToPhy(ulTtiReq->header.message_type_id, msgLen, (void *)ulTtiReq); + MAC_FREE(ulTtiReqPdu, (ulTtiReq->nPdus * sizeof(fapi_ul_tti_req_pdu_t))); } - if(currDlSlot->cellBroadcastInfo.sib1Trans) - { - /* Filling SIB1 param */ - if(dlTtiReqPdu != NULLP) - { - dlTtiReq->pdus++; - fillPdcchPdu(dlTtiReqPdu, &currDlSlot->cellBroadcastInfo.sib1Alloc.sib1PdcchCfg, &msgLen); - dlTtiReq->pdus = dlTtiReqPdu; - dlTtiReq->pdus++; - fillPdschPdu(dlTtiReqPdu, &currDlSlot->cellBroadcastInfo.sib1Alloc.sib1PdschCfg, &msgLen); - dlTtiReq->pdus = dlTtiReqPdu; - } - } - msgLen += sizeof(fapi_dl_tti_req_t) - sizeof(fapi_msg_t); - fillMsgHeader(&dlTtiReq->header, FAPI_DL_TTI_REQUEST, msgLen); - /* TODO : Recheck the size / msglen to be sent to WLS_Put*/ - LwrMacSendToPhy(dlTtiReq->header.message_type_id, msgLen, (void *)dlTtiReq); - if(currDlSlot->cellBroadcastInfo.sib1Trans) - { - MAC_FREE(dlTtiReqPdu->u.pdcch_pdu.dlDci, sizeof(fapi_dl_dci_t)); - } - MAC_FREE(dlTtiReqPdu, (nPdu * sizeof(fapi_dl_tti_req_pdu_t))); - } - else - { - msgLen = sizeof(fapi_dl_tti_req_t) - sizeof(fapi_msg_t); - fillMsgHeader(&dlTtiReq->header, FAPI_DL_TTI_REQUEST, msgLen); - /* TODO : Recheck the size / msglen to be sent to WLS_Put*/ - LwrMacSendToPhy(dlTtiReq->header.message_type_id, msgLen, (void *)dlTtiReq); - } - MAC_FREE(dlTtiReq, sizeof(fapi_dl_tti_req_t)); - return ROK; + } + else + { + msgLen = sizeof(fapi_ul_tti_req_t) - sizeof(fapi_msg_t); + fillMsgHeader(&ulTtiReq->header, FAPI_UL_TTI_REQUEST, msgLen); + LwrMacSendToPhy(ulTtiReq->header.message_type_id, msgLen, (void *)ulTtiReq); + } + MAC_FREE(ulTtiReq, sizeof(fapi_ul_tti_req_t)); + return ROK; } - else - { - DU_LOG("\nLOWER MAC: Failed to allocate memory for DL TTI Request"); + else + { + DU_LOG("\nLOWER MAC: Failed to allocate memory for UL TTI Request"); return RFAILED; } } else { - DU_LOG("\nLOWER MAC: Current TTI Info is NULL"); + DU_LOG("\nLOWER MAC: Current TTI Info in UL is NULL"); return RFAILED; } } else { - lwr_mac_handleInvalidEvt(dlTtiReqtimingInfo); + lwr_mac_handleInvalidEvt(currTimingInfo); } #endif return ROK;