X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_cell_mgr.c;h=02a47f042323635389eea9f96144ec069b3e9676;hb=5cc86eb25cc33a2cc1472325cffc5634a6c203c6;hp=fb7479831d54e27f88689e55d3385ff66e0a838f;hpb=8660dd47a5ef27b62300fabf6b027852f1d5d026;p=o-du%2Fl2.git

diff --git a/src/du_app/du_cell_mgr.c b/src/du_app/du_cell_mgr.c
index fb7479831..02a47f042 100644
--- a/src/du_app/du_cell_mgr.c
+++ b/src/du_app/du_cell_mgr.c
@@ -16,18 +16,26 @@
 ################################################################################
 *******************************************************************************/
 
-/* This file contains message handling functionality for DU APP */
-#include "du_cell_mgr.h"
+/* This file contains message handling functionality for DU cell management */
+#include "common_def.h"
+#include "lrg.h"
+#include "legtp.h"
+#include "lrg.x"
+#include "lkw.x"
+#include "rgr.h"
+#include "rgr.x"
+#include "du_app_mac_inf.h"
+#include "du_app_rlc_inf.h"
 #include "du_cfg.h"
-#include "PLMN-Identity.h"
-#include "RICeventTriggerDefinition.h"
-
-extern DuCfgParams duCfgParam;
-
-extern S16 cmPkRgrCfgReq(Pst* pst, RgrCfgTransId transId, \
-      RgrCfgReqInfo *cfgReqInfo);
-
-extern S16 duBuildAndSendMacCellCfg();
+#include "du_mgr.h"
+#include "du_utils.h"
+#include "du_cell_mgr.h"
+#ifdef O1_ENABLE
+ 
+#include "GlobalDefs.h"
+#include "AlarmInterface.h"
+  
+#endif
 
 /*******************************************************************
  *
@@ -35,7 +43,7 @@ extern S16 duBuildAndSendMacCellCfg();
  *
  * @details
  *
- *    Function : procCellsToBeActivated
+ *    Function : duProcCellsToBeActivated
  *
  *    Functionality:
  *      - Processes cells to be activated list received in F1SetupRsp
@@ -45,377 +53,161 @@ extern S16 duBuildAndSendMacCellCfg();
  *         RFAILED - failure
  *
  * ****************************************************************/
