X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fphy_stub%2Fphy_stub_msg_hdl.c;h=79d973f0d9857aebce6e08388b2673826a1110ac;hb=aa2b46912637dd3c7b52af75779f20af79f483e5;hp=8ee5d1bfa45afb969cbc9d9ec989d132068822f3;hpb=7602d994b0efa53be2a79b8f66a8d83be8b5420d;p=o-du%2Fl2.git diff --git a/src/phy_stub/phy_stub_msg_hdl.c b/src/phy_stub/phy_stub_msg_hdl.c index 8ee5d1bfa..79d973f0d 100644 --- a/src/phy_stub/phy_stub_msg_hdl.c +++ b/src/phy_stub/phy_stub_msg_hdl.c @@ -30,10 +30,11 @@ #include "fapi.h" #include "fapi_vendor_extension.h" #endif -#include "lphy_stub.h" #include "lwr_mac_upr_inf.h" #include "mac_utils.h" #include "phy_stub.h" +#include "phy_stub_utils.h" +#include "lwr_mac_phy_stub_inf.h" /******************************************************************* * @@ -244,6 +245,8 @@ void l1HdlParamReq(uint32_t msgLen, void *msg) void l1HdlConfigReq(uint32_t msgLen, void *msg) { + memset(&ueDb, 0, sizeof(UeDb)); + #ifdef INTEL_FAPI p_fapi_api_queue_elem_t configReqElem = (p_fapi_api_queue_elem_t)msg; fapi_config_req_t *configReq = (fapi_config_req_t *)(configReqElem +1); @@ -338,7 +341,7 @@ uint16_t l1BuildAndSendCrcInd(uint16_t slot, uint16_t sfn) * ****************************************************************/ uint16_t l1BuildAndSendRxDataInd(uint16_t slot, uint16_t sfn, fapi_ul_pusch_pdu_t puschPdu) { - uint8_t idx = 0; + uint8_t idx = 0, ueId = 0; fapi_rx_data_indication_t *rxDataInd =NULLP; fapi_pdu_ind_info_t *pduInfo =NULLP; uint8_t *pdu = NULLP; @@ -346,35 +349,38 @@ uint16_t l1BuildAndSendRxDataInd(uint16_t slot, uint16_t sfn, fapi_ul_pusch_pdu_ uint32_t msgLen = 0; MsgType type = 0; - if(!msg3Sent) + GET_UE_IDX(puschPdu.rnti, ueId); + if(!ueDb.ueCb[ueId-1].msg3Sent) { - msg3Sent = true; + ueDb.ueCb[ueId-1].ueId = ueId; + ueDb.ueCb[ueId-1].crnti = puschPdu.rnti; + ueDb.ueCb[ueId-1].msg3Sent = true; type = MSG_TYPE_MSG3; sleep(2); } - else if(!msg5ShortBsrSent) + else if(!ueDb.ueCb[ueId-1].msg5ShortBsrSent) { - msg5ShortBsrSent = true; + ueDb.ueCb[ueId-1].msg5ShortBsrSent = true; type = MSG_TYPE_SHORT_BSR; } - else if(!msg5Sent) + else if(!ueDb.ueCb[ueId-1].msg5Sent) { - msg5Sent = true; + ueDb.ueCb[ueId-1].msg5Sent = true; type = MSG_TYPE_MSG5; } - else if(!msgRegistrationComp) + else if(!ueDb.ueCb[ueId-1].msgRegistrationComp) { - msgRegistrationComp = true; + ueDb.ueCb[ueId-1].msgRegistrationComp = true; type = MSG_TYPE_REGISTRATION_COMPLETE; } - else if(!msgSecurityModeComp) + else if(!ueDb.ueCb[ueId-1].msgSecurityModeComp) { - msgSecurityModeComp = true; + ueDb.ueCb[ueId-1].msgSecurityModeComp = true; type = MSG_TYPE_SECURITY_MODE_COMPLETE; } - else if(!msgRrcReconfiguration) + else if(!ueDb.ueCb[ueId-1].msgRrcReconfiguration) { - msgRrcReconfiguration = true; + ueDb.ueCb[ueId-1].msgRrcReconfiguration = true; type = MSG_TYPE_RRC_RECONFIG_COMPLETE; } else @@ -639,10 +645,13 @@ uint16_t l1BuildAndSendRachInd(uint16_t slot, uint16_t sfn) * ****************************************************************/ uint16_t l1BuildAndSendSlotIndication() { + Pst pst; + Buffer *mBuf; + #ifdef INTEL_FAPI fapi_slot_ind_t *slotIndMsg; - MAC_ALLOC(slotIndMsg, sizeof(fapi_slot_ind_t)); + MAC_ALLOC_SHRABL_BUF(slotIndMsg, sizeof(fapi_slot_ind_t)); if(!slotIndMsg) { DU_LOG("\nERROR --> PHY_STUB: Memory allocation failed for slot Indication Message"); @@ -655,24 +664,36 @@ uint16_t l1BuildAndSendSlotIndication() slotIndMsg->slot = slotValue; #ifdef ODU_SLOT_IND_DEBUG_LOG - DU_LOG("\n\nDEBUG --> PHY_STUB: SLOT indication [%d:%d]",sfnValue,slotValue); + DU_LOG("\n\nDEBUG --> PHY_STUB: Sending Slot Indication [%d : %d] to MAC", sfnValue, slotValue); #endif + /* increment for the next TTI */ slotValue++; if(sfnValue >= MAX_SFN_VALUE && slotValue > MAX_SLOT_VALUE) { - sfnValue = 0; - slotValue = 0; + sfnValue = 0; + slotValue = 0; } else if(slotValue > MAX_SLOT_VALUE) { - sfnValue++; - slotValue = 0; + sfnValue++; + slotValue = 0; } fillMsgHeader(&slotIndMsg->header, FAPI_SLOT_INDICATION, \ - sizeof(fapi_slot_ind_t) - sizeof(fapi_msg_t)); - procPhyMessages(slotIndMsg->header.msg_id, sizeof(fapi_slot_ind_t), (void*)slotIndMsg); - MAC_FREE(slotIndMsg, sizeof(fapi_slot_ind_t)); + sizeof(fapi_slot_ind_t) - sizeof(fapi_msg_t)); + + memset(&pst, 0, sizeof(Pst)); + FILL_PST_PHY_STUB_TO_LWR_MAC(pst, EVT_PHY_STUB_SLOT_IND); + + ODU_GET_MSG_BUF(pst.region, pst.pool, &mBuf); + if(!mBuf) + { + DU_LOG("\nERROR --> PHY_STUB: Failed to allocate memory for slot indication buffer"); + MAC_FREE_SHRABL_BUF(pst.region, pst.pool, slotIndMsg, sizeof(fapi_slot_ind_t)); + return RFAILED; + } + CMCHKPK(oduPackPointer, (PTR)slotIndMsg, mBuf); + ODU_POST_TASK(&pst, mBuf); } #endif return ROK; @@ -760,12 +781,7 @@ S16 l1HdlDlTtiReq(uint16_t msgLen, void *msg) } else if(dlTtiReq->pdus[pduCount].pduType == 0) { - DU_LOG("\nINFO --> PHY_STUB: PDCCH PDU"); - if(dlTtiReq->pdus[pduCount].pdu.pdcch_pdu.\ - coreSetType == 1) - { - dlDedMsg = true; - } + DU_LOG("\nINFO --> PHY_STUB: PDCCH PDU"); } else if(dlTtiReq->pdus[pduCount].pduType == 1) { @@ -804,11 +820,13 @@ S16 l1HdlTxDataReq(uint16_t msgLen, void *msg) fapi_tx_data_req_t *txDataReq = (fapi_tx_data_req_t *)(txDataElem +1); DU_LOG("\nINFO --> PHY STUB: TX DATA Request at sfn=%d slot=%d",txDataReq->sfn,txDataReq->slot); +/* if(dlDedMsg) { DU_LOG("\nINFO --> PHY_STUB: TxDataPdu for DED MSG sent"); dlDedMsg = false; } +*/ MAC_FREE(msg, msgLen); #endif return ROK; @@ -1024,12 +1042,30 @@ S16 l1HdlUlTtiReq(uint16_t msgLen, void *msg) numPdus--; } - if(rachIndSent == false && ulTtiReq->sfn == 16 && ulTtiReq->slot == 6) + /* TODO: [SFN:SLOT] at which RACH Indication is sent should be calculated + * based on PRACH cfg index */ + /* Send RACH Ind to L2 for first UE */ + if(ueDb.ueCb[UE_IDX_0].rachIndSent == false && ulTtiReq->sfn == 16 && ulTtiReq->slot == 6) + { + ueDb.ueCb[UE_IDX_0].rachIndSent = true; + l1BuildAndSendRachInd(ulTtiReq->slot, ulTtiReq->sfn); + ueDb.numActvUe++; + } + /* Send RACH Ind to L2 for second UE */ + if(ueDb.ueCb[UE_IDX_1].rachIndSent == false && ulTtiReq->sfn == 304 && ulTtiReq->slot == 0) { - rachIndSent = true; + ueDb.ueCb[UE_IDX_1].rachIndSent = true; l1BuildAndSendRachInd(ulTtiReq->slot, ulTtiReq->sfn); + ueDb.numActvUe++; } + /* Send RACH Ind to L2 for third UE */ + if(ueDb.ueCb[UE_IDX_2].rachIndSent == false && ulTtiReq->sfn == 526 && ulTtiReq->slot == 0) + { + ueDb.ueCb[UE_IDX_2].rachIndSent = true; + l1BuildAndSendRachInd(ulTtiReq->slot, ulTtiReq->sfn); + ueDb.numActvUe++; + } MAC_FREE(msg, msgLen); #endif return ROK; @@ -1053,10 +1089,12 @@ S16 l1HdlUlTtiReq(uint16_t msgLen, void *msg) uint16_t l1BuildAndSendStopInd() { #ifdef INTEL_FAPI + Pst pst; + Buffer *mBuf = NULLP; fapi_stop_ind_t *stopIndMsg = NULLP; uint32_t msgLen = 0; - MAC_ALLOC(stopIndMsg, sizeof(fapi_stop_ind_t)); + MAC_ALLOC_SHRABL_BUF(stopIndMsg, sizeof(fapi_stop_ind_t)); if(!stopIndMsg) { DU_LOG("\nERROR --> PHY_STUB: Memory allocation failed for stop Indication Message"); @@ -1066,9 +1104,18 @@ uint16_t l1BuildAndSendStopInd() { fillMsgHeader(&stopIndMsg->header, FAPI_STOP_INDICATION, msgLen); DU_LOG("\n\nINFO --> PHY_STUB: Processing Stop indication to MAC"); - procPhyMessages(stopIndMsg->header.msg_id,\ - sizeof(fapi_stop_ind_t), (void*)stopIndMsg); - MAC_FREE(stopIndMsg, sizeof(fapi_stop_ind_t)); + + memset(&pst, 0, sizeof(Pst)); + FILL_PST_PHY_STUB_TO_LWR_MAC(pst, EVT_PHY_STUB_STOP_IND); + ODU_GET_MSG_BUF(pst.region, pst.pool, &mBuf); + if(!mBuf) + { + DU_LOG("\nERROR --> PHY_STUB: Failed to allocate memory for slot indication buffer"); + MAC_FREE_SHRABL_BUF(pst.region, pst.pool, stopIndMsg, sizeof(fapi_stop_ind_t)); + return RFAILED; + } + CMCHKPK(oduPackPointer, (PTR)stopIndMsg, mBuf); + ODU_POST_TASK(&pst, mBuf); } #endif return ROK; @@ -1098,8 +1145,13 @@ S16 l1HdlStopReq(uint32_t msgLen, void *msg) if(lwrMacCb.phyState == PHY_STATE_RUNNING) { l1HdlSlotIndicaion(TRUE); + + /* Initialize all global variables */ + sfnValue = 0; + slotValue = 0; + memset(&ueDb, 0, sizeof(UeDb)); + DU_LOG("\nINFO --> PHY_STUB: Slot Indication is stopped successfully"); - l1BuildAndSendStopInd(); MAC_FREE(msg, msgLen); } else @@ -1112,6 +1164,7 @@ S16 l1HdlStopReq(uint32_t msgLen, void *msg) return ROK; } +#if 0 /******************************************************************* * * @brief Build And Send Rx Data Ind for Msg5 @@ -1215,6 +1268,7 @@ uint8_t l1BuildAndSendMsg5(uint16_t sfn, uint16_t slot) #endif return ROK; } +#endif /******************************************************************* * @@ -1272,7 +1326,7 @@ S16 l1HdlUlDciReq(uint16_t msgLen, void *msg) * RFAILED - failure * * ****************************************************************/ -uint8_t l1SendUlUserData() +uint8_t l1SendUlUserData(uint8_t drbId, uint8_t ueIdx) { uint8_t cnt = 0; fapi_rx_data_indication_t *rxDataInd; @@ -1281,6 +1335,7 @@ uint8_t l1SendUlUserData() uint16_t byteIdx = 0; uint32_t msgLen = 0; uint8_t idx = 0; + uint8_t lcId = 0; MAC_ALLOC(rxDataInd, sizeof(fapi_rx_data_indication_t)); if(!rxDataInd) @@ -1297,8 +1352,8 @@ uint8_t l1SendUlUserData() /* TODO : Fill pduInfo using PUSCH PDU. Currently hardcoding */ pduInfo = &rxDataInd->pdus[idx]; - pduInfo->handle = 100; - pduInfo->rnti = 100; + pduInfo->handle = ueIdx + ODU_START_CRNTI; + pduInfo->rnti = ueIdx + ODU_START_CRNTI; pduInfo->harqId = 1; /* Since user data size = 50bytes and 2 bytes of MAC header and 3 byte of RLC header, * setting tbsize = 56 from Table 5.1.3.2-1 spec 38.214 */ @@ -1330,7 +1385,8 @@ uint8_t l1SendUlUserData() /* Below ulMsg supports 12bit SN for UM mode */ /* SI SN */ - uint8_t ulMsg[] = {4, msgLen, 0, 0, 0, 0, 0, 50, 0, 0, 0, 0, 0, 1, 0, 0, 192, 168, 130, 81, 192, 168, 130, 82, 84, 104, + lcId = MIN_DRB_LCID + drbId; + uint8_t ulMsg[] = {lcId, msgLen, 0, 0, 0, 0, 0, 50, 0, 0, 0, 0, 0, 1, 0, 0, 192, 168, 130, 81, 192, 168, 130, 82, 84, 104, 105, 115, 32, 105, 115, 32, 69, 71, 84, 80, 32, 100, 97, 116, 97, 32, 102, 114, 111, 109, 32, 68, 85, 0, 0, 0, 0, 0}; msgLen += 2; /* 2bytes of header */ memcpy(pdu, &ulMsg, msgLen); @@ -1354,9 +1410,9 @@ uint8_t l1SendUlUserData() fillMsgHeader(&rxDataInd->header, FAPI_RX_DATA_INDICATION, msgLen); /* Send Message to peer */ - while(cnt < 2) + while(cnt < NUM_UL_PACKETS) { - DU_LOG("\nDEBUG --> PHY STUB : Sending UL User Data[%d] at sfn %d slot %d", cnt+1, sfnValue, slotValue); + DU_LOG("\nDEBUG --> PHY STUB : Sending UL User Data[%d][LCID:%d] at sfn %d slot %d", cnt+1, lcId, sfnValue, slotValue); /* Sending Rx data indication to MAC */ rxDataInd->sfn = sfnValue; rxDataInd->slot = slotValue; @@ -1499,35 +1555,179 @@ void l1ProcessFapiRequest(uint8_t msgType, uint32_t msgLen, void *msg) { #ifdef INTEL_FAPI case FAPI_PARAM_REQUEST: - l1HdlParamReq(msgLen, msg); - break; + l1HdlParamReq(msgLen, msg); + break; case FAPI_CONFIG_REQUEST: - l1HdlConfigReq(msgLen, msg); - break; + l1HdlConfigReq(msgLen, msg); + break; case FAPI_START_REQUEST: - l1HdlStartReq(msgLen, msg); - break; + l1HdlStartReq(msgLen, msg); + break; case FAPI_DL_TTI_REQUEST: - l1HdlDlTtiReq(msgLen, msg); - break; + l1HdlDlTtiReq(msgLen, msg); + break; case FAPI_TX_DATA_REQUEST: - l1HdlTxDataReq(msgLen, msg); - break; + l1HdlTxDataReq(msgLen, msg); + break; case FAPI_UL_TTI_REQUEST: - l1HdlUlTtiReq(msgLen, msg); - break; + l1HdlUlTtiReq(msgLen, msg); + break; case FAPI_STOP_REQUEST: - l1HdlStopReq(msgLen, msg); - break; + l1HdlStopReq(msgLen, msg); + break; case FAPI_UL_DCI_REQUEST: - l1HdlUlDciReq(msgLen, msg); - break; + l1HdlUlDciReq(msgLen, msg); + break; default: - DU_LOG("\nERROR --> PHY_STUB: Invalid message type[%x] received at PHY", msgType); - break; + DU_LOG("\nERROR --> PHY_STUB: Invalid message type[%x] received at PHY", msgType); + break; #endif } } + +#ifdef INTEL_FAPI +/******************************************************************* + * + * @brief Builds and Send the BSR message to MAC + * + * @details + * + * Function : l1BuildAndSendBSR + * + * Functionality: + * -Send the BSR Message to MAC + * + * @params[in] BSR type + * array of LCGID and BSIdx + * @return void + * + *****************************************************************/ +uint16_t l1BuildAndSendBSR(uint8_t ueIdx, BsrType bsrType,\ + LcgBufferSize lcgBsIdx[MAX_NUM_LOGICAL_CHANNEL_GROUPS]) +{ + fapi_rx_data_indication_t *rxDataInd; + fapi_pdu_ind_info_t *pduInfo; + uint8_t *pdu = NULLP; + uint16_t byteIdx = 0; + uint32_t msgLen = 0; + uint8_t pduIdx = 0, lcgIdx = 0, lcgIdxPos = 0; + + MAC_ALLOC(rxDataInd, sizeof(fapi_rx_data_indication_t)); + if(!rxDataInd) + { + DU_LOG("\nERROR --> PHY_STUB: Memory allocation failed for Rx Data Indication"); + return RFAILED; + } + memset(rxDataInd, 0, sizeof(fapi_rx_data_indication_t)); + + msgLen = sizeof(fapi_rx_data_indication_t) - sizeof(fapi_msg_t); + rxDataInd->sfn = 0; + rxDataInd->slot = 0; + rxDataInd->numPdus = 1; + + pduInfo = &rxDataInd->pdus[pduIdx]; + pduInfo->handle = (ODU_START_CRNTI + ueIdx); + pduInfo->rnti = (ODU_START_CRNTI + ueIdx); + pduInfo->harqId = 1; + + /* Since status pdu size = 3bytes and 2 bytes of MAC header, + * setting tbsize = 24 from Table 5.1.3.2-1 spec 38.214 */ + pduInfo->pdu_length = 24; + pduInfo->ul_cqi = 0; + pduInfo->timingAdvance = 0; + pduInfo->rssi = 0; + + /* Filling pdu with random values for testing */ + pduInfo->pduData = NULL; + MAC_ALLOC(pduInfo->pduData, pduInfo->pdu_length); + if(!pduInfo->pduData) + { + DU_LOG("\nERROR --> PHY_STUB: Memory allocation failed for Rx Data Pdu"); + MAC_FREE(rxDataInd, sizeof(fapi_rx_data_indication_t)); + return RFAILED; + } + + /* Filling PDU */ + pdu = (uint8_t *)pduInfo->pduData; + + switch(bsrType) + { + case SHORT_BSR: + { + DU_LOG("\nDEBUG --> PHY_STUB: Forming SHORT BSR PDU "); + + /* For Short BSR + * MAC subheader format is R/R/LcId (1Byte) + * LCId is 61 + * From 38.321 section 6.1.1 + */ + pdu[byteIdx++] = 61; // LCID + pdu[byteIdx++] = (lcgBsIdx[0].lcgId << 5) | lcgBsIdx[0].bsIdx; + break; + } + + case LONG_BSR: + { + DU_LOG("\nDEBUG --> PHY_STUB: Forming LONG BSR PDU "); + + /* For Long BSR + * MAC subheader format is R/R/LcId (1Byte) + * LCId is 62 + * From 38.321 section 6.1.1 + */ + pdu[byteIdx++] = 62; // LCID + + /*Octet where lcgId bitmap will be present*/ + lcgIdxPos = byteIdx; + byteIdx++; + for(lcgIdx = 0; lcgIdx < MAX_NUM_LOGICAL_CHANNEL_GROUPS; lcgIdx++) + { + if(lcgBsIdx[lcgIdx].bsIdx > 0) + { + pdu[lcgIdxPos] |= 1 << lcgBsIdx[lcgIdx].lcgId; + pdu[byteIdx++] = lcgBsIdx[lcgIdx].bsIdx; + } + } + + break; + } + + default: + { + DU_LOG("\nERROR --> PHY_STUB: Incorrect BSR type:%d!", bsrType); + if(pduInfo->pdu_length) + MAC_FREE(pduInfo->pduData, pduInfo->pdu_length); + MAC_FREE(rxDataInd, sizeof(fapi_rx_data_indication_t)); + return RFAILED; + } + } + /* Filling MAC SDU for Padding bytes*/ + if(byteIdx < pduInfo->pdu_length) + { + /* For Padding + * MAC subheader format is R/R/LCId (1byte) + * LCId is 63 for padding + * From 38.321 section 6.1.1 + */ + pdu[byteIdx++] = 63; + + for(; byteIdx < pduInfo->pdu_length; byteIdx++) + pdu[byteIdx] = 0; + } + msgLen += pduInfo->pdu_length; + fillMsgHeader(&rxDataInd->header, FAPI_RX_DATA_INDICATION, msgLen); + + /* Sending Rx data indication to MAC */ + DU_LOG("\nINFO --> PHY STUB: Sending Rx data Indication to MAC"); + procPhyMessages(rxDataInd->header.msg_id, sizeof(fapi_rx_data_indication_t), (void *)rxDataInd); + + if(pduInfo->pdu_length) + MAC_FREE(pduInfo->pduData, pduInfo->pdu_length); + MAC_FREE(rxDataInd, sizeof(fapi_rx_data_indication_t)); + return ROK; +} +#endif + /********************************************************************** End of file **********************************************************************/