X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrsch%2Fsch_rach.c;h=77e736f1b50a501c77a9b69acf58f806c4ebfe20;hb=c54639b00f6dbf6b737d6345f19b0d0a8febabc0;hp=0e9bd93b9e951cf573adc4da0caa17e4ef7e9220;hpb=9665386af091888e0e62b83ce91c25c973eb33aa;p=o-du%2Fl2.git diff --git a/src/5gnrsch/sch_rach.c b/src/5gnrsch/sch_rach.c index 0e9bd93b9..77e736f1b 100644 --- a/src/5gnrsch/sch_rach.c +++ b/src/5gnrsch/sch_rach.c @@ -62,10 +62,10 @@ uint8_t puschDeltaTable[MAX_MU_PUSCH]; uint16_t calculateRaRnti(uint8_t symbolIdx, uint8_t slotIdx, uint8_t freqIdx) { uint16_t raRnti = 0; - uint8_t ulCarrierIdx = 0; /* configured to 0 */ - - raRnti = (1+symbolIdx+(14*slotIdx)+(14*80*freqIdx)+(14*80*8*ulCarrierIdx)); + uint8_t ulCarrierIdx = 0; /* Uplink carrier used for MSG1 transmission. 0:NUL carrier; 1:SUL carrier */ + /* Refer to spec 38.321, section 5.1.3 */ + raRnti = (1 + symbolIdx + (14*slotIdx) + (14*80*freqIdx) + (14*80*8*ulCarrierIdx)); return raRnti; } @@ -105,15 +105,10 @@ void createSchRaCb(uint16_t tcrnti, Inst schInst) * @param[out] msg3NumRb * @return void **/ -uint8_t schAllocMsg3Pusch(Inst schInst, uint16_t slot, uint16_t crnti, \ - uint16_t *msg3StartRb, uint8_t *msg3NumRb) +SchPuschInfo* schAllocMsg3Pusch(Inst schInst, uint16_t slot, uint16_t crnti, uint16_t msg3SlotAlloc) { - SchCellCb *cell = NULLP; - SchUlSlotInfo *schUlSlotInfo = NULLP; - uint8_t puschMu = 0; - uint8_t msg3SlotAlloc = 0; - uint8_t delta = 0; - uint8_t k2 = 0; + SchCellCb *cell = NULLP; + SchUlSlotInfo *schUlSlotInfo = NULLP; uint8_t startSymb = 0; uint8_t symbLen = 0; uint8_t startRb = 0; @@ -124,15 +119,8 @@ uint8_t schAllocMsg3Pusch(Inst schInst, uint16_t slot, uint16_t crnti, \ uint16_t tbSize = 0; cell = schCb[schInst].cells[schInst]; - // puschMu = cell->cellCfg.puschMu; - delta = puschDeltaTable[puschMu]; - k2 = cell->cellCfg.schInitialUlBwp.puschCommon.k2; - startSymb = cell->cellCfg.schInitialUlBwp.puschCommon.startSymbol; - symbLen = cell->cellCfg.schInitialUlBwp.puschCommon.lengthSymbol; - - /* Slot allocation for msg3 based on 38.214 section 6.1.2.1 */ - msg3SlotAlloc = slot + k2 + delta; - msg3SlotAlloc = msg3SlotAlloc % cell->numSlots; + startSymb = cell->cellCfg.schInitialUlBwp.puschCommon.timeDomRsrcAllocList[0].startSymbol; + symbLen = cell->cellCfg.schInitialUlBwp.puschCommon.timeDomRsrcAllocList[0].symbolLength; startRb = cell->schUlSlotInfo[msg3SlotAlloc]->puschCurrentPrb; tbSize = schCalcTbSize(8); /* 6 bytes msg3 and 2 bytes header */ @@ -153,7 +141,7 @@ uint8_t schAllocMsg3Pusch(Inst schInst, uint16_t slot, uint16_t crnti, \ if(!schUlSlotInfo->schPuschInfo) { DU_LOG("\nERROR --> SCH : Memory allocation failed in schAllocMsg3Pusch"); - return RFAILED; + return NULLP; } tbSize = 0; /* since nPrb has been incremented, recalculating tbSize */ tbSize = schCalcTbSizeFromNPrb(numRb, mcs, numPdschSymbols); @@ -175,12 +163,117 @@ uint8_t schAllocMsg3Pusch(Inst schInst, uint16_t slot, uint16_t crnti, \ schUlSlotInfo->schPuschInfo->nrOfDmrsSymbols = NUM_DMRS_SYMBOLS; schUlSlotInfo->schPuschInfo->dmrsAddPos = DMRS_ADDITIONAL_POS; - *msg3StartRb = startRb; - *msg3NumRb = numRb; - return ROK; + return schUlSlotInfo->schPuschInfo; } +/** + * @brief Processes any pending RA request + * + * @details + * + * Function : schProcessRaReq + * + * This function process pending RA request + * + * @param[in] Current timing of the cell + * @return ROK + **/ +void schProcessRaReq(SlotTimingInfo currTime, SchCellCb *cell) +{ + uint8_t ueIdx = 0; + SchPuschInfo *msg3PuschInfo; + RarInfo *rarInfo = NULLP; + uint8_t delta = 0; + uint8_t k2Index = 0, k2 = 0; + uint8_t puschMu = 0; + uint16_t rarSlot = 0; + uint16_t msg3Slot = 0; +#ifdef NR_TDD + uint16_t slotIdx = 0; +#endif + while(ueIdx < MAX_NUM_UE) + { + if(cell->raReq[ueIdx] == NULLP) + { + ueIdx++; + continue; + } + + //puschMu = cell->cellCfg.puschMu; + delta = puschDeltaTable[puschMu]; + k2 = cell->cellCfg.schInitialUlBwp.puschCommon.timeDomRsrcAllocList[k2Index].k2; + + /* RAR will sent with a delay of RAR_DELAY */ + rarSlot = (currTime.slot + RAR_DELAY + PHY_DELTA_DL) % cell->numSlots; +#ifdef NR_TDD + for(slotIdx=0; slotIdxnumSlots;slotIdx++) + { + /* Slot allocation for msg3 based on 38.214 section 6.1.2.1 */ + msg3Slot = (rarSlot+delta+k2)%cell->numSlots; + + if((schGetSlotSymbFrmt(rarSlot, cell->slotFrmtBitMap) != DL_SLOT) &&\ + (schGetSlotSymbFrmt(msg3Slot, cell->slotFrmtBitMap) != UL_SLOT)) + { + rarSlot = (rarSlot + 1) % cell->numSlots; + continue; + } + break; + } + if(slotIdx>=cell->numSlots) + { + DU_LOG("\nERROR --> SCH : NO Slot for Msg2 with Msg3 Grant\n"); + return RFAILED; + } +#else + /* Slot allocation for msg3 based on 38.214 section 6.1.2.1 */ + msg3Slot = rarSlot + k2 + delta; + msg3Slot = msg3Slot % cell->numSlots; +#endif + + SchDlSlotInfo *schDlSlotInfo = cell->schDlSlotInfo[rarSlot]; /* RAR will sent in the next slot */ + + /* Allocate the rarInfo, this pointer will be checked at schProcessSlotInd function */ + SCH_ALLOC(rarInfo, sizeof(RarInfo)); + if(rarInfo == NULLP) + { + DU_LOG("\nERROR --> SCH : Memory Allocation failed for rarInfo"); + return RFAILED; + } + + schDlSlotInfo->rarInfo = rarInfo; + + /* create raCb at SCH */ + createSchRaCb(cell->raReq[ueIdx]->rachInd->crnti, cell->instIdx); + + /* allocate resources for msg3 */ + msg3PuschInfo = schAllocMsg3Pusch(cell->instIdx, rarSlot, cell->raReq[ueIdx]->rachInd->crnti, msg3Slot); + if(msg3PuschInfo) + { + /* fill RAR info */ + rarInfo->raRnti = cell->raReq[ueIdx]->raRnti; + rarInfo->tcrnti = cell->raReq[ueIdx]->rachInd->crnti; + rarInfo->RAPID = cell->raReq[ueIdx]->rachInd->preambleIdx; + rarInfo->ta = cell->raReq[ueIdx]->rachInd->timingAdv; + rarInfo->ulGrant.bwpSize = cell->cellCfg.schInitialUlBwp.bwp.freqAlloc.numPrb; + /* Spec 38.213, section 8.2, 0 : MSG3 PUSCH will be transmitted without frequency hopping */ + rarInfo->ulGrant.freqHopFlag = 0; + rarInfo->ulGrant.msg3FreqAlloc.startPrb = msg3PuschInfo->fdAlloc.startPrb; + rarInfo->ulGrant.msg3FreqAlloc.numPrb = msg3PuschInfo->fdAlloc.numPrb; + rarInfo->ulGrant.k2Index = k2Index; + rarInfo->ulGrant.mcs = msg3PuschInfo->tbInfo.mcs; + rarInfo->ulGrant.tpc = 3; /* TODO : Check appropriate value to be filled */ + /* Spec 38.213, section 8.2 : In a contention based random access + * procedure, the CSI request field is reserved. */ + rarInfo->ulGrant.csiReq = 0; + } + + SCH_FREE(cell->raReq[ueIdx]->rachInd, sizeof(RachIndInfo)); + SCH_FREE(cell->raReq[ueIdx], sizeof(SchRaReq)); + ueIdx++; + + } /* End of while(ueIdx < MAX_NUM_UE) */ +} /** * @brief process rach indication function. @@ -198,47 +291,37 @@ uint8_t schAllocMsg3Pusch(Inst schInst, uint16_t slot, uint16_t crnti, \ uint8_t schProcessRachInd(RachIndInfo *rachInd, Inst schInst) { SchCellCb *cell = schCb[schInst].cells[schInst]; - RarInfo *rarInfo = NULLP; - uint16_t raRnti = 0; - uint16_t rarSlot = 0; - uint16_t msg3StartRb; - uint8_t msg3NumRb; - uint8_t ret = ROK; - - /* RAR will sent with a delay of RAR_DELAY */ - rarSlot = (rachInd->timingInfo.slot+RAR_DELAY+PHY_DELTA_DL)%cell->numSlots; + SchRaReq *raReq = NULLP; + float slotDuration; + uint8_t winNumSlots; + uint8_t ueIdx; - SchDlSlotInfo *schDlSlotInfo = cell->schDlSlotInfo[rarSlot]; /* RAR will sent in the next slot */ - - /* Allocate the rarInfo, this pointer will be checked at schProcessSlotInd function */ - SCH_ALLOC(rarInfo, sizeof(RarInfo)); - if(rarInfo == NULLP) + SCH_ALLOC(raReq, sizeof(SchRaReq)); + if(!raReq) { - DU_LOG("\nERROR --> SCH : Memory Allocation failed for rarInfo"); + DU_LOG("\nERROR --> SCH : Memory allocation failure in schProcessRachInd"); + SCH_FREE(rachInd, sizeof(RachIndInfo)); return RFAILED; } - schDlSlotInfo->rarInfo = rarInfo; - /* calculate the ra-rnti value */ - raRnti = calculateRaRnti(rachInd->symbolIdx,rachInd->slotIdx,rachInd->freqIdx); + raReq->raRnti = calculateRaRnti(rachInd->symbolIdx, rachInd->slotIdx, rachInd->freqIdx); + raReq->rachInd = rachInd; + raReq->winStartTime.sfn = rachInd->timingInfo.sfn; + raReq->winStartTime.slot = rachInd->timingInfo.slot; + + /* Converting window size from ms to number of slots */ + slotDuration = (1 / pow(2, cell->cellCfg.numerology)); + winNumSlots = (float)cell->cellCfg.schRachCfg.raRspWindow / slotDuration; + + /* Adding window size to window start time to get window end time */ + ADD_DELTA_TO_TIME(raReq->winStartTime, raReq->winEndTime, winNumSlots); - /* create raCb at SCH */ - createSchRaCb(rachInd->crnti,schInst); + /* Storing RA request in cellCb */ + GET_UE_IDX(rachInd->crnti, ueIdx); + cell->raReq[ueIdx] = raReq; - /* allocate resources for msg3 */ - ret = schAllocMsg3Pusch(schInst, rarSlot, rachInd->crnti, &msg3StartRb, &msg3NumRb); - if(ret == ROK) - { - /* fill RAR info */ - rarInfo->raRnti = raRnti; - rarInfo->tcrnti = rachInd->crnti; - rarInfo->RAPID = rachInd->preambleIdx; - rarInfo->ta = rachInd->timingAdv; - rarInfo->msg3FreqAlloc.startPrb = msg3StartRb; - rarInfo->msg3FreqAlloc.numPrb = msg3NumRb; - } - return ret; + return ROK; } /** @@ -256,7 +339,8 @@ uint8_t schProcessRachInd(RachIndInfo *rachInd, Inst schInst) * @param[in] offset to pointA to determine freq alloc * @return ROK **/ -uint8_t schFillRar(RarAlloc *rarAlloc, uint16_t raRnti, uint16_t pci, uint8_t offsetPointA) +uint8_t schFillRar(RarAlloc *rarAlloc, uint16_t raRnti, uint16_t pci, uint8_t offsetPointA, \ +bool ssbPresent, bool sib1Present) { Inst inst = 0; uint8_t coreset0Idx = 0; @@ -266,14 +350,13 @@ uint8_t schFillRar(RarAlloc *rarAlloc, uint16_t raRnti, uint16_t pci, uint8_t of uint8_t offset = 0; uint8_t FreqDomainResource[6] = {0}; uint16_t tbSize = 0; - uint8_t numPdschSymbols = 12; /* considering pdsch region from 2 to 13 */ uint8_t mcs = 4; /* MCS fixed to 4 */ SchBwpDlCfg *initialBwp = &schCb[inst].cells[inst]->cellCfg.schInitialDlBwp; - PdcchCfg *pdcch = &rarAlloc->rarPdcchCfg; PdschCfg *pdsch = &rarAlloc->rarPdschCfg; BwpCfg *bwp = &rarAlloc->bwp; + FreqDomainAlloc *sib1PdschFreqAlloc = NULL; coreset0Idx = initialBwp->pdcchCommon.commonSearchSpace.coresetId; @@ -340,14 +423,15 @@ uint8_t schFillRar(RarAlloc *rarAlloc, uint16_t raRnti, uint16_t pci, uint8_t of pdsch->codeword[cwCount].mcsIndex = mcs; /* mcs configured to 4 */ pdsch->codeword[cwCount].mcsTable = 0; /* notqam256 */ pdsch->codeword[cwCount].rvIndex = 0; - tbSize = schCalcTbSize(10); /* 8 bytes RAR and 2 bytes padding */ + /* RAR PDU length and FAPI payload header length */ + tbSize = schCalcTbSize(RAR_PAYLOAD_SIZE + TX_PAYLOAD_HDR_LEN); pdsch->codeword[cwCount].tbSize = tbSize; } pdsch->dataScramblingId = pci; pdsch->numLayers = 1; pdsch->transmissionScheme = 0; pdsch->refPoint = 0; - pdsch->dmrs.dlDmrsSymbPos = 2; + pdsch->dmrs.dlDmrsSymbPos = 4; /* Bitmap value 00000000000100 i.e. using 3rd symbol for PDSCH DMRS */ pdsch->dmrs.dmrsConfigType = 0; /* type-1 */ pdsch->dmrs.dlDmrsScramblingId = pci; pdsch->dmrs.scid = 0; @@ -357,11 +441,24 @@ uint8_t schFillRar(RarAlloc *rarAlloc, uint16_t raRnti, uint16_t pci, uint8_t of pdsch->dmrs.nrOfDmrsSymbols = NUM_DMRS_SYMBOLS; pdsch->dmrs.dmrsAddPos = DMRS_ADDITIONAL_POS; pdsch->pdschFreqAlloc.resourceAllocType = 1; /* RAT type-1 RIV format */ - pdsch->pdschFreqAlloc.freqAlloc.startPrb = offset + SCH_SSB_NUM_PRB; /* the RB numbering starts from coreset0, and PDSCH is always above SSB */ - pdsch->pdschFreqAlloc.freqAlloc.numPrb = schCalcNumPrb(tbSize,mcs,numPdschSymbols); + /* The RB numbering starts from coreset0 */ + pdsch->pdschFreqAlloc.freqAlloc.startPrb = PDSCH_START_RB; + if(ssbPresent) + { + /* PDSCH is always above SSB */ + pdsch->pdschFreqAlloc.freqAlloc.startPrb = offsetPointA + SCH_SSB_NUM_PRB + 1; + } + if(sib1Present) + { + /* Must not overlap with SIB1 */ + sib1PdschFreqAlloc = &schCb[inst].cells[inst]->cellCfg.sib1SchCfg.sib1PdschCfg.pdschFreqAlloc.freqAlloc; + pdsch->pdschFreqAlloc.freqAlloc.startPrb = sib1PdschFreqAlloc->startPrb + sib1PdschFreqAlloc->numPrb + 1; + } + pdsch->pdschFreqAlloc.freqAlloc.numPrb = schCalcNumPrb(tbSize, mcs, \ + initialBwp->pdschCommon.timeDomRsrcAllocList[0].lengthSymbol); pdsch->pdschFreqAlloc.vrbPrbMapping = 0; /* non-interleaved */ - pdsch->pdschTimeAlloc.timeAlloc.startSymb = initialBwp->pdschCommon.startSymbol; - pdsch->pdschTimeAlloc.timeAlloc.numSymb = initialBwp->pdschCommon.lengthSymbol; + pdsch->pdschTimeAlloc.timeAlloc.startSymb = initialBwp->pdschCommon.timeDomRsrcAllocList[0].startSymbol; + pdsch->pdschTimeAlloc.timeAlloc.numSymb = initialBwp->pdschCommon.timeDomRsrcAllocList[0].lengthSymbol; pdsch->beamPdschInfo.numPrgs = 1; pdsch->beamPdschInfo.prgSize = 1; pdsch->beamPdschInfo.digBfInterfaces = 0;