-S16 procCellsToBeActivated(Cells_to_be_Activated_List_t cellsToActivate)
+uint8_t duProcCellsToBeActivated(uint8_t *plmnStr, uint16_t nci, uint16_t nRPci)
 {
-   U16 idx;
-   S16 ret;
+   uint8_t ret = ROK;
+   DuCellCb *cellCb = NULLP;
+   uint8_t cfgIdx, tmpPlmn[4];
 
-   for(idx=0; idx<cellsToActivate.list.count; idx++)
+   for(cfgIdx=0; cfgIdx<duCb.numCfgCells; cfgIdx++)
    {
-      U16 nci;
-      U16 pci;
-      DuCellCb *cellCb = NULLP;
-
-      Cells_to_be_Activated_List_Item_t cell = cellsToActivate.list.array[idx]->\
-          value.choice.Cells_to_be_Activated_List_Item;
-
-      bitStringToInt(&cell.nRCGI.nRCellIdentity, &nci);
-      if(cell.nRPCI)
-      {
-         pci = *cell.nRPCI;
-      }
-      if(ROK != (cmHashListFind(&(duCb.cellLst), (U8*) &nci, sizeof(nci),
-                  0, (PTR*)cellCb)))
-      {
-         return RFAILED;
-      }
-      if(!cellCb)
-      {
-			DU_LOG("\nDU_APP : HashList Find failed for nci [%d]", nci);
-         return RFAILED;
-      }
-      cellCb->cellStatus = ACTIVATION_IN_PROGRESS; 
-      cellCb->cellInfo.nrPci = pci;
-
-      /* Now remove this cell from configured list and move to active list */
-      ret = cmHashListDelete(&(duCb.actvCellLst), (PTR)(cellCb)); 
-      if(ret != ROK)
-      {
-         DU_LOG("\nDU_APP : HashListInsert into ActvCellLst failed for [%d]", nci);
-      }
-      ret = cmHashListInsert(&(duCb.actvCellLst), (PTR)(cellCb), 
-            (U8 *)&(nci), (U16) sizeof(nci));
-
-      if(ret != ROK)
+      memset(tmpPlmn, 0, 4);
+      buildPlmnId(duCb.cfgCellLst[cfgIdx]->cellInfo.nrEcgi.plmn, tmpPlmn);
+      if(duCb.cfgCellLst[cfgIdx]->cellInfo.nrEcgi.cellId == nci &&
+	    (strcmp((const char*)tmpPlmn, (const char*)plmnStr) == 0))
       {
-         DU_LOG("\nDU_APP : HashListInsert into ActvCellLst failed for [%d]", nci);
-         break;
+	 cellCb = duCb.cfgCellLst[cfgIdx];
+	 break;
       }
       else
       {
-         DU_LOG("\nDU_APP : HashListInsert into ActvCellLst successful for [%d]", nci);
+	 DU_LOG("\nERROR  -->  DU APP : No Cell found for NCI %d", nci);
+	 return RFAILED;
       }
    }
 
-   /* Start sending scheduler config */
-   if(ret == ROK)
-   {
-      //TODO: uncomment later duSendSchGnbCfg(); 
-   }
-
-   return ROK;
-}
-
-/******************************************************************
-*
-* @brief Processes E2 Setup Response sent by RIC
-*
-* @details
-*
-*    Function : procE2SetupRsp
-*
-*    Functionality: Processes E2 Setup Response sent by RIC
-*
-* @params[in] E2AP_PDU_t ASN decoded E2AP message
-* @return ROK     - success
-*         RFAILED - failure
-*
-* ****************************************************************/
-S16 procE2SetupRsp(E2AP_PDU_t *e2apMsg)
-{
-   E2setupResponse_t *e2SetRspMsg;
-   E2apMsgDb e2SetupRspDb;
-   U8 idx; 
+   cellCb->cellStatus = ACTIVATION_IN_PROGRESS; 
+   cellCb->cellInfo.nrPci = nRPci;
 
-   DU_LOG("\nE2AP : E2 Setup Response received"); 
-   duCb.e2Status = TRUE; //Set E2 status as true
-   e2SetRspMsg = &e2apMsg->choice.successfulOutcome->value.choice.E2setupResponse;
+   duCb.actvCellLst[duCb.numActvCells++] = cellCb;
 
-   for(idx=0; idx<e2SetRspMsg->protocolIEs.list.count; idx++)
+   if(duBuildAndSendMacCellCfg(cellCb->cellId) != ROK)
    {
-      switch(e2SetRspMsg->protocolIEs.list.array[idx]->id)
-      {
-         case ProtocolIE_IDE2_id_GlobalRIC_ID:
-         {
-            /* To store the Ric Id Params */
-            U32 recvBufLen;             
-            memset(&e2SetupRspDb.plmn, 0, sizeof(PLMN_IdentityE2_t));
-
-            recvBufLen = sizeof(e2SetRspMsg->protocolIEs.list.array[idx]->value.choice.GlobalRIC_ID.pLMN_Identity);
-
-            bitStringToInt(&e2SetRspMsg->protocolIEs.list.array[idx]->value.choice.GlobalRIC_ID.ric_ID, &e2SetupRspDb.ricId);
-            
-            aper_decode(0, &asn_DEF_PLMN_IdentityE2, (void **)&e2SetupRspDb.plmn, &e2SetRspMsg->protocolIEs.list.array[idx]->value.choice.GlobalRIC_ID.pLMN_Identity, recvBufLen, 0, 0);
-            //xer_fprint(stdout, &asn_DEF_PLMN_IdentityE2, &e2SetupRspDb.plmn);
-
-            break;
-         }
-         default:
-            DU_LOG("\nE2AP : Invalid IE received in E2SetupRsp:%ld",
-                  e2SetRspMsg->protocolIEs.list.array[idx]->id);
-            break;
-      }
+      DU_LOG("\nERROR  -->  DU APP : macCellCfg build and send failed");
+      /* Delete cell from actvCellList */
+      duCb.actvCellLst[--(duCb.numActvCells)] = NULLP;
+      ret = RFAILED;
    }
-   RETVALUE(ROK);
+   return ret;
 }
 
