pst.srcProcId = DU_PROC;
pst.region = duCb.init.region;
- DU_LOG("\nDU_APP : RLC Gen Cfg Req sent for inst %d", inst);
+ DU_LOG("\nDEBUG --> DU_APP : RLC Gen Cfg Req sent for inst %d", inst);
/* Send the request to RLC */
packRlcConfigReq(&pst, &rlcMngmt);
lSap->sapId = lsapInst; /* SapId will be stored as suId in MAC */
lSap->selector = (inst == RLC_UL_INST) ? ODU_SELECTOR_LWLC : ODU_SELECTOR_TC;
rlcMngmt.hdr.elmId.elmnt = STRGUSAP;
- DU_LOG("\nDU_APP : RLC MAC Lower Sap Cfg Req sent for inst %d", inst);
+ DU_LOG("\nDEBUG --> DU_APP : RLC MAC Lower Sap Cfg Req sent for inst %d", inst);
}
else
lSap->sapId = 0;
lSap->selector = ODU_SELECTOR_LC;
rlcMngmt.hdr.elmId.elmnt = STUDXSAP;
- DU_LOG("\nDU_APP : RLC DL/UL Lower Sap Cfg Req sent for inst %d", inst);
+ DU_LOG("\nDEBUG --> DU_APP : RLC DL/UL Lower Sap Cfg Req sent for inst %d", inst);
}
packRlcConfigReq(&pst, &rlcMngmt);
pst.srcProcId = DU_PROC;
pst.region = duCb.init.region;
- DU_LOG("\nDU_APP : RLC Kwu Upper Sap Cfg Req sent for inst %d", inst);
+ DU_LOG("\nDEBUG --> DU_APP : RLC Kwu Upper Sap Cfg Req sent for inst %d", inst);
packRlcConfigReq(&pst, &rlcMngmt);
return ROK;
DU_ALLOC(cell, sizeof(DuCellCb))
if(cell == NULLP)
{
- DU_LOG("\nDU_APP : Memory Allocation failed in duProcCfgComplete");
+ DU_LOG("\nERROR --> DU_APP : Memory Allocation failed in duProcCfgComplete");
ret = RFAILED;
}
else
{
if (pst->srcInst == RLC_DL_INST)
{
- DU_LOG("\nDU_APP : BIND OF RLC DL TO MAC (RGU) SAP SUCCESSFUL");
+ DU_LOG("\nDEBUG --> DU_APP : BIND OF RLC DL TO MAC (RGU) SAP SUCCESSFUL");
macCfgInst++;
if(macCfgInst < DEFAULT_CELLS)
{
}
else
{
- DU_LOG("\nDU_APP : BIND OF RLC UL TO MAC (RGU) SAP SUCCESSFUL");
+ DU_LOG("\nDEBUG --> DU_APP : BIND OF RLC UL TO MAC (RGU) SAP SUCCESSFUL");
macCfgInst++;
if(macCfgInst < DEFAULT_CELLS)
{
{
uint8_t ret;
- DU_LOG("\nDU_APP : RLC UL Cfg Status %d", cfm->cfm.status);
+ DU_LOG("\nDEBUG --> DU_APP : RLC UL Cfg Status %d", cfm->cfm.status);
if (cfm->cfm.status == LCM_PRIM_OK)
{
switch(cfm->hdr.elmId.elmnt)
default:
break;
}
- DU_LOG("\nDU_APP : RLC UL Cfg Cfm received for the element %d ",cfm->hdr.elmId.elmnt);
+ DU_LOG("\nDEBUG --> DU_APP : RLC UL Cfg Cfm received for the element %d ",cfm->hdr.elmId.elmnt);
if(rlcUlCfg == DU_RLC_UL_CONFIGURED)
{
rlcUlCfg = 0;
}
else
{
- DU_LOG("\nDU_APP : Config confirm NOK from RLC UL");
+ DU_LOG("\nERROR --> DU_APP : Config confirm NOK from RLC UL");
ret = RFAILED;
}
return ret;
***************************************************************************/
uint8_t duProcRlcDlCfgComplete(Pst *pst, RlcMngmt *cfm)
{
- DU_LOG("\nDU_APP : RLC DL Cfg Status %d", cfm->cfm.status);
+ DU_LOG("\nDEBUG --> DU_APP : RLC DL Cfg Status %d", cfm->cfm.status);
if (cfm->cfm.status == LCM_PRIM_OK)
{
switch(cfm->hdr.elmId.elmnt)
break;
}
- DU_LOG("\nDU_APP : RLC DL Cfg Cfm received for the element %d ",cfm->hdr.elmId.elmnt);
+ DU_LOG("\nDEBUG --> DU_APP : RLC DL Cfg Cfm received for the element %d ",cfm->hdr.elmId.elmnt);
if(rlcDlCfg == DU_RLC_DL_CONFIGURED)
{
rlcDlCfg = 0;
}
else
{
- DU_LOG("\nDU_APP : Config confirm NOK from RLC DL");
+ DU_LOG("\nERROR --> DU_APP : Config confirm NOK from RLC DL");
}
return ROK;
}
pst.srcProcId = DU_PROC;
pst.region = duCb.init.region;
- DU_LOG("\nDU_APP : MAC Gen Cfg Req sent");
+ DU_LOG("\nDEBUG --> DU_APP : MAC Gen Cfg Req sent");
/* Send the request to MAC */
cmPkLrgCfgReq(&pst, &rgMngmt);
pst.srcProcId = DU_PROC;
pst.region = duCb.init.region;
- DU_LOG("\nDU_APP : MAC Rgu USap Cfg Req sent");
+ DU_LOG("\nDEBUG --> DU_APP : MAC Rgu USap Cfg Req sent");
/* Send the request to MAC */
cmPkLrgCfgReq(&pst, &rgMngmt);
default:
break;
}
- DU_LOG("\nDU_APP : MAC Cfg Cfm received for the element %d ",cfm->hdr.elmId.elmnt);
+ DU_LOG("\nDEBUG --> DU_APP : MAC Cfg Cfm received for the element %d ",cfm->hdr.elmId.elmnt);
if(macCfg == MAC_CONFIGURED && numRlcMacSaps == MAX_MAC_SAP)
{
macCfg = 0;
- DU_LOG("\nDU_APP : Completed sending Configs");
+ DU_LOG("\nDEBUG --> DU_APP : Completed sending Configs");
macCfgInst = 0;
duBindUnbindRlcToMacSap(RLC_DL_INST, ABND);
}
}
else
{
- DU_LOG("\nDU_APP : Config confirm NOK from MAC");
+ DU_LOG("\nERROR --> DU_APP : Config confirm NOK from MAC");
ret = RFAILED;
}
return ret;
if (action == ABND)
{
- DU_LOG("\nDU_APP : Cntrl Req to RLC inst %d to bind MAC sap", inst);
+ DU_LOG("\nDEBUG --> DU_APP : Cntrl Req to RLC inst %d to bind MAC sap", inst);
}
else
{
- DU_LOG("\nDU_APP : Cntrl Req to RLC inst %d to unbind MAC sap", inst);
+ DU_LOG("\nDEBUG --> DU_APP : Cntrl Req to RLC inst %d to unbind MAC sap", inst);
}
cntrl = &(rlcMngmt.t.cntrl);
}
else
{
- DU_LOG("\nDU_APP : Invalid assocId %d received", ntfy->u.assocChange.assocId);
+ DU_LOG("\nERROR --> DU_APP : Invalid assocId %d received", ntfy->u.assocChange.assocId);
return RFAILED;
}
return ROK;
Pst pst;
EgtpConfig egtpCfg;
- DU_LOG("\nDU_APP : Sending EGTP config request");
+ DU_LOG("\nDEBUG --> DU_APP : Sending EGTP config request");
memset(&egtpCfg, 0, sizeof(EgtpConfig));
memcpy(&egtpCfg, &duCfgParam.egtpParams, sizeof(EgtpConfig));
if(cfm.status == LCM_PRIM_OK)
{
- DU_LOG("\nDU_APP : EGTP configuraton complete");
+ DU_LOG("\nDEBUG --> DU_APP : EGTP configuraton complete");
#ifdef EGTP_TEST
duSendEgtpSrvOpenReq();
#endif
}
else
{
- DU_LOG("\nDU_APP : EGTP configuraton failed");
+ DU_LOG("\nERROR --> DU_APP : EGTP configuraton failed");
ret = RFAILED;
}
{
Pst pst;
- DU_LOG("\nDU_APP : Sending EGTP server open request");
+ DU_LOG("\nDEBUG --> DU_APP : Sending EGTP server open request");
duFillEgtpPst(&pst, EVTSRVOPENREQ);
packEgtpSrvOpenReq(&pst);
if(cfm.status == LCM_PRIM_OK)
{
- DU_LOG("\nDU_APP : EGTP server opened successfully");
+ DU_LOG("\nDEBUG --> DU_APP : EGTP server opened successfully");
#ifdef EGTP_TEST
duSendEgtpTnlMgmtReq(EGTP_TNL_MGMT_ADD, EGTP_LCL_TEID, EGTP_REM_TEID);
#endif
}
else
{
- DU_LOG("\nDU_APP : EGTP server opening failed");
+ DU_LOG("\nERROR --> DU_APP : EGTP server opening failed");
ret = RFAILED;
}
tnlEvt.lclTeid = lclTeid;
tnlEvt.remTeid = remTeid;
- DU_LOG("\nDU_APP : Sending EGTP tunnel management request");
+ DU_LOG("\nDEBUG --> DU_APP : Sending EGTP tunnel management request");
duFillEgtpPst(&pst, EVTTNLMGMTREQ);
egtpTnlMgmtReq(&pst, tnlEvt);
return ROK;
if(tnlEvtCfm.cfmStatus.status == LCM_PRIM_OK)
{
- DU_LOG("\nDU_APP : Tunnel management confirm OK");
-#ifdef EGTP_TEST
- duSendEgtpTestData();
-#endif
+ DU_LOG("\nDEBUG --> DU_APP: Tunnel management confirm OK");
}
else
{
- DU_LOG("\nDU_APP : Tunnel management failed");
+ DU_LOG("\nERROR --> DU_APP: Tunnel management failed");
ret = RFAILED;
}
}
-#ifdef EGTP_TEST
-/*******************************************************************
- *
- * @brief Simulate UL Data for intial test
- *
- * @details
- *
- * Function : duSendEgtpTestData
- *
- * Functionality:
- * Simulate UL data for initial test
- *
- * @params[in]
- * @return ROK - success
- * RFAILED - failure
- *
- * ****************************************************************/
-uint8_t duSendEgtpTestData()
-{
- char data[30] = "This is EGTP data from DU";
- int datSize = 30;
-
- Buffer *mBuf;
-
- if(ODU_GET_MSG_BUF(DU_APP_MEM_REGION, DU_POOL, &mBuf) == ROK)
- {
- if(ODU_ADD_POST_MSG_MULT((Data *)data, datSize, mBuf) != ROK)
- {
- DU_LOG("\nDU_APP : ODU_ADD_POST_MSG_MULT failed");
- ODU_PUT_MSG_BUF(mBuf);
- return RFAILED;
- }
- }
- else
- {
- DU_LOG("\nDU_APP : Failed to allocate memory");
- return RFAILED;
- }
-
- /* filling IPv4 header */
- CmIpv4Hdr ipv4Hdr;
- MsgLen mLen;
-
- mLen = 0;
- ODU_GET_MSG_LEN(mBuf, &mLen);
-
- memset(&ipv4Hdr, 0, sizeof(CmIpv4Hdr));
- ipv4Hdr.length = CM_IPV4_HDRLEN + mLen;
- ipv4Hdr.hdrVer = 0x45;
- ipv4Hdr.proto = 1;
- ipv4Hdr.srcAddr = CM_INET_NTOH_UINT32(duCfgParam.egtpParams.localIp.ipV4Addr);
- ipv4Hdr.destAddr = CM_INET_NTOH_UINT32(duCfgParam.egtpParams.destIp.ipV4Addr);
-
- /* Packing IPv4 header into buffer */
- uint8_t ret, cnt, idx;
- Data revPkArray[CM_IPV4_HDRLEN];
- Data pkArray[CM_IPV4_HDRLEN];
-
- /* initialize locals */
- cnt = 0;
- memset(revPkArray, 0, CM_IPV4_HDRLEN);
- memset(pkArray, 0, CM_IPV4_HDRLEN);
-
- /* Pack Header Version */
- pkArray[cnt++] = ipv4Hdr.hdrVer;
-
- /* Pack TOS */
- pkArray[cnt++] = ipv4Hdr.tos;
-
- pkArray[cnt++] = (Data)GetHiByte(ipv4Hdr.length);
- pkArray[cnt++] = (Data)GetLoByte(ipv4Hdr.length);
-
- /* Pack Id */
- pkArray[cnt++] = (Data) GetHiByte(ipv4Hdr.id);
- pkArray[cnt++] = (Data) GetLoByte(ipv4Hdr.id);
-
- /* Pack Offset */
- pkArray[cnt++] = (Data)GetHiByte(ipv4Hdr.off);
- pkArray[cnt++] = (Data)GetLoByte(ipv4Hdr.off);
-
- /* Pack TTL */
- pkArray[cnt++] = ipv4Hdr.ttl;
-
- /* Pack Protocol */
- pkArray[cnt++] = ipv4Hdr.proto;
-
- /* Pack Checksum */
- pkArray[cnt++] = (Data)GetHiByte(ipv4Hdr.chkSum);
- pkArray[cnt++] = (Data)GetLoByte(ipv4Hdr.chkSum);
-
- /* Pack Source Address */
- pkArray[cnt++] = (Data)GetHiByte(GetHiWord(ipv4Hdr.srcAddr));
- pkArray[cnt++] = (Data)GetLoByte(GetHiWord(ipv4Hdr.srcAddr));
- pkArray[cnt++] = (Data)GetHiByte(GetLoWord(ipv4Hdr.srcAddr));
- pkArray[cnt++] = (Data)GetLoByte(GetLoWord(ipv4Hdr.srcAddr));
-
- /* Pack Destination Address */
- pkArray[cnt++] = (Data)GetHiByte(GetHiWord(ipv4Hdr.destAddr));
- pkArray[cnt++] = (Data)GetLoByte(GetHiWord(ipv4Hdr.destAddr));
- pkArray[cnt++] = (Data)GetHiByte(GetLoWord(ipv4Hdr.destAddr));
- pkArray[cnt++] = (Data)GetLoByte(GetLoWord(ipv4Hdr.destAddr));
-
- for (idx = 0; idx < CM_IPV4_HDRLEN; idx++)
- revPkArray[idx] = pkArray[CM_IPV4_HDRLEN - idx -1];
-
- /* this function automatically reverses revPkArray */
- ret = ODU_ADD_PRE_MSG_MULT(revPkArray, (MsgLen)cnt, mBuf);
-
- duSendEgtpDatInd(mBuf);
-
- return ROK;
-}
-#endif /* EGTP_TEST */
-
-
/**************************************************************************
* @brief Function to send configs to SCH
*
pst.region = duCb.init.region;
pst.event = (Event) EVTMACSCHGENCFGREQ;
- DU_LOG("\nDU_APP : MAC Sch Cfg sent");
+ DU_LOG("\nDEBUG --> DU_APP : MAC Sch Cfg sent");
/* Send the request to MAC */
cmPkLrgSchCfgReq(&pst, &rgMngmt);
{
uint8_t ret = ROK;
- DU_LOG("\nDU_APP : Configuring all Layer is complete");
+ DU_LOG("\nINFO --> DU_APP : Configuring all Layer is complete");
if((ret = duSctpCfgReq(duCfgParam.sctpParams)) != ROK)
{
- DU_LOG("\nDU_APP : Failed configuring Sctp Params");
+ DU_LOG("\nERROR --> DU_APP : Failed configuring Sctp Params");
ret = RFAILED;
}
if((ret = duSctpAssocReq(F1_INTERFACE)) != ROK)
{
- DU_LOG("\nDU_APP : Failed to send AssocReq F1");
+ DU_LOG("\nERROR --> DU_APP : Failed to send AssocReq F1");
ret = RFAILED;
}
if((ret = duSctpAssocReq(E2_INTERFACE)) != ROK)
{
- DU_LOG("\nDU_APP : Failed to send AssocReq E2");
+ DU_LOG("\nERROR --> DU_APP : Failed to send AssocReq E2");
ret = RFAILED;
}
{
case STSCHINST:
{
- DU_LOG("\nDU_APP : Received SCH CFG CFM at DU APP");
+ DU_LOG("\nDEBUG --> DU_APP : Received SCH CFG CFM at DU APP");
break;
}
default:
/* TODO : Action to be taken if cell configuration fails.
* Should CU be informed? */
- DU_LOG("\nMac cell cfg failed");
+ DU_LOG("\nERROR --> DU_APP : Mac cell cfg failed");
ret = RFAILED;
}
return ret;
Pst pst;
OduCellId *cellId = NULL;
- DU_LOG("\nDU APP : Building and Sending cell start request to MAC");
+ DU_LOG("\nINFO --> DU APP : Building and Sending cell start request to MAC");
/* Send Cell Start Request to MAC */
DU_ALLOC_SHRABL_BUF(cellId, sizeof(OduCellId));
if(!cellId)
{
- DU_LOG("\nDU APP : Memory alloc failed while building cell start request");
+ DU_LOG("\nERROR --> DU APP : Memory alloc failed while building cell start request");
return RFAILED;
}
Pst pst;
OduCellId *cellId = NULL;
- DU_LOG("\nDU APP : Building and Sending cell stop request to MAC");
+ DU_LOG("\nINFO --> DU APP : Building and Sending cell stop request to MAC");
/* Send Cell Stop Request to MAC */
DU_ALLOC_SHRABL_BUF(cellId, sizeof(OduCellId));
if(!cellId)
{
- DU_LOG("\nDU APP : Memory alloc failed while building cell stop request");
+ DU_LOG("\nERROR --> DU APP : Memory alloc failed while building cell stop request");
return RFAILED;
}
cellId->cellId = duCb.actvCellLst[0]->cellId;
if(cellId->cellId <=0 || cellId->cellId > MAX_NUM_CELL)
{
- DU_LOG("\nDU APP : Invalid Cell Id %d in duHandleStopInd()", cellId->cellId);
+ DU_LOG("\nERROR --> DU APP : Invalid Cell Id %d in duHandleStopInd()", cellId->cellId);
}
if(duGetCellCb(cellId->cellId, &cellCb) != ROK)
if((cellCb->cellStatus == ACTIVATED))
{
- DU_LOG("\nDU APP : 5G-NR Cell %d is DOWN", cellId->cellId);
+ DU_LOG("\nINFO --> DU APP : 5G-NR Cell %d is DOWN", cellId->cellId);
cellCb->cellStatus = DELETION_IN_PROGRESS;
#ifdef O1_ENABLE
- DU_LOG("\nDU APP : Raise cell down alarm for cell id=%d", cellId->cellId);
+ DU_LOG("\nINFO --> DU APP : Raise cell down alarm for cell id=%d", cellId->cellId);
raiseCellAlrm(CELL_DOWN_ALARM_ID, cellId->cellId);
#endif
}
uint8_t duHandleUlCcchInd(Pst *pst, UlCcchIndInfo *ulCcchIndInfo)
{
- DU_LOG("\nDU APP : UL CCCH Indication received");
+ DU_LOG("\nINFO --> DU APP : UL CCCH Indication received");
return (duProcUlCcchInd(ulCcchIndInfo));
}
return ret;
}
+/*******************************************************************
+ *
+ * @brief Process UL user data from RLC
+ *
+ * @details
+ *
+ * Function : DuProcRlcUlUserDataTrans
+ *
+ * Functionality: Process UL user data from RLC
+ *
+ * @params[in] Post structure
+ * UL user data
+ * @return ROK - success
+ * RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t DuProcRlcUlUserDataTrans(Pst *pst, RlcUlUserDatInfo *ulUserData)
+{
+ uint8_t rbIdx;
+ DuCellCb *cellCb;
+ DuUeCb ueCb;
+ EgtpMsg egtpMsg;
+ Buffer *mBuf;
+
+ if(duGetCellCb(ulUserData->cellId, &cellCb) != ROK)
+ return RFAILED;
+
+ ueCb = cellCb->ueCb[ulUserData->ueIdx -1];
+
+ DU_LOG("\nDEBUG --> DU APP : Received UL user data");
+
+ /* Fill EGTP header */
+ egtpMsg.msgHdr.msgType = EGTPU_MSG_GPDU;
+ egtpMsg.msgHdr.nPdu.pres = FALSE;
+ egtpMsg.msgHdr.seqNum.pres = FALSE;
+ egtpMsg.msgHdr.extHdr.udpPort.pres = FALSE;
+ egtpMsg.msgHdr.extHdr.pdcpNmb.pres = FALSE;
+
+ /* Fetch EGTP tunnel info */
+ /* TODO : keep the "#if 0" code block and test once DL User data changes are submitted */
+#if 0
+ for(rbIdx = 0; rbIdx < MAX_NUM_DRB; rbIdx++)
+ {
+ if(ueCb.ulTnlCfg[rbIx]->drbId == ulUserData->rbId)
+ {
+ egtpMsg.msgHdr.teId = ueCb.ulTnlCfg[rbIx]->tnlCfg.teId;
+ }
+ }
+#else
+ egtpMsg.msgHdr.teId = 1;
+#endif
+
+ if (ODU_GET_MSG_BUF(DU_APP_MEM_REGION, DU_POOL, &mBuf) != ROK)
+ {
+ DU_LOG("\nERROR --> DU APP : Failed to allocated buffer memory in DuProcRlcUlUserDataTrans");
+ DU_FREE_SHRABL_BUF(pst->region, pst->pool, ulUserData->userData, ulUserData->msgLen);
+ DU_FREE_SHRABL_BUF(pst->region, pst->pool, ulUserData, sizeof(RlcUlUserDatInfo));
+ return RFAILED;
+ }
+ oduCpyFixBufToMsg(ulUserData->userData, mBuf, ulUserData->msgLen);
+ ODU_PRINT_MSG(mBuf, 0, 0);
+ egtpMsg.msg = mBuf;
+ egtpHdlDatInd(egtpMsg);
+
+ DU_FREE_SHRABL_BUF(pst->region, pst->pool, ulUserData->userData, ulUserData->msgLen);
+ DU_FREE_SHRABL_BUF(pst->region, pst->pool, ulUserData, sizeof(RlcUlUserDatInfo));
+ return ROK;
+}
/**********************************************************************
End of file
Code Review / o-du / l2.git / blobdiff