X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_mgr_main.c;h=f787284686ea00b9f5e7b9caa6940a36ab9c0136;hb=f73456bd55152c329601f8286ae67fe9875025bc;hp=14c810f0b286d79b8e7f16076d5cb29fd64bf488;hpb=6fe137e5c6f9470f4f48448f5651573c42bd8aed;p=o-du%2Fl2.git diff --git a/src/du_app/du_mgr_main.c b/src/du_app/du_mgr_main.c index 14c810f0b..f78728468 100644 --- a/src/du_app/du_mgr_main.c +++ b/src/du_app/du_mgr_main.c @@ -18,31 +18,36 @@ /* This file is the entry point for DU APP */ #include "common_def.h" +#include "du_tmr.h" #include "lrg.h" #include "legtp.h" #include "lrg.x" #include "lkw.x" #include "du_app_mac_inf.h" #include "du_app_rlc_inf.h" +#include "du_e2ap_mgr.h" #include "du_cfg.h" #include "du_mgr.h" #include "du_mgr_main.h" #include "du_sctp.h" #include "du_egtp.h" +#include "du_cell_mgr.h" +#include "du_f1ap_msg_hdl.h" #ifdef O1_ENABLE #include "O1Interface.h" -#include "ConfigInterface.h" - +#include "CmInterface.h" #endif uint8_t rlcUlActvTsk (Pst *, Buffer *); uint8_t rlcUlActvInit (Ent, Inst, Region, Reason); uint8_t rlcDlActvTsk (Pst *, Buffer *); uint8_t rlcDlActvInit (Ent, Inst, Region, Reason); -uint8_t rgActvTsk (Pst *, Buffer *); -uint8_t rgActvInit (Ent, Inst, Region, Reason); +uint8_t macActvTsk (Pst *, Buffer *); +uint8_t macActvInit (Ent, Inst, Region, Reason); +uint8_t schActvTsk (Pst *, Buffer *); +uint8_t schActvInit(Ent, Inst, Region, Reason); uint8_t lwrMacActvTsk(Pst *, Buffer *); uint8_t lwrMacActvInit(Ent, Inst, Region, Reason); #ifndef INTEL_WLS_MEM @@ -53,6 +58,10 @@ uint8_t phyStubActvInit(Ent, Inst, Region, Reason); /* Global variable */ DuCfgParams duCfgParam; +#ifdef O1_ENABLE +extern NRCellDU cellParams; +#endif + /******************************************************************* * * @brief Initializes DU APP @@ -90,6 +99,84 @@ uint8_t duAppInit(SSTskId sysTskId) } #ifdef O1_ENABLE + +/******************************************************************* + * + * @brief update Rrm Policy at DU and process the slice cfg request + * + * @details + * + * Function : setRrmPolicy + * + * Functionality: + * - update Rrm Policy at DU and process the slice cfg request + * + * @params[in] RrmPolicy rrmPolicy[], uint8_t policyNum, uint8_t memberList + * @return true - success + * false - failure + * + * ****************************************************************/ + +uint8_t setRrmPolicy(RrmPolicyList rrmPolicy[], uint8_t policyNum) +{ + DU_LOG("\nINFO --> DU_APP : DU APP RRM number of policy %d,", \ + policyNum); + for(uint8_t i=0; i DU_APP : DU APP id = %s",rrmPolicy[i].id); + DU_LOG("\nINFO --> DU_APP : DU APP resourceType = %d", \ + rrmPolicy[i].resourceType); + DU_LOG("\nINFO --> DU_APP : DU APP rRMPolicyMaxRatio = %d", \ + rrmPolicy[i].rRMPolicyMaxRatio); + DU_LOG("\nINFO --> DU_APP : DU APP rRMPolicyMinRatio = %d", \ + rrmPolicy[i].rRMPolicyMinRatio); + DU_LOG("\nINFO --> DU_APP : DU APP rRMPolicyDedicatedRatio = %d", \ + rrmPolicy[i].rRMPolicyDedicatedRatio); + DU_LOG("\nINFO --> DU_APP : DU APP rRMMemberNum = %d", \ + rrmPolicy[i].rRMMemberNum); + for(uint8_t j=0; j DU_APP : DU APP mcc = %d%d%d", \ + rrmPolicy[i].rRMPolicyMemberList[j].mcc[0], \ + rrmPolicy[i].rRMPolicyMemberList[j].mcc[1], \ + rrmPolicy[i].rRMPolicyMemberList[j].mcc[2]); + DU_LOG("\nINFO --> DU_APP : DU APP mnc = %d%d%d", \ + rrmPolicy[i].rRMPolicyMemberList[j].mnc[0], \ + rrmPolicy[i].rRMPolicyMemberList[j].mnc[1], \ + rrmPolicy[i].rRMPolicyMemberList[j].mnc[2]); + + DU_LOG("\nINFO --> DU_APP : DU APP sd = %d%d%d", \ + rrmPolicy[i].rRMPolicyMemberList[j].sd[0], \ + rrmPolicy[i].rRMPolicyMemberList[j].sd[1], \ + rrmPolicy[i].rRMPolicyMemberList[j].sd[2]); + + DU_LOG("\nINFO --> DU_APP : DU APP sst = %d\n", \ + rrmPolicy[i].rRMPolicyMemberList[j].sst); + } + + } + DuCellCb *cellCb = NULLP; + + cpyRrmPolicyInDuCfgParams(rrmPolicy, policyNum, &duCfgParam.tempSliceCfg); + cellCb = duCb.actvCellLst[0]; + + if(cellCb) + { + if(cellCb->cellStatus == ACTIVATED) + { + if(duCb.sliceState == SLICE_INFO_NOT_AVAILABLE) + { + BuildAndSendSliceConfigReq(); + } + else + { + BuildAndSendSliceRecfgReq(); + } + } + } + return ROK; +} + /******************************************************************* * * @brief Bring the cell Up @@ -114,6 +201,76 @@ bool bringCellUp(uint16_t cellId) return true; } +/******************************************************************* + * + * @brief configure cell parameters + * + * @details + * + * Function : configurecell + * + * Functionality: + * - configure cell parameters + * + * @params[in] Cell Id + * @return true - success + * false - failure + * + * ****************************************************************/ + +uint8_t setCellParam() +{ + //Read all the configs from smo edit-config into cellParams + DU_LOG("\nO1 configurecell du_app enterd"); + DU_LOG("\nDU_APP configurecell cellLocalId value:%d",cellParams.cellLocalId); + DU_LOG("\nDU_APP configurecell operationalState value:%d", \ + cellParams.operationalState); + DU_LOG("\nDU_APP configurecell administrativeState value:%d", \ + cellParams.administrativeState); + DU_LOG("\nDU_APP configurecell cellState value:%d",cellParams.cellState); + DU_LOG("\nDU_APP configurecell nRPCI value:%d",cellParams.nRPCI); + DU_LOG("\nDU_APP configurecell nRTAC value:%d",cellParams.nRTAC); + DU_LOG("\nDU_APP configurecell arfcnDL value:%d",cellParams.arfcnDL); + DU_LOG("\nDU_APP configurecell arfcnUL value:%d",cellParams.arfcnUL); + DU_LOG("\nDU_APP configurecell arfcnSUL value:%d",cellParams.arfcnSUL); + DU_LOG("\nDU_APP configurecell ssbFrequency value:%d",cellParams.ssbFrequency); + DU_LOG("\nDU_APP configurecell ssbPeriodicity value:%d", \ + cellParams.ssbPeriodicity); + DU_LOG("\nDU_APP configurecell ssbSubCarrierSpacing value:%d", \ + cellParams.ssbSubCarrierSpacing); + DU_LOG("\nDU_APP configurecell ssbOffset value:%d",cellParams.ssbOffset); + DU_LOG("\nDU_APP configurecell ssbDuration value:%d",cellParams.ssbDuration); + DU_LOG("\nDU_APP configurecell bSChannelBwUL value:%d", \ + cellParams.bSChannelBwUL); + DU_LOG("\nDU_APP configurecell bSChannelBwDL value:%d", \ + cellParams.bSChannelBwDL); + DU_LOG("\nDU_APP configurecell bSChannelBwSUL value:%d", \ + cellParams.bSChannelBwSUL); + for (int i=0 ; i DU_APP : DU APP mcellParams.plmnList[%d].mcc = %d%d%d", i,\ + cellParams.plmnList[i].mcc[0], \ + cellParams.plmnList[i].mcc[1], \ + cellParams.plmnList[i].mcc[2]); + DU_LOG("\nINFO --> DU_APP : DU APP cellParams.plmnList[%d].mnc = %d%d%d", i,\ + cellParams.plmnList[i].mnc[0], \ + cellParams.plmnList[i].mnc[1], \ + cellParams.plmnList[i].mnc[2]); + + DU_LOG("\nINFO --> DU_APP : DU APP cellParams.plmnList[%d].sd = %d%d%d", i,\ + cellParams.plmnList[i].sd[0], \ + cellParams.plmnList[i].sd[1], \ + cellParams.plmnList[i].sd[2]); + + DU_LOG("\nINFO --> DU_APP : DU APP cellParams.plmnList[%d].sst = %d\n", i,\ + cellParams.plmnList[i].sst); + + } + + duReadCfg(); + return ROK; +} /******************************************************************* * * @brief Bring the cell Down @@ -209,6 +366,7 @@ uint8_t sctpInit(SSTskId sysTskId) sysTskId); return ROK; } + /******************************************************************* * * @brief Initializes RLC DL, MAC TAPA task @@ -241,7 +399,7 @@ uint8_t rlcDlInit(SSTskId sysTskId) /* Register MAC TAPA Task */ if(ODU_REG_TTSK((Ent)ENTMAC, (Inst)0, (Ttype)TTNORM, (Prior)PRIOR0, - rgActvInit, (ActvTsk)rgActvTsk) != ROK) + macActvInit, (ActvTsk)macActvTsk) != ROK) { return RFAILED; } @@ -250,9 +408,41 @@ uint8_t rlcDlInit(SSTskId sysTskId) { return RFAILED; } + } - DU_LOG("\nINFO --> DU_APP : RLC DL and MAC TAPA task created and registered to \ - %d sys task", sysTskId); +/******************************************************************* + * + * @brief Initializes SCH TAPA task + * + * @details + * + * Function : schInit + * + * Functionality: + * - Registers and attaches TAPA tasks for SCH + * + * @params[in] system task ID + * @return ROK - success + * RFAILED - failure + * + * ****************************************************************/ + uint8_t schInit(SSTskId sysTskId) + { + /* Register SCH TAPA Task */ + if(ODU_REG_TTSK((Ent)ENTMAC, (Inst)SCH_INST_START, (Ttype)TTNORM, (Prior)PRIOR0, + schActvInit, (ActvTsk)schActvTsk) != ROK) + { + return RFAILED; + } + /* Attach SCH Task */ + if (ODU_ATTACH_TTSK((Ent)ENTMAC, (Inst)SCH_INST_START, sysTskId)!= ROK) + { + return RFAILED; + } + + + DU_LOG("\nINFO --> DU_APP : SCH TAPA task created and registered to \ + %d sys task", sysTskId); return ROK; } @@ -382,7 +572,7 @@ uint8_t phyStubInit(SSTskId sysTskId) uint8_t commonInit() { /* Declare system task Ids */ - SSTskId du_app_stsk, egtp_stsk, sctp_stsk, rlc_ul_stsk, rlc_mac_cl_stsk, lwr_mac_stsk, phy_stub_slot_ind_stsk; + SSTskId du_app_stsk, egtp_stsk, sctp_stsk, rlc_ul_stsk, rlc_mac_cl_stsk, sch_stsk, lwr_mac_stsk, phy_stub_slot_ind_stsk; pthread_attr_t attr; @@ -403,7 +593,7 @@ uint8_t commonInit() DU_LOG("\nERROR --> DU_APP : System Task creation for EGTP failed"); return RFAILED; } - ODU_SET_THREAD_AFFINITY(&egtp_stsk, SS_AFFINITY_MODE_EXCL, 17, 0); + ODU_SET_THREAD_AFFINITY(&egtp_stsk, SS_AFFINITY_MODE_EXCL, 27, 0); /* system task for RLC_DL and MAC */ if(ODU_CREATE_TASK(PRIOR0, &rlc_mac_cl_stsk) != ROK) @@ -421,7 +611,15 @@ uint8_t commonInit() DU_LOG("\nERROR --> DU_APP : System Task creation for RLC UL failed"); return RFAILED; } - ODU_SET_THREAD_AFFINITY(&rlc_ul_stsk, SS_AFFINITY_MODE_EXCL, 19, 0); + ODU_SET_THREAD_AFFINITY(&rlc_ul_stsk, SS_AFFINITY_MODE_EXCL, 22, 0); + + /* system task for SCH */ + if(ODU_CREATE_TASK(PRIOR1, &sch_stsk) != ROK) + { + DU_LOG("\nERROR --> DU_APP : System Task creation for SCH failed"); + return RFAILED; + } + ODU_SET_THREAD_AFFINITY(&sch_stsk, SS_AFFINITY_MODE_EXCL, 22, 0); /* system task for SCTP receiver thread */ if(ODU_CREATE_TASK(PRIOR0, &sctp_stsk) != ROK) @@ -429,7 +627,7 @@ uint8_t commonInit() DU_LOG("\nERROR --> DU_APP : System Task creation for SCTP failed"); return RFAILED; } - ODU_SET_THREAD_AFFINITY(&sctp_stsk, SS_AFFINITY_MODE_EXCL, 20, 0); + ODU_SET_THREAD_AFFINITY(&sctp_stsk, SS_AFFINITY_MODE_EXCL, 25, 0); /* system task for lower-mac receiver thread */ if(ODU_CREATE_TASK(PRIOR0, &lwr_mac_stsk) != ROK) @@ -480,6 +678,12 @@ uint8_t commonInit() return RFAILED; } + if(schInit(sch_stsk) != ROK) + { + DU_LOG("\nERROR --> DU_APP : SCH Tapa Task initialization failed"); + return RFAILED; + } + if(lwrMacInit(lwr_mac_stsk) != ROK) { DU_LOG("\nERROR --> DU_APP : Lower MAC Tapa Task initialization failed"); @@ -494,6 +698,7 @@ uint8_t commonInit() } #endif + return ROK; } @@ -549,7 +754,6 @@ void init_log() uint8_t tst(void) { init_log(); - #ifdef O1_ENABLE if(start_O1_module() != ROK) return RFAILED; @@ -561,7 +765,9 @@ uint8_t tst(void) } //Read all the configs from du_utils.c into duCfgParams +#ifndef O1_ENABLE duReadCfg(); +#endif #ifdef O1_ENABLE //Send VES PNF registration message to SMO