X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Frg_lmm.c;h=0b230e7aa87ce745efb059fc3e83d7728c3bd225;hb=a5530e70a9d414952dadd1688aa9b4280c0dbb5a;hp=70cc657a52c18faf0b8753ef10150b85e413f4eb;hpb=8340c342ebcfc82193c3f66e7f15047c1e37399b;p=o-du%2Fl2.git diff --git a/src/5gnrmac/rg_lmm.c b/src/5gnrmac/rg_lmm.c index 70cc657a5..0b230e7aa 100755 --- a/src/5gnrmac/rg_lmm.c +++ b/src/5gnrmac/rg_lmm.c @@ -38,16 +38,7 @@ static int RLOG_FILE_ID=220; static int RLOG_MODULE_ID=4096; /* header include files (.h) */ -#include "envopt.h" /* environment options */ -#include "envdep.h" /* environment dependent */ -#include "envind.h" /* environment independent */ -#include "gen.h" /* general */ -#include "ssi.h" /* system services */ -#include "cm_tkns.h" /* Common Token Defines */ -#include "cm_llist.h" /* Common Link List Defines */ -#include "cm_hash.h" /* Common Hash List Defines */ -#include "cm_mblk.h" /* common memory link list library */ -#include "cm_lte.h" /* Common LTE Defines */ +#include "common_def.h" #include "rg_env.h" /* MAC Environment Defines */ #include "crg.h" /* CRG Interface defines */ #include "rgu.h" /* RGU Interface defines */ @@ -57,18 +48,8 @@ static int RLOG_MODULE_ID=4096; #include "rgr.h" /* LRG Interface defines */ #include "rg.h" /* MAC defines */ #include "rg_err.h" /* MAC error defines */ -#include "du_log.h" /* header/extern include files (.x) */ -#include "gen.x" /* general */ -#include "ssi.x" /* system services */ -#include "cm5.x" /* system services */ -#include "cm_tkns.x" /* Common Token Definitions */ -#include "cm_llist.x" /* Common Link List Definitions */ -#include "cm_lib.x" /* Common Library Definitions */ -#include "cm_hash.x" /* Common Hash List Definitions */ -#include "cm_mblk.x" /* common memory link list library */ -#include "cm_lte.x" /* Common LTE Defines */ #include "crg.x" /* CRG Interface includes */ #include "rgu.x" /* RGU Interface includes */ #include "tfu.x" /* RGU Interface includes */ @@ -84,6 +65,8 @@ static int RLOG_MODULE_ID=4096; #include "ss_rbuf.h" #include "ss_rbuf.x" #include "lwr_mac.h" /* MAC CL defines */ +#include "mac_sch_interface.h" +#include "lwr_mac_upr_inf.h" #include "mac.h" #include "lwr_mac_phy.h" #include "lwr_mac_fsm.h" @@ -97,10 +80,8 @@ EXTERN Void rgGetSId ARGS((SystemId *s)); #endif /* __cplusplus */ /* Public variable declaration */ -ClCb clGlobalCp; -MacCb macCb; - -int MacSchCellCfgReq(Pst *pst,MacCellCfg *macCellCfg); +LwrMacCb lwrMacCb; +extern MacCb macCb; /* forward references */ PRIVATE U16 rgLMMGenCfg ARGS(( @@ -136,22 +117,6 @@ RgMngmt *cfm, Pst *cfmPst )); -extern int packMacCellCfgCfm(Pst *pst, MacCellCfgCfm *macCellCfgCfm); - -packMacCellCfgConfirm packMacCellCfmOpts[] = -{ - packMacCellCfgCfm, /* packing for loosely coupled */ - duHandleMacCellCfgCfm, /* packing for tightly coupled */ - packMacCellCfgCfm, /* packing for light weight loosly coupled */ -}; - -SchCellCfgFunc SchCellCfgOpts[] = -{ - packSchCellCfg, /* packing for loosely coupled */ - SchHdlCellCfgReq, /* packing for tightly coupled */ - packSchCellCfg /* packing for light weight loosly coupled */ -}; - /** * @brief Task Initiation callback function. @@ -234,18 +199,12 @@ Reason reason; /* reason */ #endif /* Initializing CL control block */ - clGlobalCp.region = region; - clGlobalCp.pool = 0; - clGlobalCp.clCfgDone = FALSE; - clGlobalCp.numOfCells = 0; - clGlobalCp.phyState = PHY_STATE_IDLE; - - if( cmHashListInit(&clGlobalCp.cellCbLst, MAX_NUM_CELL_SUPP, 0x0, FALSE, - CM_HASH_KEYTYPE_DEF, clGlobalCp.region, clGlobalCp.pool ) != ROK ) - { - printf("\n Cellcb hash list initialization failed for MAC CL"); - RETVALUE(RFAILED); - } + memset(&lwrMacCb, 0, sizeof(LwrMacCb)); + lwrMacCb.region = region; + lwrMacCb.pool = 0; + lwrMacCb.clCfgDone = TRUE; + lwrMacCb.numCell = 0; + lwrMacCb.phyState = PHY_STATE_IDLE; /* Initialize Scheduler as well */ schActvInit(ENTRG, (DEFAULT_CELLS + SCH_INST_START), DFLT_REGION, PWR_UP); @@ -786,8 +745,8 @@ Elmnt sapType; /* Sap Type */ { case STRGUSAP: if ((cfg->s.rguSap.spId > LRG_MAX_RGU_SAPS) && - (cfg->s.rguSap.selector != RGU_SEL_TC) && - (cfg->s.rguSap.selector != RGU_SEL_LC)) + (cfg->s.rguSap.selector != ODU_SELECTOR_TC) && + (cfg->s.rguSap.selector != ODU_SELECTOR_LC)) { ret = LCM_REASON_INVALID_PAR_VAL; RLOG0(L_ERROR, "unsupported Selector value for RGU"); @@ -817,8 +776,8 @@ Elmnt sapType; /* Sap Type */ * there is cfg request with sap is 1*/ break; case STCRGSAP: - if ((cfg->s.crgSap.selector != CRG_SEL_TC) && - (cfg->s.crgSap.selector != CRG_SEL_LC)) + if ((cfg->s.crgSap.selector != ODU_SELECTOR_TC) && + (cfg->s.crgSap.selector != ODU_SELECTOR_LC)) { ret = LCM_REASON_INVALID_PAR_VAL; RLOG0(L_ERROR, "unsupported Selector value for CRG"); @@ -847,8 +806,8 @@ Elmnt sapType; /* Sap Type */ break; case STTFUSAP: #ifndef CL_MAC_LWLC - if ((cfg->s.tfuSap.selector != TFU_SEL_TC) && - (cfg->s.tfuSap.selector != TFU_SEL_LC)) + if ((cfg->s.tfuSap.selector != ODU_SELECTOR_TC) && + (cfg->s.tfuSap.selector != ODU_SELECTOR_LC)) { ret = LCM_REASON_INVALID_PAR_VAL; RLOG0(L_ERROR, "unsupported Selector value for TFU"); @@ -926,8 +885,8 @@ RgCfg *cfg; /* Configuaration information */ { RETVALUE(LCM_REASON_INVALID_MSGTYPE); } - if ((cfg->s.genCfg.lmPst.selector != LRG_SEL_TC) && - (cfg->s.genCfg.lmPst.selector != LRG_SEL_LC)) + if ((cfg->s.genCfg.lmPst.selector != ODU_SELECTOR_TC) && + (cfg->s.genCfg.lmPst.selector != ODU_SELECTOR_LC)) { RLOG0(L_ERROR, "unsupported Selector value for RGU"); RETVALUE(LCM_REASON_INVALID_PAR_VAL); @@ -946,6 +905,7 @@ RgCfg *cfg; /* Configuaration information */ rgCb[inst].genCfg.tmrRes = cfg->s.genCfg.tmrRes; macCb.macInst = rgCb[inst].rgInit.inst; + macCb.procId = rgCb[inst].rgInit.procId; /* Initialize SAP States */ rgCb[inst].crgSap.sapSta.sapState = LRG_NOT_CFG; @@ -1975,327 +1935,6 @@ Inst inst; } /* end of rgActvTmr */ -/** - * @brief Layer Manager Configuration request handler for Scheduler - * - * @details - * - * Function : MacSchGenCfgReq - * - * This function receives general configurations for Scheduler - * from DU APP and forwards to Scheduler. - * - * @param[in] Pst *pst, the post structure - * @param[in] RgMngmt *cfg, the configuration parameter's structure - * @return S16 - * -# ROK - **/ -#ifdef ANSI -PUBLIC int MacSchGenCfgReq -( -Pst *pst, /* post structure */ -RgMngmt *cfg /* config structure */ -) -#else -PUBLIC int MacSchGenCfgReq(pst, cfg) -Pst *pst; /* post structure */ -RgMngmt *cfg; /* config structure */ -#endif -{ - printf("\nReceived Scheduler gen config at MAC"); - pst->dstInst = DEFAULT_CELLS + 1; - HandleSchGenCfgReq(pst, cfg); - - return ROK; -} - -/** - * @brief Layer Manager Configuration response from Scheduler - * - * @details - * - * Function : SchSendCfgCfm - * - * This function sends general configurations response from - * Scheduler to DU APP. - * - * @param[in] Pst *pst, the post structure - * @param[in] RgMngmt *cfm, the configuration confirm structure - * @return S16 - * -# ROK - **/ -#ifdef ANSI -PUBLIC S16 SchSendCfgCfm -( -Pst *pst, /* post structure */ -RgMngmt *cfm /* config confirm structure */ -) -#else -PUBLIC S16 SchSendCfgCfm(pst, cfm) -Pst *pst; /* post structure */ -RgMngmt *cfm; /* config confirm structure */ -#endif -{ - printf("\nSending Scheduler config confirm to DU APP"); - pst->dstEnt = ENTDUAPP; - pst->dstInst = 0; - pst->srcInst = 0; - pst->selector = MAC_SCH_LC_SELECTOR; - RgMiLrgSchCfgCfm(pst, cfm); - - RETVALUE(ROK); -} - - -/*********************************************************** - * - * Func : macCellCfgFillCfmPst - * - * - * Desc : Fills the Confirmation Post Structure cfmPst - * - * Ret : Void - * - * Notes: - * - * File : rg_lmm.c - * - **********************************************************/ -Void macCellCfgFillCfmPst -( -Pst *reqPst, -Pst *cfmPst -) -{ - Inst inst; - inst = reqPst->dstInst; - - cfmPst->srcEnt = rgCb[inst].rgInit.ent; - cfmPst->srcInst = rgCb[inst].rgInit.inst; - cfmPst->srcProcId = rgCb[inst].rgInit.procId; - - cfmPst->dstEnt = ENTDUAPP; - cfmPst->dstInst = 0; - cfmPst->dstProcId = cfmPst->srcProcId; - - cfmPst->selector = LRG_SEL_LC; - cfmPst->prior = reqPst->prior; - cfmPst->route = reqPst->route; - cfmPst->region = reqPst->region; - cfmPst->pool = reqPst->pool; - cfmPst->event = EVENT_MAC_CELL_CONFIG_CFM; - - RETVOID; -} - -/** - * @brief Layer Manager Configuration request handler. - * - * @details - * - * Function : MacHdlCellCfgReq - * - * This function handles the gNB and cell configuration - * request received from DU APP. - * This API unapcks and forwards the config towards SCH - * - * @param[in] Pst *pst - * @param[in] MacCellCfg *macCellCfg - * @return S16 - * -# ROK - **/ -int MacHdlCellCfgReq -( - Pst *pst, - MacCellCfg *macCellCfg -) -{ - Pst cfmPst; - uint16_t ret = ROK; - RgCellCb *cellCb; - MacCellCb *macCellCb; - Inst inst = pst->dstInst; - - cmMemset((U8 *)&cfmPst, 0, sizeof(Pst)); - MAC_ALLOC(cellCb,sizeof(RgCellCb)); - - if(cellCb == NULLP) - { - DU_LOG("\nMAC : cellCb is NULL at handling of macCellCfg\n"); - return RFAILED; - } - - memcpy(&cellCb->macCellCfg,macCellCfg,sizeof(MacCellCfg)); - rgCb[inst].cell = cellCb; - - MAC_ALLOC(macCellCb,sizeof(MacCellCb)); - if(macCellCb == NULLP) - { - DU_LOG("\nMAC : macCellCb is NULL at handling of macCellCfg\n"); - return RFAILED; - } - macCb.macCell = macCellCb; - macCb.macCell->cellId = macCellCfg->cellId; - /* Send cell cfg to scheduler */ - ret = MacSchCellCfgReq(pst, macCellCfg); - if(ret != ROK) - { - MacCellCfgCfm macCellCfgCfm; - macCellCfgCfm.rsp = RSP_NOK; - macCellCfgCfm.transId = macCellCfg->transId; - macCellCfgFillCfmPst(pst,&cfmPst); - ret = (*packMacCellCfmOpts[cfmPst.selector])(&cfmPst,&macCellCfgCfm); - } -#ifdef INTEL_WLS - LwrMacEnqueueWlsBlock(); -#endif - return ret; -} /* end of MacHdlCellCfgReq */ - -/** - * @brief Layer Manager Configuration request handler. - * - * @details - * - * Function : MacSchCellCfgReq - * - * This function sends cell configuration to SCH - * - * @param[in] Pst *pst - * @param[in] MacCellCfg *macCellCfg - * @return S16 - * -# ROK - **/ -int MacSchCellCfgReq -( - Pst *pst, - MacCellCfg *macCellCfg -) -{ - SchCellCfg schCellCfg; - Pst cfgPst; - int ret; - - cmMemset((U8 *)&cfgPst, 0, sizeof(Pst)); - schCellCfg.cellId = macCellCfg->cellId; - schCellCfg.phyCellId = macCellCfg->phyCellId; - schCellCfg.bandwidth = macCellCfg->dlCarrCfg.bw; - schCellCfg.dupMode = macCellCfg->dupType; - - /* fill ssb scheduler parameters */ - schCellCfg.ssbSchCfg.ssbPbchPwr = macCellCfg->ssbCfg.ssbPbchPwr; - schCellCfg.ssbSchCfg.scsCommon = macCellCfg->ssbCfg.scsCmn; - schCellCfg.ssbSchCfg.ssbOffsetPointA = macCellCfg->ssbCfg.ssbOffsetPointA; - schCellCfg.ssbSchCfg.ssbPeriod = macCellCfg->ssbCfg.ssbPeriod; - schCellCfg.ssbSchCfg.ssbSubcOffset = macCellCfg->ssbCfg.ssbScOffset; - for(uint8_t idx=0; idxssbCfg.ssbMask[idx]; - } - - /* fill SIB1 scheduler parameters */ - schCellCfg.sib1SchCfg.sib1PduLen = macCellCfg->sib1Cfg.sib1PduLen; - schCellCfg.sib1SchCfg.sib1NewTxPeriod = macCellCfg->sib1Cfg.sib1NewTxPeriod; - schCellCfg.sib1SchCfg.sib1RepetitionPeriod = macCellCfg->sib1Cfg.sib1RepetitionPeriod; - schCellCfg.sib1SchCfg.coresetZeroIndex = macCellCfg->sib1Cfg.coresetZeroIndex; - schCellCfg.sib1SchCfg.searchSpaceZeroIndex = macCellCfg->sib1Cfg.searchSpaceZeroIndex; - schCellCfg.sib1SchCfg.sib1Mcs = macCellCfg->sib1Cfg.sib1Mcs; - - /* fill RACH config params */ - schCellCfg.schRachCfg.prachCfgIdx = macCellCfg->prachCfg.prachCfgIdx; - schCellCfg.schRachCfg.prachSubcSpacing = \ - macCellCfg->prachCfg.prachSubcSpacing; - schCellCfg.schRachCfg.msg1FreqStart = macCellCfg->prachCfg.msg1FreqStart; - schCellCfg.schRachCfg.msg1Fdm = macCellCfg->prachCfg.msg1Fdm; - schCellCfg.schRachCfg.rootSeqIdx = macCellCfg->prachCfg.fdm[0].rootSeqIdx; - schCellCfg.schRachCfg.numRootSeq = macCellCfg->prachCfg.fdm[0].numRootSeq; - schCellCfg.schRachCfg.k1 = macCellCfg->prachCfg.fdm[0].k1; - schCellCfg.schRachCfg.ssbPerRach = macCellCfg->prachCfg.ssbPerRach; - schCellCfg.schRachCfg.prachMultCarrBand = \ - macCellCfg->prachCfg.prachMultCarrBand; - schCellCfg.schRachCfg.raContResTmr = macCellCfg->prachCfg.raContResTmr; - schCellCfg.schRachCfg.rsrpThreshSsb = macCellCfg->prachCfg.rsrpThreshSsb; - schCellCfg.schRachCfg.raRspWindow = macCellCfg->prachCfg.raRspWindow; - - - cfgPst.srcProcId = pst->dstProcId; - cfgPst.dstProcId = pst->srcProcId; - cfgPst.srcEnt = ENTRG; - cfgPst.srcInst = 0; - cfgPst.dstEnt = ENTRG; - cfgPst.dstInst = 1; - cfgPst.selector = MAC_SCH_TC_SELECTOR; - cfgPst.event = EVENT_SCH_CELL_CFG; - - ret = (*SchCellCfgOpts[cfgPst.selector])(&cfgPst, &schCellCfg); - return ret; -} /* end of MacSchCellCfgReq */ - - -/******************************************************************* - * - * @brief Sends Cell config confirm to DU APP - * - * @details - * - * Function : MacSendCellCfgCfm - * - * Functionality: - * Sends Cell config confirm to DU APP - * - * @params[in] Response status - * @return void - * - * ****************************************************************/ -void MacSendCellCfgCfm(uint8_t response) -{ - Pst pst; - RgCellCb *cellCb; - MacCellCfgCfm macCellCfgCfm; - - cmMemset((U8 *)&pst, 0, sizeof(Pst)); - cellCb = rgCb[macCb.macInst].cell; - - macCellCfgCfm.transId = cellCb->macCellCfg.transId; - macCellCfgCfm.rsp = response; - - memcpy((void *)&pst, (void *)&rgCb[macCb.macInst].rgInit.lmPst, sizeof(Pst)); - pst.event = EVENT_MAC_CELL_CONFIG_CFM; - (*packMacCellCfmOpts[pst.selector])(&pst,&macCellCfgCfm); -} - - -/** - * @brief Layer Manager Configuration response handler. - * - * @details - * - * Function : MacProcSchCellCfgCfm - * - * This function processes cell configuration to SCH - * - * @param[in] Pst *pst - * @param[in] SchCellCfgCfm *schCellCfgCfm - * @return int - * -# ROK - **/ -int MacProcSchCellCfgCfm -( - Pst *pst, - SchCellCfgCfm *schCellCfgCfm -) -{ - if(schCellCfgCfm->rsp == RSP_OK) - { - sendToLowerMac(PARAM_REQUEST, 0, (void *)NULL); - } - else - { - MacSendCellCfgCfm(RSP_NOK); - } - return ROK; -} - /********************************************************************** End of file