-/******************************************************************
-*
-* @brief Processes RIC Subscription Req sent by RIC
-*
-* @details
-*
-*    Function : procRicSubsReq
-*
-*    Functionality: Processes E2 Setup Response sent by CU
-*
-* @params[in] E2AP_PDU_t ASN decoded E2AP message
-* @return ROK     - success
-*         RFAILED - failure
-*
-* ****************************************************************/
-
-S16 procRicSubsReq(E2AP_PDU_t *e2apMsg)
+/*******************************************************************
+ *
+ * @brief Handles DU F1Setup Rsp received in F1AP
+ *
+ * @details
+ *
+ *    Function : duProcF1SetupRsp
+ *
+ *    Functionality:
+ *      - Handles DU F1Setup Rsp received in F1AP
+ *
+ * @params[in] Pointer to F1SetupRsp 
+ * @return void
+ *
+ ******************************************************************/
+void duProcF1SetupRsp()
 {
-   S16 ret = ROK;
-   U8 idx; 
-   U8 ied; 
-   RICsubscriptionRequest_t *ricSubsReq;
-   RICaction_ToBeSetup_ItemIEs_t *actionItem;
-   E2apMsgDb ricReqDb;
-  
-   DU_LOG("\nE2AP : Ric Subscription request received"); 
-   ricSubsReq = &e2apMsg->choice.initiatingMessage->value.choice.RICsubscriptionRequest;
-
-   for(idx=0; idx<ricSubsReq->protocolIEs.list.count; idx++)
-   {
-      switch(ricSubsReq->protocolIEs.list.array[idx]->id)
-      {
-         case ProtocolIE_IDE2_id_RICrequestID:
-         {
-            ricReqDb.ricReqId = ricSubsReq->protocolIEs.list.array[idx]->value.choice.RICrequestID.ricRequestorID;
-            ricReqDb.ricInstanceId = ricSubsReq->protocolIEs.list.array[idx]->value.choice.RICrequestID.ricInstanceID;
-            break;
-         }
-         case ProtocolIE_IDE2_id_RANfunctionID:
-         {
-            ricReqDb.ranFuncId = ricSubsReq->protocolIEs.list.array[idx]->value.choice.RANfunctionID; 
-            break;
-         }
-         case ProtocolIE_IDE2_id_RICsubscriptionDetails:
-         {
-            U32 recvBufLen;             
-            memset(&ricReqDb.ricEventTrigger, 0, sizeof(RICeventTriggerDefinition_t));
-
-            recvBufLen = sizeof(ricSubsReq->protocolIEs.list.array[idx]->value.choice.RICsubscriptionDetails.ricEventTriggerDefinition);
-
-            aper_decode(0, &asn_DEF_RICeventTriggerDefinition, (void **)&ricReqDb.ricEventTrigger, &(ricSubsReq->protocolIEs.list.array[idx]->value.choice.RICsubscriptionDetails.ricEventTriggerDefinition), recvBufLen, 0, 0);
-            //xer_fprint(stdout, &asn_DEF_RICeventTriggerDefinition, &ricReqDb.ricEventTrigger);
-
-            actionItem = *ricSubsReq->protocolIEs.list.array[idx]->value.choice.RICsubscriptionDetails.ricAction_ToBeSetup_List.list.array;
-            
-            for(ied = 0; ied < ricSubsReq->protocolIEs.list.array[idx]->value.choice.\
-                                RICsubscriptionDetails.ricAction_ToBeSetup_List.list.count; ied++)
-            {
-               switch(actionItem->id)
-               {
-                  case ProtocolIE_IDE2_id_RICaction_ToBeSetup_Item:
-                  {
-                     ricReqDb.ricActionId = actionItem->value.choice.RICaction_ToBeSetup_Item.ricActionID;
-                     ricReqDb.ricActionType = actionItem->value.choice.RICaction_ToBeSetup_Item.ricActionType;
-                     break;
-                  }
-                  default:
-                     DU_LOG("\nE2AP : Invalid IE received in RicSetupLst:%ld",actionItem->id);
-                  break;
-               }
-            }
- 
-            break;
-         }
-
-         default:
-            DU_LOG("\nE2AP : Invalid IE received in Ric SubsReq:%ld",
-                  ricSubsReq->protocolIEs.list.array[idx]->id);
-            break;
-      }
-   }
-   ret = BuildAndSendRicSubscriptionRsp();
-
-   RETVALUE(ret);
+   DU_LOG("\nINFO   -->  DU_APP : F1 Setup Response received");
+   duCb.f1Status = TRUE; //Set F1 status as true
 }
 
