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;
}
* @param[out] msg3NumRb
* @return void
**/
-uint8_t schAllocMsg3Pusch(Inst schInst, uint16_t slot, uint16_t crnti, \
- uint16_t *msg3StartRb, uint8_t *msg3NumRb, uint16_t msg3SlotAlloc)
+SchPuschInfo* schAllocMsg3Pusch(Inst schInst, uint16_t crnti, uint8_t k2Index, uint16_t msg3Slot)
{
- SchCellCb *cell = NULLP;
- SchUlSlotInfo *schUlSlotInfo = NULLP;
+ SchCellCb *cell = NULLP;
+ SchUlSlotInfo *schUlSlotInfo = NULLP;
uint8_t startSymb = 0;
uint8_t symbLen = 0;
uint8_t startRb = 0;
uint8_t numRb = 0;
uint8_t idx = 0;
uint8_t mcs = 4;
- uint8_t numPdschSymbols= 14;
uint16_t tbSize = 0;
cell = schCb[schInst].cells[schInst];
- startSymb = cell->cellCfg.schInitialUlBwp.puschCommon.startSymbol;
- symbLen = cell->cellCfg.schInitialUlBwp.puschCommon.lengthSymbol;
+ if(cell == NULL)
+ {
+ DU_LOG("\n\nERROR --> SCH : Failed to find cell in schAllocMsg3Pusch");
+ return NULLP;
+ }
- startRb = cell->schUlSlotInfo[msg3SlotAlloc]->puschCurrentPrb;
+ startSymb = cell->cellCfg.schInitialUlBwp.puschCommon.timeDomRsrcAllocList[k2Index].startSymbol;
+ symbLen = cell->cellCfg.schInitialUlBwp.puschCommon.timeDomRsrcAllocList[k2Index].symbolLength;
+
+ startRb = cell->schUlSlotInfo[msg3Slot]->puschCurrentPrb;
tbSize = schCalcTbSize(8); /* 6 bytes msg3 and 2 bytes header */
- numRb = schCalcNumPrb(tbSize, mcs, numPdschSymbols);
+ numRb = schCalcNumPrb(tbSize, mcs, NUM_PDSCH_SYMBOL);
/* allocating 1 extra RB for now */
numRb++;
/* increment PUSCH PRB */
- cell->schUlSlotInfo[msg3SlotAlloc]->puschCurrentPrb += numRb;
+ cell->schUlSlotInfo[msg3Slot]->puschCurrentPrb += numRb;
for(idx=startSymb; idx<symbLen; idx++)
{
- cell->schUlSlotInfo[msg3SlotAlloc]->assignedPrb[idx] = startRb + numRb;
+ //cell->schUlSlotInfo[msg3Slot]->assignedPrb[idx] = startRb + numRb;
}
- schUlSlotInfo = cell->schUlSlotInfo[msg3SlotAlloc];
+ schUlSlotInfo = cell->schUlSlotInfo[msg3Slot];
SCH_ALLOC(schUlSlotInfo->schPuschInfo, sizeof(SchPuschInfo));
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);
- tbSize = tbSize/8;/*bits to byte conversion*/
+ tbSize = schCalcTbSizeFromNPrb(numRb, mcs, NUM_PDSCH_SYMBOL);
+ tbSize = tbSize / 8 ; /*bits to byte conversion*/
schUlSlotInfo->schPuschInfo->crnti = crnti;
schUlSlotInfo->schPuschInfo->harqProcId = SCH_HARQ_PROC_ID;
schUlSlotInfo->schPuschInfo->resAllocType = SCH_ALLOC_TYPE_1;
schUlSlotInfo->schPuschInfo->fdAlloc.numPrb = numRb;
schUlSlotInfo->schPuschInfo->tdAlloc.startSymb = startSymb;
schUlSlotInfo->schPuschInfo->tdAlloc.numSymb = symbLen;
- schUlSlotInfo->schPuschInfo->tbInfo.qamOrder = 2; /* QPSK modulation */
- schUlSlotInfo->schPuschInfo->tbInfo.mcs = mcs;
+ schUlSlotInfo->schPuschInfo->tbInfo.qamOrder = QPSK_MODULATION; /* QPSK modulation */
+ schUlSlotInfo->schPuschInfo->tbInfo.mcs = mcs;
schUlSlotInfo->schPuschInfo->tbInfo.mcsTable = SCH_MCS_TABLE_QAM_64;
- schUlSlotInfo->schPuschInfo->tbInfo.ndi = 1; /* new transmission */
- schUlSlotInfo->schPuschInfo->tbInfo.rv = 0;
+ schUlSlotInfo->schPuschInfo->tbInfo.ndi = NEW_TRANSMISSION; /* new transmission */
+ schUlSlotInfo->schPuschInfo->tbInfo.rv = 0;
schUlSlotInfo->schPuschInfo->tbInfo.tbSize = tbSize; /*Considering 2 PRBs */
schUlSlotInfo->schPuschInfo->dmrsMappingType = DMRS_MAP_TYPE_A; /* Setting Type-A */
schUlSlotInfo->schPuschInfo->nrOfDmrsSymbols = NUM_DMRS_SYMBOLS;
schUlSlotInfo->schPuschInfo->dmrsAddPos = DMRS_ADDITIONAL_POS;
- *msg3StartRb = startRb;
- *msg3NumRb = numRb;
- return ROK;
+ return schUlSlotInfo->schPuschInfo;
}
+/**
+ * @brief Check if a time frame is in RA Response window
+ *
+ * @details
+ *
+ * Function : isInRaRspWindow
+ *
+ * Check if a time frame is in RA Response window
+ *
+ * @param[in] RA request
+ * @param[in] Time frame to check
+ * @param[in] Total number of slot per radio frame
+ * @return true
+ * @return false
+ **/
+RaRspWindowStatus isInRaRspWindow(SchRaReq *raReq, SlotTimingInfo frameToCheck, uint16_t numSlotsPerSystemFrame)
+{
+ uint32_t winStartTime, winEndTime, timeToCheck;
+
+ winStartTime = (raReq->winStartTime.sfn * numSlotsPerSystemFrame) + raReq->winStartTime.slot;
+ winEndTime = (raReq->winEndTime.sfn * numSlotsPerSystemFrame) + raReq->winEndTime.slot;
+ timeToCheck = (frameToCheck.sfn * numSlotsPerSystemFrame) + frameToCheck.slot;
+
+ /* TODO : check how to handle the wrap around scenario of MAX_SFN */
+ if((timeToCheck >= winStartTime) && (timeToCheck <= winEndTime))
+ return WITHIN_WINDOW;
+ else if(timeToCheck < winStartTime)
+ return WINDOW_YET_TO_START;
+
+ return WINDOW_EXPIRED;
+}
+/**
+ * @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)
+{
+ bool k2Found = false;
+ uint8_t ueIdx = 0, k0TblIdx = 0, k2TblIdx = 0;
+ uint8_t k0Index = 0, k2Index = 0;
+ uint8_t k0 = 0, k2 = 0;
+ uint8_t puschMu = 0;
+ uint8_t msg3Delta = 0, msg3MinSchTime = 0;
+#ifdef NR_TDD
+ uint8_t totalCfgSlot = 0;
+#endif
+ uint16_t dciSlot = 0, rarSlot = 0, msg3Slot = 0;
+ SlotTimingInfo dciTime, rarTime;
+ RarAlloc *dciSlotAlloc = NULLP; /* Stores info for transmission of PDCCH for RAR */
+ RarAlloc *rarSlotAlloc = NULLP; /* Stores info for transmission of RAR PDSCH */
+ SchPuschInfo *msg3PuschInfo = NULLP; /* Stores MSG3 PUSCH scheduling information */
+ SchK0K1TimingInfoTbl *k0K1InfoTbl=NULLP;
+ SchK2TimingInfoTbl *msg3K2InfoTbl=NULLP;
+ RaRspWindowStatus windowStatus=0;
+
+ while(ueIdx < MAX_NUM_UE)
+ {
+ if(cell->raReq[ueIdx] == NULLP)
+ {
+ ueIdx++;
+ continue;
+ }
+
+#ifdef NR_TDD
+ totalCfgSlot = calculateSlotPatternLength(cell->cellCfg.ssbSchCfg.scsCommon, cell->cellCfg.tddCfg.tddPeriod);
+#endif
+ k0K1InfoTbl = &cell->cellCfg.schInitialDlBwp.k0K1InfoTbl;
+ msg3K2InfoTbl = &cell->cellCfg.schInitialUlBwp.msg3K2InfoTbl;
+ puschMu = cell->cellCfg.numerology;
+ msg3Delta = puschDeltaTable[puschMu];
+ msg3MinSchTime = minMsg3SchTime[cell->cellCfg.numerology];
+
+ /* Calculating time frame to send DCI for RAR */
+ ADD_DELTA_TO_TIME(currTime, dciTime, PHY_DELTA_DL + SCHED_DELTA);
+ dciSlot = dciTime.slot;
+#ifdef NR_TDD
+ /* Consider this slot for sending DCI, only if it is a DL slot */
+ if(schGetSlotSymbFrmt(dciSlot, cell->slotFrmtBitMap) == DL_SLOT)
+#endif
+ {
+
+ /* Check if this slot is within RA response window */
+ windowStatus = isInRaRspWindow(cell->raReq[ueIdx], dciTime, cell->numSlots);
+ if(windowStatus == WITHIN_WINDOW)
+ {
+ /* For all k0 values, search for a suitable k2 value to schedule MSG3.
+ * RAR DCI, RAR PDSCH and MSG3 is scheduled only if one such k0-k2 combination
+ * is found. Else no scheduling happens.
+ */
+ for(k0TblIdx = 0; k0TblIdx < k0K1InfoTbl->k0k1TimingInfo[dciSlot].numK0; k0TblIdx++)
+ {
+ k0Index = k0K1InfoTbl->k0k1TimingInfo[dciSlot].k0Indexes[k0TblIdx].k0Index;
+ k0 = cell->cellCfg.schInitialDlBwp.pdschCommon.timeDomRsrcAllocList[k0Index].k0;
+
+ /* Calculating time frame to send RAR PDSCH */
+ ADD_DELTA_TO_TIME(dciTime, rarTime, k0);
+ rarSlot = rarTime.slot;
+
+ for(k2TblIdx = 0; k2TblIdx < msg3K2InfoTbl->k2TimingInfo[rarSlot].numK2; k2TblIdx++)
+ {
+ k2Index = msg3K2InfoTbl->k2TimingInfo[rarSlot].k2Indexes[k2TblIdx];
+ k2 = cell->cellCfg.schInitialUlBwp.puschCommon.timeDomRsrcAllocList[k2Index].k2;
+
+ /* Delta is added to the slot allocation for msg3 based on 38.214 section 6.1.2.1 */
+ k2 = k2 + msg3Delta;
+ if(k2 >= msg3MinSchTime)
+ {
+ msg3Slot = (rarSlot + k2) % cell->numSlots;
+#ifdef NR_TDD
+ if(schGetSlotSymbFrmt(msg3Slot % totalCfgSlot, cell->slotFrmtBitMap) == DL_SLOT)
+ continue;
+#endif
+ k2Found = true;
+ break;
+ }
+ }
+ if(k2Found)
+ break;
+ }
+ }
+ else if(windowStatus == WINDOW_EXPIRED)
+ {
+ SCH_FREE(cell->raReq[ueIdx]->rachInd, sizeof(RachIndInfo));
+ SCH_FREE(cell->raReq[ueIdx], sizeof(SchRaReq));
+ ueIdx++;
+ continue;
+ }
+
+ /* If K0-K2 combination not found, no scheduling happens */
+ if(!k2Found)
+ {
+ ueIdx++;
+ continue;
+ }
+
+ /* Allocate memory for RAR PDCCH slot, pointer will be checked at schProcessSlotInd() */
+ SCH_ALLOC(dciSlotAlloc, sizeof(RarAlloc));
+ if(dciSlotAlloc == NULLP)
+ {
+ DU_LOG("\nERROR --> SCH : Memory Allocation failed for dciSlotAlloc");
+ return;
+ }
+ cell->schDlSlotInfo[dciSlot]->rarAlloc = dciSlotAlloc;
+
+ /* Fill PDCCH and PDSCH scheduling information for RAR */
+ if((schFillRar(cell, rarTime, ueIdx, dciSlotAlloc, k0Index)) != ROK)
+ {
+ DU_LOG("\nERROR --> SCH: Scheduling of RAR failed in slot [%d]", rarSlot);
+ SCH_FREE(dciSlotAlloc, sizeof(RarAlloc));
+ cell->schDlSlotInfo[dciSlot]->rarAlloc = NULLP;
+ return;
+ }
+
+ /* Allocate resources for msg3 */
+ msg3PuschInfo = schAllocMsg3Pusch(cell->instIdx, cell->raReq[ueIdx]->rachInd->crnti, k2Index, msg3Slot);
+ if(msg3PuschInfo)
+ {
+ /* Fill RAR info */
+ dciSlotAlloc->rarInfo.raRnti = cell->raReq[ueIdx]->raRnti;
+ dciSlotAlloc->rarInfo.tcrnti = cell->raReq[ueIdx]->rachInd->crnti;
+ dciSlotAlloc->rarInfo.RAPID = cell->raReq[ueIdx]->rachInd->preambleIdx;
+ dciSlotAlloc->rarInfo.ta = cell->raReq[ueIdx]->rachInd->timingAdv;
+ dciSlotAlloc->rarInfo.ulGrant.bwpSize = cell->cellCfg.schInitialUlBwp.bwp.freqAlloc.numPrb;
+ /* Spec 38.213, section 8.2, 0 : MSG3 PUSCH will be transmitted without frequency hopping */
+ dciSlotAlloc->rarInfo.ulGrant.freqHopFlag = 0;
+ dciSlotAlloc->rarInfo.ulGrant.msg3FreqAlloc.startPrb = msg3PuschInfo->fdAlloc.startPrb;
+ dciSlotAlloc->rarInfo.ulGrant.msg3FreqAlloc.numPrb = msg3PuschInfo->fdAlloc.numPrb;
+ dciSlotAlloc->rarInfo.ulGrant.k2Index = k2Index;
+ dciSlotAlloc->rarInfo.ulGrant.mcs = msg3PuschInfo->tbInfo.mcs;
+ dciSlotAlloc->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. */
+ dciSlotAlloc->rarInfo.ulGrant.csiReq = 0;
+ }
+
+ /* Check if both DCI and RAR are sent in the same slot.
+ * If not, allocate memory RAR PDSCH slot to store RAR info
+ */
+ if(dciSlot == rarSlot)
+ dciSlotAlloc->pduPres = BOTH;
+ else
+ {
+ /* Allocate memory to schedule rarSlot to send RAR, pointer will be checked at schProcessSlotInd() */
+ SCH_ALLOC(rarSlotAlloc, sizeof(RarAlloc));
+ if(rarSlotAlloc == NULLP)
+ {
+ DU_LOG("\nERROR --> SCH : Memory Allocation failed for rarSlotAlloc");
+ SCH_FREE(dciSlotAlloc, sizeof(RarAlloc));
+ cell->schDlSlotInfo[dciSlot]->rarAlloc = NULLP;
+ return;
+ }
+ cell->schDlSlotInfo[rarSlot]->rarAlloc = rarSlotAlloc;
+
+ /* Copy all RAR info */
+ memcpy(rarSlotAlloc, dciSlotAlloc, sizeof(RarAlloc));
+ rarSlotAlloc->rarPdcchCfg.dci.pdschCfg = &rarSlotAlloc->rarPdschCfg;
+
+ /* Assign correct PDU types in corresponding slots */
+ rarSlotAlloc->pduPres = PDSCH_PDU;
+ dciSlotAlloc->pduPres = PDCCH_PDU;
+ dciSlotAlloc->pdschSlot = rarSlot;
+ }
+
+ /* Create raCb at SCH */
+ createSchRaCb(cell->raReq[ueIdx]->rachInd->crnti, cell->instIdx);
+
+ 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.
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;
- uint8_t delta = 0;
- uint8_t k2 = 0;
- uint8_t puschMu = 0;
- uint16_t msg3Slot = 0;
-#ifdef NR_TDD
- uint16_t slotIdx = 0;
-#endif
+ SchRaReq *raReq = NULLP;
+ float slotDuration;
+ uint8_t winNumSlots;
+ uint8_t ueIdx;
- //puschMu = cell->cellCfg.puschMu;
- delta = puschDeltaTable[puschMu];
- k2 = cell->cellCfg.schInitialUlBwp.puschCommon.k2;
- /* RAR will sent with a delay of RAR_DELAY */
- rarSlot = (rachInd->timingInfo.slot+RAR_DELAY+PHY_DELTA_DL)%cell->numSlots;
-#ifdef NR_TDD
- for(slotIdx=0; slotIdx<cell->numSlots;slotIdx++)
+ if(cell == NULLP)
{
- /* 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;
+ DU_LOG("\nERROR --> SCH: Failed to find cell in schProcessRachInd");
+ return RFAILED;
}
- if(slotIdx>=cell->numSlots)
+
+ /* Storing RA request in cellCb */
+ GET_UE_IDX(rachInd->crnti, ueIdx);
+ if(ueIdx <= 0)
{
- DU_LOG("\nERROR --> SCH : NO Slot for Msg2 with Msg3 Grant\n");
- return RFAILED;
+ DU_LOG("\nERROR --> SCH: Invalid CRNTI [%d]", rachInd->crnti);
+ 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)
+ 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);
+ cell->raReq[ueIdx -1] = raReq;
- /* allocate resources for msg3 */
- ret = schAllocMsg3Pusch(schInst, rarSlot, rachInd->crnti, &msg3StartRb, &msg3NumRb, msg3Slot);
- 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;
}
/**
* @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(SchCellCb *cell, SlotTimingInfo rarTime, uint16_t ueIdx, RarAlloc *rarAlloc, uint8_t k0Index)
{
- Inst inst = 0;
- uint8_t coreset0Idx = 0;
- uint8_t numRbs = 0;
- uint8_t firstSymbol = 0;
- uint8_t numSymbols = 0;
- uint8_t offset = 0;
- uint8_t FreqDomainResource[6] = {0};
+ uint8_t coreset0Idx = 0;
+ uint8_t firstSymbol = 0, numSymbols = 0;
+ uint8_t mcs = 4; /* MCS fixed to 4 */
+ uint8_t dmrsStartSymbol, startSymbol, numSymbol ;
+ uint16_t numRbs = 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;
+ SchBwpDlCfg *initialBwp = &cell->cellCfg.schInitialDlBwp;
PdcchCfg *pdcch = &rarAlloc->rarPdcchCfg;
PdschCfg *pdsch = &rarAlloc->rarPdschCfg;
BwpCfg *bwp = &rarAlloc->bwp;
- coreset0Idx = initialBwp->pdcchCommon.commonSearchSpace.coresetId;
-
/* derive the sib1 coreset0 params from table 13-1 spec 38.213 */
- numRbs = coresetIdxTable[coreset0Idx][1];
- numSymbols = coresetIdxTable[coreset0Idx][2];
- offset = coresetIdxTable[coreset0Idx][3];
+ coreset0Idx = initialBwp->pdcchCommon.commonSearchSpace.coresetId;
+ numRbs = coresetIdxTable[coreset0Idx][1];
+ numSymbols = coresetIdxTable[coreset0Idx][2];
/* calculate time domain parameters */
// note: since slot value is made sl1, RAR can be sent at all slots
uint16_t mask = 0x2000;
- for(firstSymbol=0; firstSymbol<14;firstSymbol++)
+ for(firstSymbol=0; firstSymbol<MAX_SYMB_PER_SLOT; firstSymbol++)
{
if(initialBwp->pdcchCommon.commonSearchSpace.monitoringSymbol & mask)
break;
mask = mask>>1;
}
- /* calculate the PRBs */
- freqDomRscAllocType0(((offsetPointA-offset)/6), (numRbs/6), FreqDomainResource);
-
/* fill BWP */
bwp->freqAlloc.numPrb = initialBwp->bwp.freqAlloc.numPrb;
bwp->freqAlloc.startPrb = initialBwp->bwp.freqAlloc.startPrb;
/* fill the PDCCH PDU */
pdcch->coresetCfg.startSymbolIndex = firstSymbol;
pdcch->coresetCfg.durationSymbols = numSymbols;
- memcpy(pdcch->coresetCfg.freqDomainResource, FreqDomainResource, FREQ_DOM_RSRC_SIZE);
+ memcpy(pdcch->coresetCfg.freqDomainResource, \
+ cell->cellCfg.schInitialDlBwp.pdcchCommon.commonSearchSpace.freqDomainRsrc, FREQ_DOM_RSRC_SIZE);
+
pdcch->coresetCfg.cceRegMappingType = 1; /* coreset0 is always interleaved */
pdcch->coresetCfg.regBundleSize = 6; /* spec-38.211 sec 7.3.2.2 */
pdcch->coresetCfg.interleaverSize = 2; /* spec-38.211 sec 7.3.2.2 */
pdcch->coresetCfg.coreSetType = 0;
- pdcch->coresetCfg.shiftIndex = pci;
+ pdcch->coresetCfg.coreSetSize = numRbs;
+ pdcch->coresetCfg.shiftIndex = cell->cellCfg.phyCellId;
pdcch->coresetCfg.precoderGranularity = 0; /* sameAsRegBundle */
pdcch->numDlDci = 1;
- pdcch->dci.rnti = raRnti; /* RA-RNTI */
- pdcch->dci.scramblingId = pci;
+ pdcch->dci.rnti = cell->raReq[ueIdx]->raRnti; /* RA-RNTI */
+ pdcch->dci.scramblingId = cell->cellCfg.phyCellId;
pdcch->dci.scramblingRnti = 0;
pdcch->dci.cceIndex = 4; /* considering SIB1 is sent at cce 0-1-2-3 */
pdcch->dci.aggregLevel = 4;
/* fill the PDSCH PDU */
uint8_t cwCount = 0;
pdsch->pduBitmap = 0; /* PTRS and CBG params are excluded */
- pdsch->rnti = raRnti; /* RA-RNTI */
+ pdsch->rnti = cell->raReq[ueIdx]->raRnti; /* RA-RNTI */
pdsch->pduIndex = 0;
pdsch->numCodewords = 1;
for(cwCount = 0; cwCount < pdsch->numCodewords; cwCount++)
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->dataScramblingId = cell->cellCfg.phyCellId;
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.dlDmrsScramblingId = cell->cellCfg.phyCellId;
pdsch->dmrs.scid = 0;
pdsch->dmrs.numDmrsCdmGrpsNoData = 1;
pdsch->dmrs.dmrsPorts = 0;
pdsch->dmrs.mappingType = DMRS_MAP_TYPE_A; /* Type-A */
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);
+
+ pdsch->pdschTimeAlloc.timeAlloc.startSymb = initialBwp->pdschCommon.timeDomRsrcAllocList[k0Index].startSymbol;
+ pdsch->pdschTimeAlloc.timeAlloc.numSymb = initialBwp->pdschCommon.timeDomRsrcAllocList[k0Index].lengthSymbol;
+
pdsch->pdschFreqAlloc.vrbPrbMapping = 0; /* non-interleaved */
- pdsch->pdschTimeAlloc.timeAlloc.startSymb = initialBwp->pdschCommon.startSymbol;
- pdsch->pdschTimeAlloc.timeAlloc.numSymb = initialBwp->pdschCommon.lengthSymbol;
+ pdsch->pdschFreqAlloc.resourceAllocType = 1; /* RAT type-1 RIV format */
+ pdsch->pdschFreqAlloc.freqAlloc.startPrb = MAX_NUM_RB;
+ pdsch->pdschFreqAlloc.freqAlloc.numPrb = \
+ schCalcNumPrb(tbSize, mcs, initialBwp->pdschCommon.timeDomRsrcAllocList[k0Index].lengthSymbol);
+
+ /* Find total symbols occupied including DMRS */
+ dmrsStartSymbol = findDmrsStartSymbol(pdsch->dmrs.dlDmrsSymbPos);
+ /* If there are no DRMS symbols, findDmrsStartSymbol() returns MAX_SYMB_PER_SLOT,
+ * in that case only PDSCH symbols are marked as occupied */
+ if(dmrsStartSymbol == MAX_SYMB_PER_SLOT)
+ {
+ startSymbol = pdsch->pdschTimeAlloc.timeAlloc.startSymb;
+ numSymbol = pdsch->pdschTimeAlloc.timeAlloc.numSymb;
+ }
+ /* If DMRS symbol is found, mark DMRS and PDSCH symbols as occupied */
+ else
+ {
+ startSymbol = dmrsStartSymbol;
+ numSymbol = pdsch->dmrs.nrOfDmrsSymbols + pdsch->pdschTimeAlloc.timeAlloc.numSymb;
+ }
+
+ /* Allocate the number of PRBs required for RAR PDSCH */
+ if((allocatePrbDl(cell, rarTime, startSymbol, numSymbol,\
+ &pdsch->pdschFreqAlloc.freqAlloc.startPrb, pdsch->pdschFreqAlloc.freqAlloc.numPrb)) != ROK)
+ {
+ DU_LOG("\nERROR --> SCH : allocatePrbDl() failed for RAR");
+ return RFAILED;
+ }
+
pdsch->beamPdschInfo.numPrgs = 1;
pdsch->beamPdschInfo.prgSize = 1;
pdsch->beamPdschInfo.digBfInterfaces = 0;