X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fphy_stub%2Fl1_bdy1.c;h=a7176a54d53d01265339b7092e736eebb5fc44b8;hb=ba2574ac618b40905509604da8d3a2b1b9e39664;hp=85a10f1217b5e36a77399b5a5efc24bf4782300c;hpb=0a26c487f1b6bbb5217e47b15fa8273b2e749283;p=o-du%2Fl2.git diff --git a/src/phy_stub/l1_bdy1.c b/src/phy_stub/l1_bdy1.c index 85a10f121..a7176a54d 100644 --- a/src/phy_stub/l1_bdy1.c +++ b/src/phy_stub/l1_bdy1.c @@ -27,6 +27,7 @@ #include "lwr_mac_phy.h" #ifdef INTEL_FAPI #include "fapi.h" +#include "fapi_vendor_extension.h" #endif #include "lphy_stub.h" #include "lwr_mac_upr_inf.h" @@ -183,6 +184,7 @@ S16 l1BldAndSndConfigRsp(void *msg) fillMsgHeader(&fapiConfigRsp->header, FAPI_CONFIG_RESPONSE, msgLen); DU_LOG("\nPHY_STUB: Sending Config Response to Lower Mac"); + procPhyMessages(fapiConfigRsp->header.msg_id, \ sizeof(fapi_config_resp_t), (void *)fapiConfigRsp); MAC_FREE(fapiConfigRsp, sizeof(fapi_config_resp_t)); @@ -242,17 +244,18 @@ void l1HdlParamReq(uint32_t msgLen, void *msg) void l1HdlConfigReq(uint32_t msgLen, void *msg) { #ifdef INTEL_FAPI - fapi_config_req_t *configReq = (fapi_config_req_t *)msg; + 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); DU_LOG("\nPHY_STUB: Received Config Request in PHY"); /* Handling CONFIG RESPONSE */ - if(l1BldAndSndConfigRsp(msg)!= ROK) + if(l1BldAndSndConfigRsp(configReq)!= ROK) { printf("\nPHY_STUB: Failed Sending config Response"); } - MAC_FREE(configReq, msgLen); + MAC_FREE(msg, msgLen); #endif } @@ -335,17 +338,18 @@ 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; - fapi_rx_data_indication_t *rxDataInd; - fapi_pdu_ind_info_t *pduInfo; - uint8_t *pdu; + fapi_rx_data_indication_t *rxDataInd =NULLP; + fapi_pdu_ind_info_t *pduInfo =NULLP; + uint8_t *pdu = NULLP; uint16_t byteIdx = 0; uint32_t msgLen = 0; - MsgType type; + MsgType type = 0; if(!msg3Sent) { msg3Sent = true; type = MSG_TYPE_MSG3; + sleep(2); } else if(!msg5ShortBsrSent) { @@ -357,7 +361,23 @@ uint16_t l1BuildAndSendRxDataInd(uint16_t slot, uint16_t sfn, fapi_ul_pusch_pdu_ msg5Sent = true; type = MSG_TYPE_MSG5; } - + else if(!msgRegistrationComp) + { + msgRegistrationComp = true; + type = MSG_TYPE_REGISTRATION_COMPLETE; + } + else if(!msgSecurityModeComp) + { + msgSecurityModeComp = true; + type = MSG_TYPE_SECURITY_MODE_COMPLETE; + } + else if(!msgRrcReconfiguration) + { + msgRrcReconfiguration = true; + type = MSG_TYPE_RRC_RECONFIG_COMPLETE; + } + else + return RFAILED; MAC_ALLOC(rxDataInd, sizeof(fapi_rx_data_indication_t)); if(!rxDataInd) @@ -366,8 +386,7 @@ uint16_t l1BuildAndSendRxDataInd(uint16_t slot, uint16_t sfn, fapi_ul_pusch_pdu_ return RFAILED; } memset(rxDataInd, 0, sizeof(fapi_rx_data_indication_t)); - - /* TODO: Fill the required values */ + msgLen = sizeof(fapi_rx_data_indication_t) - sizeof(fapi_msg_t); rxDataInd->sfn = sfn; rxDataInd->slot = slot; @@ -390,7 +409,7 @@ uint16_t l1BuildAndSendRxDataInd(uint16_t slot, uint16_t sfn, fapi_ul_pusch_pdu_ printf("\nPHY_STUB: Memory allocation failed for Rx Data Pdu"); return RFAILED; } - + memset(pduInfo->pduData, 0, pduInfo->pdu_length); /* Filling PDU */ pdu = (uint8_t *)pduInfo->pduData; @@ -398,6 +417,7 @@ uint16_t l1BuildAndSendRxDataInd(uint16_t slot, uint16_t sfn, fapi_ul_pusch_pdu_ { case MSG_TYPE_MSG3: { + DU_LOG("\nPHY_STUB: Forming MSG3 PDU "); /* For Initial RRC setup Request, MAC subheader format is R/R/LCId (1byte) LCId is CCCH(0) @@ -405,50 +425,108 @@ uint16_t l1BuildAndSendRxDataInd(uint16_t slot, uint16_t sfn, fapi_ul_pusch_pdu_ */ pdu[byteIdx++] = 0; /* Hardcoding MAC PDU */ - pdu[byteIdx++] = 181; - pdu[byteIdx++] = 99; - pdu[byteIdx++] = 20; - pdu[byteIdx++] = 170; - pdu[byteIdx++] = 132; - pdu[byteIdx++] = 96; + pdu[byteIdx++] = 16; + pdu[byteIdx++] = 00; + pdu[byteIdx++] = 00; + pdu[byteIdx++] = 00; + pdu[byteIdx++] = 00; + pdu[byteIdx++] = 103; break; } - case MSG_TYPE_SHORT_BSR: - { - uint8_t lcgId = 0; - uint8_t bufferSizeIdx = 6; - - /* 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++] = (lcgId << 5) | bufferSizeIdx; + { + DU_LOG("\nPHY_STUB: Forming SHORT BSR PDU "); + uint8_t lcgId = 0; + uint8_t bufferSizeIdx = 6; + + /* 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++] = (lcgId << 5) | bufferSizeIdx; - break; - } + break; + } case MSG_TYPE_MSG5: - { - uint8_t msg5PduLen = 33; - /* For RRC setup complete - MAC subheader format is R/F/LCId/L (2/3 bytes) - LCId is 1 for SRB1 - L is length of PDU i.e 6bytes here - From 38.321 section 6.1.1 - */ - uint8_t msg5[] = {1, msg5PduLen, 0, 0, 16, 0, 5, 223, 128, 16, 94, \ - 64, 3, 64, 89, 61, 138, 64, 0, 0, 0, 4, 0, 0, 4, 68, 11, 128, \ + { + DU_LOG("\nPHY_STUB: Forming MSG5 PDU"); + uint8_t msg5PduLen = 33; + /* For RRC setup complete + MAC subheader format is R/F/LCId/L (2/3 bytes) + LCId is 1 for SRB1 + L is length of PDU i.e 6bytes here + From 38.321 section 6.1.1 + */ + uint8_t msg5[] = {1, msg5PduLen, 0, 0, 16, 0, 5, 223, 128, 16, 94, \ + 64, 3, 64, 89, 61, 138, 64, 0, 0, 0, 4, 0, 0, 4, 68, 11, 128, \ 184, 56, 0, 0, 0, 0, 0}; - msg5PduLen += 2; /* 2bytes of header */ - memcpy(pdu, &msg5, msg5PduLen); - byteIdx += msg5PduLen; /* 2 bytes of header */ - } + msg5PduLen += 2; /* 2bytes of header */ + memcpy(pdu, &msg5, msg5PduLen); + byteIdx += msg5PduLen; /* 2 bytes of header */ + break; + } + + case MSG_TYPE_SECURITY_MODE_COMPLETE: + { + DU_LOG("\nPHY_STUB: Forming SECURITY MODE COMPLETE PDU"); + uint8_t pduLen = 12; + /* For security mode complete where RRC Container is dummy + MAC subheader format is R/F/LCId/L (2/3 bytes) + LCId is 1 for SRB1 + L is length of PDU i.e 6bytes here + From 38.321 section 6.1.1 + */ + uint8_t msg[] = {1, pduLen, 0, 3, 0x2a, 0x40, 0, 0, 0, 0, 0, 0, 0, 0}; + + pduLen += 2; /* 2bytes of header */ + memcpy(pdu, &msg, pduLen); + byteIdx += pduLen; /* 2 bytes of header */ + break; + } + case MSG_TYPE_REGISTRATION_COMPLETE: + { + + DU_LOG("\nPHY_STUB: Forming RRC REGISTRATION COMPLETE PDU"); + uint8_t pduLen = 12; + /* For rrc reconfig complete where RRC Container is dummy + MAC subheader format is R/F/LCId/L (2/3 bytes) + LCId is 1 for SRB1 + L is length of PDU i.e 6bytes here + From 38.321 section 6.1.1 + */ + uint8_t msg[] = {1, pduLen, 0, 0x04, 0x3a, 0x81, 0xbf, 0, 0x21, 0x80, 0, \ + 0, 0, 0}; + + pduLen += 2; /* 2bytes of header */ + memcpy(pdu, &msg, pduLen); + byteIdx += pduLen; /* 2 bytes of header */ + break; + } + case MSG_TYPE_RRC_RECONFIG_COMPLETE: + { + DU_LOG("\nPHY_STUB: Forming RRC RECONFIGURATION COMPLETE PDU"); + uint8_t pduLen = 14; + /* For rrc reconfig complete where RRC Container is dummy + MAC subheader format is R/F/LCId/L (2/3 bytes) + LCId is 1 for SRB1 + L is length of PDU i.e 6bytes here + From 38.321 section 6.1.1 + */ + uint8_t msg[] = {1, pduLen, 0, 6, 8, 64, 0, 0, 0, 0, \ + 0, 0, 0, 0, 0}; + + pduLen += 2; /* 2bytes of header */ + memcpy(pdu, &msg, pduLen); + byteIdx += pduLen; /* 2 bytes of header */ + break; + } + default: break; } /* End of switch(type) */ @@ -574,8 +652,10 @@ uint16_t l1BuildAndSendSlotIndication() memset(slotIndMsg, 0, sizeof(fapi_slot_ind_t)); slotIndMsg->sfn = sfnValue; slotIndMsg->slot = slotValue; - DU_LOG("\n\nPHY_STUB: SLOT indication [%d:%d]",sfnValue,slotValue); +#ifdef ODU_SLOT_IND_DEBUG_LOG + DU_LOG("\n\nPHY_STUB: SLOT indication [%d:%d]",sfnValue,slotValue); +#endif /* increment for the next TTI */ slotValue++; if(sfnValue >= MAX_SFN_VALUE && slotValue > MAX_SLOT_VALUE) @@ -618,16 +698,15 @@ uint16_t l1BuildAndSendSlotIndication() S16 l1HdlStartReq(uint32_t msgLen, void *msg) { #ifdef INTEL_FAPI - fapi_start_req_t *startReq = (fapi_start_req_t *)msg; - if(lwrMacCb.phyState == PHY_STATE_CONFIGURED) { l1HdlSlotIndicaion(FALSE); - MAC_FREE(startReq, sizeof(fapi_start_req_t)); + MAC_FREE(msg, msgLen); } else { DU_LOG("\nPHY_STUB: Received Start Req in PHY State %d", lwrMacCb.phyState); + MAC_FREE(msg, msgLen); return RFAILED; } #endif @@ -655,42 +734,45 @@ S16 l1HdlStartReq(uint32_t msgLen, void *msg) S16 l1HdlDlTtiReq(uint16_t msgLen, void *msg) { #ifdef INTEL_FAPI - fapi_dl_tti_req_t *dlTtiReq; - dlTtiReq = (fapi_dl_tti_req_t *)msg; - - printf("\nPHY STUB: DL TTI Request at sfn=%d slot=%d",dlTtiReq->sfn,dlTtiReq->slot); -#if 0 - printf("\nPHY_STUB: SFN %d", dlTtiReq->sfn); - printf("\nPHY_STUB: SLOT %d", dlTtiReq->slot); - printf("\nPHY_STUB: nPdus %d", dlTtiReq->nPdus); - printf("\nPHY_STUB: nGroup %d", dlTtiReq->nGroup); - /* Printing SSB CONFIGURED VALUES */ - printf("\nPHY_STUB: physCellId %d", dlTtiReq->pdus->u.ssb_pdu.physCellId); - printf("\nPHY_STUB: betaPss %d", dlTtiReq->pdus->u.ssb_pdu.betaPss); - printf("\nPHY_STUB: ssbBlockIndex %d", dlTtiReq->pdus->u.ssb_pdu.ssbBlockIndex); - printf("\nPHY_STUB: ssbSubCarrierOffset %d", dlTtiReq->pdus->u.ssb_pdu.ssbSubCarrierOffset); - printf("\nPHY_STUB: ssbOffsetPointA %d", dlTtiReq->pdus->u.ssb_pdu.ssbOffsetPointA); - printf("\nPHY_STUB: bchPayloadFlag %d", dlTtiReq->pdus->u.ssb_pdu.bchPayloadFlag); - printf("\nPHY_STUB: bchPayload %x", dlTtiReq->pdus->u.ssb_pdu.bchPayload); -#endif + p_fapi_api_queue_elem_t dlTtiElem = (p_fapi_api_queue_elem_t)msg; + fapi_dl_tti_req_t *dlTtiReq = (fapi_dl_tti_req_t *)(dlTtiElem +1); + uint8_t pduCount = 0; + +#ifdef ODU_SLOT_IND_DEBUG_LOG if(dlTtiReq->nPdus == 0) { DU_LOG("\nPHY_STUB: No PDU in DL TTI Request"); } + else + { + DU_LOG("\nPHY STUB: DL TTI Request at sfn=%d slot=%d",dlTtiReq->sfn,dlTtiReq->slot); + } +#endif + for(pduCount=0; pduCountnPdus; pduCount++) { if(dlTtiReq->pdus[pduCount].pduType == 3) //SSB_PDU_TYPE - DU_LOG("\nPHY_STUB: SSB PDU"); + { + DU_LOG("\nPHY_STUB: SSB PDU"); + } else if(dlTtiReq->pdus[pduCount].pduType == 0) + { DU_LOG("\nPHY_STUB: PDCCH PDU"); + if(dlTtiReq->pdus[pduCount].pdu.pdcch_pdu.\ + coreSetType == 1) + { + dlDedMsg = true; + } + } else if(dlTtiReq->pdus[pduCount].pduType == 1) - DU_LOG("\nPHY_STUB: PDSCH PDU"); + { + DU_LOG("\nPHY_STUB: PDSCH PDU"); + } } /* Free FAPI message */ - MAC_FREE(dlTtiReq, msgLen); - + MAC_FREE(msg, msgLen); #endif return ROK; } @@ -716,12 +798,16 @@ S16 l1HdlDlTtiReq(uint16_t msgLen, void *msg) S16 l1HdlTxDataReq(uint16_t msgLen, void *msg) { #ifdef INTEL_FAPI - fapi_tx_data_req_t *txDataReq; - txDataReq = (fapi_tx_data_req_t *)msg; + p_fapi_api_queue_elem_t txDataElem = (p_fapi_api_queue_elem_t)msg; + fapi_tx_data_req_t *txDataReq = (fapi_tx_data_req_t *)(txDataElem +1); DU_LOG("\nPHY STUB: TX DATA Request at sfn=%d slot=%d",txDataReq->sfn,txDataReq->slot); - - MAC_FREE(txDataReq, msgLen); + if(dlDedMsg) + { + DU_LOG("\nPHY_STUB: TxDataPdu for DED MSG sent"); + dlDedMsg = false; + } + MAC_FREE(msg, msgLen); #endif return ROK; } @@ -755,7 +841,6 @@ uint8_t fillPucchF0F1PduInfo(fapi_uci_o_pucch_f0f1_t *pduInfo, fapi_ul_pucch_pdu pduInfo->rnti = pucchPdu.rnti; pduInfo->timingAdvance = 0; pduInfo->rssi = 0; - pduInfo->uciBits[idx] = 0; //TODO: FAPI spec ver. 222.10.01 has no info about UCI Bits if(pduInfo->pduBitmap & SR_PDU_BITMASK) { pduInfo->srInfo.srIndication = SR_DETECTED; @@ -896,17 +981,21 @@ uint8_t l1BuildAndSendUciInd(uint16_t slot, uint16_t sfn, fapi_ul_pucch_pdu_t pu S16 l1HdlUlTtiReq(uint16_t msgLen, void *msg) { #ifdef INTEL_FAPI - fapi_ul_tti_req_t *ulTtiReq = NULLP; - - DU_LOG("\nPHY STUB: Received UL TTI Request"); - - ulTtiReq = (fapi_ul_tti_req_t *)msg; + p_fapi_api_queue_elem_t ulTtiElem = (p_fapi_api_queue_elem_t)msg; + fapi_ul_tti_req_t *ulTtiReq = (fapi_ul_tti_req_t *)(ulTtiElem +1); uint8_t numPdus = ulTtiReq->nPdus; +#ifdef ODU_SLOT_IND_DEBUG_LOG if(numPdus == 0) { - DU_LOG("\nPHY STUB: No PDU in UL TTI"); + DU_LOG("\nPHY STUB: No PDU received in UL TTI Req"); } + else + { + DU_LOG("\nPHY STUB: Received UL TTI Request"); + } +#endif + while(numPdus) { if(ulTtiReq->pdus[numPdus-1].pduType == 0) @@ -915,7 +1004,7 @@ S16 l1HdlUlTtiReq(uint16_t msgLen, void *msg) } if(ulTtiReq->pdus[numPdus-1].pduType == 1) { - DU_LOG("\nPHY STUB: PUSCH PDU"); + DU_LOG("\nPHY STUB: PUSCH PDU"); l1BuildAndSendRxDataInd(ulTtiReq->slot, ulTtiReq->sfn, \ ulTtiReq->pdus[numPdus-1].pdu.pusch_pdu); } @@ -939,7 +1028,7 @@ S16 l1HdlUlTtiReq(uint16_t msgLen, void *msg) l1BuildAndSendRachInd(ulTtiReq->slot, ulTtiReq->sfn); } - MAC_FREE(ulTtiReq, msgLen); + MAC_FREE(msg, msgLen); #endif return ROK; } @@ -1004,18 +1093,17 @@ uint16_t l1BuildAndSendStopInd() S16 l1HdlStopReq(uint32_t msgLen, void *msg) { #ifdef INTEL_FAPI - fapi_stop_req_t *stopReq = (fapi_stop_req_t *)msg; - if(lwrMacCb.phyState == PHY_STATE_RUNNING) { l1HdlSlotIndicaion(TRUE); DU_LOG("\nPHY_STUB: Slot Indication is stopped successfully"); l1BuildAndSendStopInd(); - MAC_FREE(stopReq, msgLen); + MAC_FREE(msg, msgLen); } else { DU_LOG("\nPHY_STUB: Received Stop Req in PHY State %d", lwrMacCb.phyState); + MAC_FREE(msg, msgLen); return RFAILED; } #endif @@ -1147,9 +1235,8 @@ uint8_t l1BuildAndSendMsg5(uint16_t sfn, uint16_t slot) S16 l1HdlUlDciReq(uint16_t msgLen, void *msg) { #ifdef INTEL_FAPI - fapi_ul_dci_req_t *ulDciReq = NULLP; - - ulDciReq = (fapi_ul_dci_req_t *)msg; + p_fapi_api_queue_elem_t ulDciElem = (p_fapi_api_queue_elem_t)msg; + fapi_ul_dci_req_t *ulDciReq = (fapi_ul_dci_req_t *)(ulDciElem +1); uint8_t numPdus = ulDciReq->numPdus; while(numPdus) @@ -1163,7 +1250,7 @@ S16 l1HdlUlDciReq(uint16_t msgLen, void *msg) numPdus--; } - MAC_FREE(ulDciReq, msgLen); + MAC_FREE(msg, msgLen); #endif return ROK; }