-/******************************************************************
-*
-* @brief Processes F1 Setup Response sent by CU
-*
-* @details
-*
-*    Function : procF1SetupRsp
-*
-*    Functionality: Processes F1 Setup Response sent by CU
-*
-* @params[in] F1AP_PDU_t ASN decoded F1AP message
-* @return ROK     - success
-*         RFAILED - failure
-*
-* ****************************************************************/
-S16 procF1SetupRsp(F1AP_PDU_t *f1apMsg)
+/*******************************************************************
+ *
+ * @brief Handles GNB DU Cfg Update Ack received in F1AP
+ *
+ * @details
+ *
+ *    Function : duProcGnbDuCfgUpdAckMsg
+ *
+ *    Functionality:
+ *      - Handles GNB DU Cfg Update Ack received in F1AP
+ *
+ * @params[in] Pointer to F1GnbDuCfgUpdAck
+ * @return void
+ *  
+ ******************************************************************/
+void duProcGnbDuCfgUpdAckMsg()
 {
-   S16 ret = ROK;
-
-   F1SetupResponse_t *f1SetRspMsg;
-   F1SetupRsp    f1SetRspDb;
-   GNB_CU_Name_t *cuName;
-   RRC_Version_t *rrc_Ver;
-   U16 idx;
-
-   DU_LOG("\nDU_APP : F1 Setup Response received"); 
- 	printf("\nDU_APP : F1 Setup Response received");
-   duCb.f1Status = TRUE; //Set F1 status as true
-   f1SetRspMsg = &f1apMsg->choice.successfulOutcome->value.choice.F1SetupResponse;
-
-   for(idx=0; idx<f1SetRspMsg->protocolIEs.list.count; idx++)
-   {
-//      F1SetupResponseIEs_t f1RspIe = f1SetRspMsg->protocolIEs.list.array[idx];
-      switch(f1SetRspMsg->protocolIEs.list.array[idx]->id)
-      {
-         case ProtocolIE_ID_id_Cells_to_be_Activated_List:
-         {
-            procCellsToBeActivated(f1SetRspMsg->protocolIEs.list.array[idx]->\
-                  value.choice.Cells_to_be_Activated_List);
-            break;
-         }
-         //TODO: where to store and how to use below variables?can they be skipped
-         case ProtocolIE_ID_id_TransactionID:
-         {
-            f1SetRspDb.transId = f1SetRspMsg->protocolIEs.list.array[idx]->\
-                                 value.choice.TransactionID;
-            break;
-         }
-         case ProtocolIE_ID_id_gNB_CU_Name:
-         {
-            cuName = &f1SetRspMsg->protocolIEs.list.array[idx]->\
-                     value.choice.GNB_CU_Name;
-            strcpy(f1SetRspDb.cuName, (const char*)cuName->buf);
-            break;
-         }
-         case ProtocolIE_ID_id_GNB_CU_RRC_Version:
-         {
-            rrc_Ver = &f1SetRspMsg->protocolIEs.list.array[idx]->\
-                      value.choice.RRC_Version;
-            strcpy(f1SetRspDb.rrcVersion.rrcVer,
-                  (const char*)rrc_Ver->latest_RRC_Version.buf);
-            break;
-         }
-         default:
-            DU_LOG("\nDU_APP : Invalid IE received in F1SetupRsp:%ld",
-                  f1SetRspMsg->protocolIEs.list.array[idx]->id);
-      }
-   }
- 
-   /* TODO :Check the deallocation */
-#if 0
-   SPutSBuf(DU_APP_MEM_REGION, DU_POOL,(Data *)&(f1SetupRsp->protocolIEs.list.array),\
-         (Size)elementCnt * sizeof(F1SetupResponseIEs_t *));
-   SPutSBuf(DU_APP_MEM_REGION, DU_POOL,(Data *)&(f1apMsg->choice.successfulOutcome),\
-         (Size)sizeof(SuccessfulOutcome_t));
-   SPutSBuf(DU_APP_MEM_REGION, DU_POOL,(Data *)&f1apMsg,(Size)sizeof(F1AP_PDU_t));
-#endif
- 
-   /* Build and send Mac Cell Cfg Paramaters */
-   //ret = duBuildAndSendMacCellCfg();
-   ret = BuildAndSendDUConfigUpdate();
-
-   return ret;
+   DU_LOG("\nINFO   -->  DU APP: GNB-DU config update Ack received ");
 }
