X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Fsch.c;h=16495af9d7e6f34a77ee6d79ca26470b6ee74926;hb=d89a2b6fe147a04cbf792652d6fe43a5142925e0;hp=03896c0b143626dbf806b3e0e91c22963d2742dd;hpb=def50dc175cebc67238db5f1acd5ff322a2279bd;p=o-du%2Fl2.git diff --git a/src/5gnrsch/sch.c b/src/5gnrsch/sch.c index 03896c0b1..16495af9d 100644 --- a/src/5gnrsch/sch.c +++ b/src/5gnrsch/sch.c @@ -48,7 +48,7 @@ #include "sch.h" #include "sch_utils.h" -extern SchCb schCb[SCH_MAX_INST]; +SchCb schCb[SCH_MAX_INST]; void SchFillCfmPst(Pst *reqPst,Pst *cfmPst,RgMngmt *cfm); /* local defines */ @@ -123,7 +123,7 @@ uint8_t SchInstCfg(RgCfg *cfg, Inst dInst) uint16_t ret = LCM_REASON_NOT_APPL; Inst inst = (dInst - SCH_INST_START); - printf("\nEntered SchInstCfg()"); + DU_LOG("\nDEBUG --> SCH : Entered SchInstCfg()"); /* Check if Instance Configuration is done already */ if (schCb[inst].schInit.cfgDone == TRUE) { @@ -161,14 +161,14 @@ uint8_t SchInstCfg(RgCfg *cfg, Inst dInst) if (ODU_REG_TMR_MT(schCb[inst].schInit.ent, dInst, (int)schCb[inst].genCfg.tmrRes, schActvTmr) != ROK) { - RLOG_ARG0(L_ERROR,DBG_INSTID,inst, "SchInstCfg(): Failed to " + DU_LOG("\nERROR --> SCH : SchInstCfg(): Failed to " "register timer."); return (LCM_REASON_MEM_NOAVAIL); } #endif /* Set Config done in TskInit */ schCb[inst].schInit.cfgDone = TRUE; - printf("\nScheduler gen config done"); + DU_LOG("\nINFO --> SCH : Scheduler gen config done"); return ret; } @@ -200,12 +200,12 @@ uint8_t SchProcGenCfgReq(Pst *pst, RgMngmt *cfg) if(pst->dstInst < SCH_INST_START) { - DU_LOG("\nInvalid inst ID"); - DU_LOG("\nSchProcGenCfgReq(): " + DU_LOG("\nERROR --> SCH : Invalid inst ID"); + DU_LOG("\nERROR --> SCH : SchProcGenCfgReq(): " "pst->dstInst=%d SCH_INST_START=%d", pst->dstInst,SCH_INST_START); return ROK; } - printf("\nReceived scheduler gen config"); + DU_LOG("\nINFO --> SCH : Received scheduler gen config"); /* Fill the post structure for sending the confirmation */ memset(&cfmPst, 0 , sizeof(Pst)); SchFillCfmPst(pst, &cfmPst, cfg); @@ -226,7 +226,7 @@ uint8_t SchProcGenCfgReq(Pst *pst, RgMngmt *cfg) default: ret = LCM_PRIM_NOK; reason = LCM_REASON_INVALID_ELMNT; - DU_LOG("\nInvalid Elmnt=%d", cfg->hdr.elmId.elmnt); + DU_LOG("\nERROR --> SCH : Invalid Elmnt=%d", cfg->hdr.elmId.elmnt); break; } @@ -264,7 +264,6 @@ uint8_t MacSchSlotInd(Pst *pst, SlotIndInfo *slotInd) { Inst inst = pst->dstInst-SCH_INST_START; - /* Now call the TOM (Tfu ownership module) primitive to process further */ schProcessSlotInd(slotInd, inst); return ROK; @@ -289,7 +288,7 @@ uint8_t MacSchSlotInd(Pst *pst, SlotIndInfo *slotInd) uint8_t MacSchRachInd(Pst *pst, RachIndInfo *rachInd) { Inst inst = pst->dstInst-SCH_INST_START; - DU_LOG("\nSCH : Received Rach indication"); + DU_LOG("\nINFO --> SCH : Received Rach indication"); schProcessRachInd(rachInd, inst); return ROK; } @@ -316,21 +315,208 @@ uint8_t MacSchCrcInd(Pst *pst, CrcIndInfo *crcInd) switch(crcInd->crcInd[0]) { case CRC_FAILED: - DU_LOG("\nSCH : Received CRC indication. CRC Status [FAILURE]"); + DU_LOG("\nDEBUG --> SCH : Received CRC indication. CRC Status [FAILURE]"); break; case CRC_PASSED: - DU_LOG("\nSCH : Received CRC indication. CRC Status [PASS]"); + DU_LOG("\nDEBUG --> SCH : Received CRC indication. CRC Status [PASS]"); break; default: - DU_LOG("\nSCH : Invalid CRC state %d", crcInd->crcInd[0]); + DU_LOG("\nDEBUG --> SCH : Invalid CRC state %d", crcInd->crcInd[0]); return RFAILED; } return ROK; } +#ifdef NR_TDD +/** + *@brief Returns TDD periodicity in micro seconds + * + * @details + * + * Function : schGetPeriodicityInMsec + * + * This API retunrs TDD periodicity in micro seconds + * + * @param[in] DlUlTxPeriodicity + * @return periodicityInMsec + * **/ + +uint16_t schGetPeriodicityInMsec(DlUlTxPeriodicity tddPeriod) +{ + uint16_t periodicityInMsec = 0; + switch(tddPeriod) + { + case TX_PRDCTY_MS_0P5: + { + periodicityInMsec = 500; + break; + } + case TX_PRDCTY_MS_0P625: + { + periodicityInMsec = 625; + break; + } + case TX_PRDCTY_MS_1: + { + periodicityInMsec = 1000; + break; + } + case TX_PRDCTY_MS_1P25: + { + periodicityInMsec = 1250; + break; + } + case TX_PRDCTY_MS_2: + { + periodicityInMsec = 2000; + break; + } + case TX_PRDCTY_MS_2P5: + { + periodicityInMsec = 2500; + break; + } + case TX_PRDCTY_MS_5: + { + periodicityInMsec = 5000; + break; + } + case TX_PRDCTY_MS_10: + { + periodicityInMsec = 10000; + break; + } + default: + { + DU_LOG("\nERROR --> SCH : Invalid DlUlTxPeriodicity:%d", tddPeriod); + } + } + + return periodicityInMsec; +} + /** - * @brief inti cellCb based on cellCfg + * @brief init TDD slot config + * + * @details + * + * Function : schInitTddSlotCfg + * + * This API is invoked after receiving schCellCfg + * + * @param[in] schCellCb *cell + * @param[in] SchCellCfg *schCellCfg + * @return int + * -# ROK + * -# RFAILED + **/ +void schInitTddSlotCfg(SchCellCb *cell, SchCellCfg *schCellCfg) +{ + uint16_t periodicityInMicroSec = 0; + uint32_t slotBitPos, symbBitPos, bitMask; + int8_t slotIdx, symbIdx; + + periodicityInMicroSec = schGetPeriodicityInMsec(schCellCfg->tddCfg.tddPeriod); + schCellCfg->numerology = 1; //TODO: Remove this + cell->numSlotsInPeriodicity = (periodicityInMicroSec * pow(2, schCellCfg->numerology))/1000; +cell->slotFrmtBitMap = 0; + cell->symbFrmtBitMap = 0; + slotBitPos = (cell->numSlotsInPeriodicity*2)-1; /* considering 2 bits to represent a slot */ + symbBitPos = (MAX_SYMB_PER_SLOT*2)-1; /* considering 2 bits to represent a symbol */ + for(slotIdx = cell->numSlotsInPeriodicity-1; slotIdx >= 0; slotIdx--) + { + symbIdx = 0; + /* If the first and last symbol are the same, the entire slot is the same type */ + if((schCellCfg->tddCfg.slotCfg[slotIdx][symbIdx] == schCellCfg->tddCfg.slotCfg[slotIdx][MAX_SYMB_PER_SLOT-1]) && + schCellCfg->tddCfg.slotCfg[slotIdx][symbIdx] != FLEXI_SLOT) + { + switch(schCellCfg->tddCfg.slotCfg[slotIdx][symbIdx]) + { + case DL_SLOT: + { + /*BitMap to be set to 00 */ + bitMask = 1<slotFrmtBitMap = (cell->slotFrmtBitMap & ~(bitMask)) | ((0<slotFrmtBitMap = (cell->slotFrmtBitMap & ~(bitMask)) | ((0<slotFrmtBitMap = (cell->slotFrmtBitMap & ~(bitMask)) | ((0<slotFrmtBitMap = (cell->slotFrmtBitMap & ~(bitMask)) | ((1< SCH : Invalid slot Config in schInitTddSlotCfg"); + } + continue; + } + /* slot config is flexible. First set slotBitMap to 10 */ + bitMask = 1<slotFrmtBitMap = (cell->slotFrmtBitMap & ~(bitMask)) | ((1<slotFrmtBitMap = (cell->slotFrmtBitMap & ~(bitMask)) | ((0<= 0; symbIdx--) + { + switch(schCellCfg->tddCfg.slotCfg[slotIdx][symbIdx]) + { + case DL_SLOT: + { + /*symbol BitMap to be set to 00 */ + bitMask = 1<symbFrmtBitMap = (cell->symbFrmtBitMap & ~(bitMask)) | ((0<symbFrmtBitMap = (cell->symbFrmtBitMap & ~(bitMask)) | ((0<symbFrmtBitMap = (cell->symbFrmtBitMap & ~(bitMask)) | ((0<symbFrmtBitMap = (cell->symbFrmtBitMap & ~(bitMask)) | ((1<symbFrmtBitMap = (cell->symbFrmtBitMap & ~(bitMask)) | ((1<symbFrmtBitMap = (cell->symbFrmtBitMap & ~(bitMask)) | ((0< SCH : Invalid slot Config in schInitTddSlotCfg"); + } + } + } + +} +#endif + + +/** + * @brief init cellCb based on cellCfg * * @details * @@ -346,28 +532,65 @@ uint8_t MacSchCrcInd(Pst *pst, CrcIndInfo *crcInd) **/ uint8_t schInitCellCb(Inst inst, SchCellCfg *schCellCfg) { - SchCellCb *cell; + SchCellCb *cell= NULLP; SCH_ALLOC(cell, sizeof(SchCellCb)); if(!cell) { - DU_LOG("\nMemory allocation failed in schInitCellCb"); + DU_LOG("\nERROR --> SCH : Memory allocation failed in schInitCellCb"); return RFAILED; } cell->cellId = schCellCfg->cellId; cell->instIdx = inst; - switch(schCellCfg->ssbSchCfg.scsCommon) + switch(schCellCfg->numerology) { - case SCH_SCS_15KHZ: + case SCH_NUMEROLOGY_0: + { + cell->numSlots = SCH_MU0_NUM_SLOTS; + } + break; + case SCH_NUMEROLOGY_1: + { + cell->numSlots = SCH_MU1_NUM_SLOTS; + } + break; + case SCH_NUMEROLOGY_2: + { + cell->numSlots = SCH_MU2_NUM_SLOTS; + } + break; + case SCH_NUMEROLOGY_3: + { + cell->numSlots = SCH_MU3_NUM_SLOTS; + } + break; + case SCH_NUMEROLOGY_4: { - cell->numSlots = SCH_NUM_SLOTS; + cell->numSlots = SCH_MU4_NUM_SLOTS; } break; default: - DU_LOG("\nSCS %d not supported", schCellCfg->ssbSchCfg.scsCommon); + DU_LOG("\nERROR --> SCH : Numerology %d not supported", schCellCfg->numerology); + } +#ifdef NR_TDD + schInitTddSlotCfg(cell, schCellCfg); +#endif + + SCH_ALLOC(cell->schDlSlotInfo, cell->numSlots * sizeof(SchDlSlotInfo*)); + if(!cell->schDlSlotInfo) + { + DU_LOG("\nERROR --> SCH : Memory allocation failed in schInitCellCb for schDlSlotInfo"); + return RFAILED; + } + + SCH_ALLOC(cell->schUlSlotInfo, cell->numSlots * sizeof(SchUlSlotInfo*)); + if(!cell->schUlSlotInfo) + { + DU_LOG("\nERROR --> SCH : Memory allocation failed in schInitCellCb for schUlSlotInfo"); + return RFAILED; } - for(uint8_t idx=0; idxnumSlots; idx++) { SchDlSlotInfo *schDlSlotInfo; SchUlSlotInfo *schUlSlotInfo; @@ -376,7 +599,7 @@ uint8_t schInitCellCb(Inst inst, SchCellCfg *schCellCfg) SCH_ALLOC(schDlSlotInfo, sizeof(SchDlSlotInfo)); if(!schDlSlotInfo) { - DU_LOG("\nMemory allocation failed in schInitCellCb"); + DU_LOG("\nERROR --> SCH : Memory allocation failed in schInitCellCb"); return RFAILED; } @@ -384,7 +607,7 @@ uint8_t schInitCellCb(Inst inst, SchCellCfg *schCellCfg) SCH_ALLOC(schUlSlotInfo, sizeof(SchUlSlotInfo)); if(!schUlSlotInfo) { - DU_LOG("\nMemory allocation failed in schInitCellCb"); + DU_LOG("\nERROR --> SCH : Memory allocation failed in schInitCellCb"); return RFAILED; } @@ -397,7 +620,7 @@ uint8_t schInitCellCb(Inst inst, SchCellCfg *schCellCfg) } schCb[inst].cells[inst] = cell; - DU_LOG("\nCell init completed for cellId:%d", cell->cellId); + DU_LOG("\nINFO --> SCH : Cell init completed for cellId:%d", cell->cellId); return ROK; } @@ -411,14 +634,14 @@ uint8_t schInitCellCb(Inst inst, SchCellCfg *schCellCfg) * * Fill SIB1 configuration * - * @param[in] Inst schInst : scheduler instance + * @param[in] uint8_t bandwidth : total available bandwidth + * uint8_t numSlots : total slots per SFN * SchSib1Cfg *sib1SchCfg : cfg to be filled * uint16_t pci : physical cell Id * uint8_t offsetPointA : offset * @return void **/ -void fillSchSib1Cfg(Inst schInst, SchSib1Cfg *sib1SchCfg, uint16_t pci, \ - uint8_t offsetPointA) +void fillSchSib1Cfg(uint8_t bandwidth, uint8_t numSlots, SchSib1Cfg *sib1SchCfg, uint16_t pci, uint8_t offsetPointA) { uint8_t coreset0Idx = 0; uint8_t searchSpace0Idx = 0; @@ -459,14 +682,29 @@ void fillSchSib1Cfg(Inst schInst, SchSib1Cfg *sib1SchCfg, uint16_t pci, \ * [(O . 2^u + i . M ) ] mod numSlotsPerSubframe * assuming u = 0, i = 0, numSlotsPerSubframe = 10 * Also, from this configuration, coreset0 is only on even subframe */ - slotIndex = ((oValue * 1) + (0 * mValue)) % 10; + slotIndex = ((oValue * 1) + (0 * mValue)) % numSlots; sib1SchCfg->n0 = slotIndex; /* calculate the PRBs */ freqDomRscAllocType0(((offsetPointA-offset)/6), (numRbs/6), FreqDomainResource); /* fill BWP */ - bwp->freqAlloc.numPrb = MAX_NUM_RB; /* whole of BW */ + switch(bandwidth) + { + case BANDWIDTH_20MHZ: + { + bwp->freqAlloc.numPrb = TOTAL_PRB_20MHZ_MU0; + } + break; + case BANDWIDTH_100MHZ: + { + bwp->freqAlloc.numPrb = TOTAL_PRB_100MHZ_MU1; + } + break; + default: + DU_LOG("\nERROR --> SCH : Bandwidth %d not supported", bandwidth); + + } bwp->freqAlloc.startPrb = 0; bwp->subcarrierSpacing = 0; /* 15Khz */ bwp->cyclicPrefix = 0; /* normal */ @@ -579,13 +817,13 @@ void fillSsbStartSymb(SchCellCb *cellCb) for(uint8_t idx=0; idx SCH : SCS %d is currently not supported", scs); } memset(cellCb->ssbStartSymbArr, 0, sizeof(SCH_MAX_SSB_BEAM)); memcpy(cellCb->ssbStartSymbArr, ssbStartSymbArr, SCH_MAX_SSB_BEAM); @@ -620,10 +858,8 @@ uint8_t SchHdlCellCfgReq(Pst *pst, SchCellCfg *schCellCfg) cellCb->macInst = pst->srcInst; /* derive the SIB1 config parameters */ - fillSchSib1Cfg( - inst, - &(schCellCfg->sib1SchCfg), - schCellCfg->phyCellId, + fillSchSib1Cfg(schCellCfg->bandwidth, cellCb->numSlots, + &(schCellCfg->sib1SchCfg), schCellCfg->phyCellId, schCellCfg->ssbSchCfg.ssbOffsetPointA); memcpy(&cellCb->cellCfg, schCellCfg, sizeof(SchCellCfg)); @@ -671,7 +907,7 @@ uint8_t MacSchDlRlcBoInfo(Pst *pst, DlRlcBoInfo *dlBoInfo) SchDlSlotInfo *schDlSlotInfo = NULLP; Inst inst = pst->dstInst-SCH_INST_START; - DU_LOG("\nSCH : Received RLC BO Status indication"); + DU_LOG("\nDEBUG --> SCH : Received RLC BO Status indication"); cell = schCb[inst].cells[inst]; GET_UE_IDX(dlBoInfo->crnti, ueIdx); @@ -686,17 +922,17 @@ uint8_t MacSchDlRlcBoInfo(Pst *pst, DlRlcBoInfo *dlBoInfo) } else if(lcId != SRB0_LCID) { - DU_LOG("\nSCH : Invalid LC Id %d in MacSchDlRlcBoInfo", lcId); + DU_LOG("\nERROR --> SCH : Invalid LC Id %d in MacSchDlRlcBoInfo", lcId); return RFAILED; } - slot = (cell->slotInfo.slot + SCHED_DELTA + PHY_DELTA + BO_DELTA) % SCH_NUM_SLOTS; + slot = (cell->slotInfo.slot + SCHED_DELTA + PHY_DELTA + BO_DELTA) % cell->numSlots; schDlSlotInfo = cell->schDlSlotInfo[slot]; SCH_ALLOC(schDlSlotInfo->dlMsgInfo, sizeof(DlMsgInfo)); if(!schDlSlotInfo->dlMsgInfo) { - DU_LOG("\nSCH : Memory allocation failed for dlMsgInfo"); + DU_LOG("\nERROR --> SCH : Memory allocation failed for dlMsgInfo"); schDlSlotInfo = NULL; return RFAILED; } @@ -738,7 +974,7 @@ uint8_t MacSchBsr(Pst *pst, UlBufferStatusRptInd *bsrInd) SchUeCb *ueCb = NULLP; uint8_t lcgIdx; - DU_LOG("\nSCH : Received BSR"); + DU_LOG("\nDEBUG --> SCH : Received BSR"); cellCb = schCb[schInst].cells[schInst]; ueCb = schGetUeCb(cellCb, bsrInd->crnti); @@ -775,7 +1011,7 @@ uint8_t MacSchSrUciInd(Pst *pst, SrUciIndInfo *uciInd) SchUeCb *ueCb; SchCellCb *cellCb = schCb[inst].cells[inst]; - DU_LOG("\nSCH : Received SR"); + DU_LOG("\nDEBUG --> SCH : Received SR"); ueCb = schGetUeCb(cellCb, uciInd->crnti);