-
-/******************************************************************
+/*******************************************************************
 *
-* @brief Send gNB cfg to scheduler via MAC
+* @brief Returns cellCb based on cell ID
 *
 * @details
 *
-*    Function : duSendSchGnbCfg
+*    Function : duGetCellCb
 *
-*    Functionality: Send gNB cfg to scheduler via MAC
+*    Functionality: Returns DU APP CellCb based on cell ID
 *
+* @params[in] F1AP_PDU_t ASN decoded F1AP message
 * @return ROK     - success
 *         RFAILED - failure
 *
 * ****************************************************************/
-S16 duSendSchGnbCfg()
+uint8_t duGetCellCb(uint16_t cellId, DuCellCb **cellCb)
 {
-
-   RgrCfgReqInfo  *cfgReq = NULLP;
-   MacSchedGnbCfg *cfg = NULLP;
-   U32 transId = 1;
-
-   DU_ALLOC(cfgReq, sizeof(RgrCfgReqInfo));
-   if( cfgReq == NULLP)
+   uint8_t cellIdx = 0;
+   for(cellIdx=0; cellIdx<duCb.numActvCells; cellIdx++)
    {
-      DU_LOG("\nDU_APP : Mem allocation failed in duSendSchGnbCfg");
-      return RFAILED;
+      if(duCb.actvCellLst[cellIdx]->cellId == cellId)
+         *cellCb = duCb.actvCellLst[cellIdx];
+	 break;
    }
 
-   cfgReq->action = SCH_CONFIG;
-   cfgReq->u.cfgInfo.cfgType = MAC_GNB_CFG;
-   cfg = &(cfgReq->u.cfgInfo.u.schedGnbCfg);
-   cfg->numTxAntPorts = duCfgParam.schedCfg.numTxAntPorts;
-   cfg->ulSchdType = duCfgParam.schedCfg.ulSchdType;
-   cfg->dlSchdType = duCfgParam.schedCfg.dlSchdType;
-   cfg->numCells = duCfgParam.schedCfg.numCells;
-   cfg->maxUlUePerTti = duCfgParam.schedCfg.maxUlUePerTti;
-   cfg->maxDlUePerTti = duCfgParam.schedCfg.maxDlUePerTti;
-
-   if(ROK != duSendSchGnbCfgToMac(cfgReq, transId))
+   if(!*cellCb)
    {
+      DU_LOG("\nERROR  -->  DU APP : Cell Id %d not found in DU APP", cellId);
       return RFAILED;
    }
 
    return ROK;
 }
 
-/******************************************************************
-*
-* @brief Send gNB cfg to scheduler via MAC
-*
-* @details
-*
-*    Function : duSendSchGnbCfgToMac 
-*
-*    Functionality: Send gNB cfg to scheduler via MAC
-*
-* @return ROK     - success
-*         RFAILED - failure
-*
-* ****************************************************************/
-S16 duSendSchGnbCfgToMac(RgrCfgReqInfo *cfgReq, U32 trans_id)
+/*******************************************************************
+ *
+ * @brief Handles cell up indication from MAC
+ *
+ * @details
+ *
+ *    Function : duHandleCellUpInd
+ *
+ *    Functionality:
+ *      Handles cell up indication from MAC
+ *
+ * @params[in] Post structure pointer
+ *             cell Up info
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint8_t duHandleCellUpInd(Pst *pst, OduCellId *cellId)
 {
-   RgrCfgTransId transId;
-   Pst pst;
+   DuCellCb *cellCb = NULLP;
 
-   DU_SET_ZERO(&pst, sizeof(Pst));
-   DU_SET_ZERO(&transId, sizeof(RgrCfgTransId));
+   if(cellId->cellId <=0 || cellId->cellId > MAX_NUM_CELL)
+   {
+      DU_LOG("\nERROR  -->  DU APP : Invalid Cell Id %d in duHandleCellUpInd()", cellId->cellId);
+      return RFAILED;
+   }
 
-   transId.trans[0] = MAC_GNB_CFG;
-   transId.trans[1] = cfgReq->action;
-   transId.trans[7] = trans_id & 0x000000ff; trans_id >>= 8;
-   transId.trans[6] = trans_id & 0x000000ff; trans_id >>= 8;
-   transId.trans[5] = trans_id & 0x000000ff; trans_id >>= 8;
-   transId.trans[4] = trans_id & 0x000000ff; trans_id >>= 8;
+   if(duGetCellCb(cellId->cellId, &cellCb) != ROK)
+      return RFAILED;
 
-   pst.selector  = DU_SELECTOR_LC;
-   pst.srcEnt    = ENTDUAPP;
-   pst.dstEnt    = ENTRG;
-   pst.dstInst   = (Inst)0;
-   pst.dstProcId = DU_PROC;
-   pst.srcProcId = DU_PROC;
-   pst.region    = duCb.init.region;
-   pst.event     = (Event) EVTMACSCHCFGREQ;
+   if((cellCb != NULL) && (cellCb->cellStatus == ACTIVATION_IN_PROGRESS))
+   {
+      DU_LOG("\nINFO   -->  DU APP : 5G-NR Cell %d is UP", cellId->cellId);
+      cellCb->cellStatus = ACTIVATED;
 
-   cmPkRgrCfgReq(&pst, transId, cfgReq);
+#ifdef O1_ENABLE
+      DU_LOG("\nINFO   -->  DU APP : Raise cell UP alarm for cell id=%d", cellId->cellId);
+      raiseCellAlrm(CELL_UP_ALARM_ID, cellId->cellId);
+#endif
+   }
 
+   if((pst->selector == ODU_SELECTOR_LWLC) || (pst->selector == ODU_SELECTOR_TC))
+      DU_FREE_SHRABL_BUF(pst->region, pst->pool, cellId, sizeof(OduCellId));
    return ROK;
 }