diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
index b90ffa03782e9048a5e1fe8e1cc78877c314ff86..8090f00ae39539677de4d70867760981edf4d5dd 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
@@ -573,6 +573,8 @@ void nr_schedule_ue_spec(module_id_t module_id,
if (sched_ctrl->rbSize <= 0 && !get_softmodem_params()->phy_test)
continue;
+ const rnti_t rnti = UE_info->rnti[UE_id];
+
/* POST processing */
struct NR_PDSCH_TimeDomainResourceAllocationList *tdaList =
sched_ctrl->active_bwp->bwp_Common->pdsch_ConfigCommon->choice.setup->pdsch_TimeDomainAllocationList;
@@ -600,110 +602,12 @@ void nr_schedule_ue_spec(module_id_t module_id,
1 /* nrOfLayers */)
>> 3;
- /* Get RLC data TODO: remove random data retrieval */
- int header_length_total = 0;
- int header_length_last = 0;
- int sdu_length_total = 0;
- int num_sdus = 0;
- uint16_t sdu_lengths[NB_RB_MAX] = {0};
- uint8_t mac_sdus[MAX_NR_DLSCH_PAYLOAD_BYTES];
- unsigned char sdu_lcids[NB_RB_MAX] = {0};
- const rnti_t rnti = UE_info->rnti[UE_id];
- const int lcid = DL_SCH_LCID_DTCH;
- if (sched_ctrl->num_total_bytes > 0) {
- LOG_D(MAC,
- "[gNB %d][USER-PLANE DEFAULT DRB] Frame %d : DTCH->DLSCH, Requesting "
- "%d bytes from RLC (lcid %d total hdr len %d), TBS: %d \n \n",
- module_id,
- frame,
- TBS - ta_len - header_length_total - sdu_length_total - 3,
- lcid,
- header_length_total,
- TBS);
-
- sdu_lengths[num_sdus] = mac_rlc_data_req(module_id,
- rnti,
- module_id,
- frame,
- ENB_FLAG_YES,
- MBMS_FLAG_NO,
- lcid,
- TBS - ta_len - header_length_total - sdu_length_total - 3,
- (char *)&mac_sdus[sdu_length_total],
- 0,
- 0);
-
- LOG_D(MAC,
- "[gNB %d][USER-PLANE DEFAULT DRB] Got %d bytes for DTCH %d \n",
- module_id,
- sdu_lengths[num_sdus],
- lcid);
-
- sdu_lcids[num_sdus] = lcid;
- sdu_length_total += sdu_lengths[num_sdus];
- header_length_last = 1 + 1 + (sdu_lengths[num_sdus] >= 128);
- header_length_total += header_length_last;
-
- num_sdus++;
-
- //ue_sched_ctl->uplane_inactivity_timer = 0;
- }
- else if (get_softmodem_params()->phy_test) {
- LOG_D(MAC, "Configuring DL_TX in %d.%d: random data\n", frame, slot);
- // fill dlsch_buffer with random data
- for (int i = 0; i < TBS; i++)
- mac_sdus[i] = (unsigned char) (lrand48()&0xff);
- sdu_lcids[0] = 0x3f; // DRB
- sdu_lengths[0] = TBS - ta_len - 3;
- header_length_total += 2 + (sdu_lengths[0] >= 128);
- sdu_length_total += sdu_lengths[0];
- num_sdus +=1;
- }
-
- // there is at least one SDU or TA command
- // if (num_sdus > 0 ){
- if (ta_len + sdu_length_total + header_length_total == 0) {
- // There is no data from RLC or MAC header, so don't schedule
- return;
- }
-
- // Check if there is data from RLC or CE
- const int post_padding = TBS >= 2 + header_length_total + sdu_length_total + ta_len;
- // padding param currently not in use
- //padding = TBS - header_length_total - sdu_length_total - ta_len - 1;
-
- const int offset = nr_generate_dlsch_pdu(
- module_id,
- (unsigned char *)mac_sdus,
- (unsigned char *)gNB_mac->UE_info.DLSCH_pdu[0][0].payload[0],
- num_sdus, // num_sdus
- sdu_lengths,
- sdu_lcids,
- 255, // no drx
- NULL, // contention res id
- post_padding);
-
- // Padding: fill remainder of DLSCH with 0
- if (post_padding > 0) {
- for (int j = 0; j < TBS - offset; j++)
- gNB_mac->UE_info.DLSCH_pdu[0][0].payload[0][offset + j] = 0;
- }
-
const int current_harq_pid = sched_ctrl->current_harq_pid;
NR_UE_harq_t *harq = &sched_ctrl->harq_processes[current_harq_pid];
NR_sched_pucch *pucch = &sched_ctrl->sched_pucch[sched_ctrl->pucch_sched_idx];
harq->feedback_slot = pucch->ul_slot;
harq->is_waiting = 1;
UE_info->mac_stats[UE_id].dlsch_rounds[harq->round]++;
- if (harq->round == 0)
- UE_info->mac_stats[UE_id].dlsch_total_bytes += TBS;
-
- NR_UE_ret_info_t *retInfo = &sched_ctrl->retInfo[current_harq_pid];
- retInfo->rbSize = sched_ctrl->rbSize;
- retInfo->time_domain_allocation = sched_ctrl->time_domain_allocation;
- retInfo->mcsTableIdx = sched_ctrl->mcsTableIdx;
- retInfo->mcs = sched_ctrl->mcs;
- retInfo->numDmrsCdmGrpsNoData = sched_ctrl->numDmrsCdmGrpsNoData;
nfapi_nr_dl_tti_request_body_t *dl_req = &gNB_mac->DL_req[CC_id].dl_tti_request_body;
nr_fill_nfapi_dl_pdu(module_id,
@@ -732,26 +636,152 @@ void nr_schedule_ue_spec(module_id_t module_id,
harq->ndi,
harq->round);
- nfapi_nr_pdu_t *tx_req = &gNB_mac->TX_req[CC_id].pdu_list[gNB_mac->TX_req[CC_id].Number_of_PDUs];
- configure_fapi_dl_Tx(module_id,
- frame,
- slot,
- dl_req,
- tx_req,
- TBS,
- gNB_mac->pdu_index[CC_id]);
+ NR_UE_ret_info_t *retInfo = &sched_ctrl->retInfo[current_harq_pid];
+ if (harq->round != 0) { /* retransmission */
+ if (sched_ctrl->rbSize != retInfo->rbSize)
+ LOG_W(MAC,
+ "retransmission uses different rbSize (%d vs. orig %d)\n",
+ sched_ctrl->rbSize,
+ retInfo->rbSize);
+ if (sched_ctrl->time_domain_allocation != retInfo->time_domain_allocation)
+ LOG_W(MAC,
+ "retransmission uses different time_domain_allocation (%d vs. orig %d)\n",
+ sched_ctrl->time_domain_allocation,
+ retInfo->time_domain_allocation);
+ if (sched_ctrl->mcs != retInfo->mcs
+ || sched_ctrl->mcsTableIdx != retInfo->mcsTableIdx
+ || sched_ctrl->numDmrsCdmGrpsNoData != retInfo->numDmrsCdmGrpsNoData)
+ LOG_W(MAC,
+ "retransmission uses different table/MCS/numDmrsCdmGrpsNoData (%d/%d/%d vs. orig %d/%d/%d)\n",
+ sched_ctrl->mcsTableIdx,
+ sched_ctrl->mcs,
+ sched_ctrl->numDmrsCdmGrpsNoData,
+ retInfo->mcsTableIdx,
+ retInfo->mcs,
+ retInfo->numDmrsCdmGrpsNoData);
+ /* we do not have to do anything, since we do not require to get data
+ * from RLC, encode MAC CEs, or copy data to FAPI structures */
+ LOG_W(MAC, "%d.%2d retransmission UE %d/RNTI %04x\n", frame, slot, UE_id, rnti);
+ } else { /* initial transmission */
+ /* Get RLC data TODO: remove random data retrieval */
+ int header_length_total = 0;
+ int header_length_last = 0;
+ int sdu_length_total = 0;
+ int num_sdus = 0;
+ uint16_t sdu_lengths[NB_RB_MAX] = {0};
+ uint8_t mac_sdus[MAX_NR_DLSCH_PAYLOAD_BYTES];
+ unsigned char sdu_lcids[NB_RB_MAX] = {0};
+ const int lcid = DL_SCH_LCID_DTCH;
+ if (sched_ctrl->num_total_bytes > 0) {
+ LOG_D(MAC,
+ "[gNB %d][USER-PLANE DEFAULT DRB] Frame %d : DTCH->DLSCH, Requesting "
+ "%d bytes from RLC (lcid %d total hdr len %d), TBS: %d \n \n",
+ module_id,
+ frame,
+ TBS - ta_len - header_length_total - sdu_length_total - 3,
+ lcid,
+ header_length_total,
+ TBS);
+
+ sdu_lengths[num_sdus] = mac_rlc_data_req(module_id,
+ rnti,
+ module_id,
+ frame,
+ ENB_FLAG_YES,
+ MBMS_FLAG_NO,
+ lcid,
+ TBS - ta_len - header_length_total - sdu_length_total - 3,
+ (char *)&mac_sdus[sdu_length_total],
+ 0,
+ 0);
+
+ LOG_D(MAC,
+ "[gNB %d][USER-PLANE DEFAULT DRB] Got %d bytes for DTCH %d \n",
+ module_id,
+ sdu_lengths[num_sdus],
+ lcid);
+
+ sdu_lcids[num_sdus] = lcid;
+ sdu_length_total += sdu_lengths[num_sdus];
+ header_length_last = 1 + 1 + (sdu_lengths[num_sdus] >= 128);
+ header_length_total += header_length_last;
+
+ num_sdus++;
+
+ //ue_sched_ctl->uplane_inactivity_timer = 0;
+ }
+ else if (get_softmodem_params()->phy_test) {
+ LOG_D(MAC, "Configuring DL_TX in %d.%d: random data\n", frame, slot);
+ // fill dlsch_buffer with random data
+ for (int i = 0; i < TBS; i++)
+ mac_sdus[i] = (unsigned char) (lrand48()&0xff);
+ sdu_lcids[0] = 0x3f; // DRB
+ sdu_lengths[0] = TBS - ta_len - 3;
+ header_length_total += 2 + (sdu_lengths[0] >= 128);
+ sdu_length_total += sdu_lengths[0];
+ num_sdus +=1;
+ }
+
+ // there is at least one SDU or TA command
+ // if (num_sdus > 0 ){
+ if (ta_len + sdu_length_total + header_length_total == 0) {
+ // There is no data from RLC or MAC header, so don't schedule
+ return;
+ }
+
+ // Check if there is data from RLC or CE
+ const int post_padding = TBS >= 2 + header_length_total + sdu_length_total + ta_len;
+ // padding param currently not in use
+ //padding = TBS - header_length_total - sdu_length_total - ta_len - 1;
+
+ const int offset = nr_generate_dlsch_pdu(
+ module_id,
+ (unsigned char *)mac_sdus,
+ (unsigned char *)gNB_mac->UE_info.DLSCH_pdu[0][0].payload[0],
+ num_sdus, // num_sdus
+ sdu_lengths,
+ sdu_lcids,
+ 255, // no drx
+ NULL, // contention res id
+ post_padding);
+
+ // Padding: fill remainder of DLSCH with 0
+ if (post_padding > 0) {
+ for (int j = 0; j < TBS - offset; j++)
+ gNB_mac->UE_info.DLSCH_pdu[0][0].payload[0][offset + j] = 0;
+ }
+
+ UE_info->mac_stats[UE_id].dlsch_total_bytes += TBS;
+
+ retInfo->rbSize = sched_ctrl->rbSize;
+ retInfo->time_domain_allocation = sched_ctrl->time_domain_allocation;
+ retInfo->mcsTableIdx = sched_ctrl->mcsTableIdx;
+ retInfo->mcs = sched_ctrl->mcs;
+ retInfo->numDmrsCdmGrpsNoData = sched_ctrl->numDmrsCdmGrpsNoData;
+
+ nfapi_nr_pdu_t *tx_req = &gNB_mac->TX_req[CC_id].pdu_list[gNB_mac->TX_req[CC_id].Number_of_PDUs];
+ configure_fapi_dl_Tx(module_id,
+ frame,
+ slot,
+ dl_req,
+ tx_req,
+ TBS,
+ gNB_mac->pdu_index[CC_id]);
#if defined(ENABLE_MAC_PAYLOAD_DEBUG)
- if (frame%100 == 0){
- LOG_I(MAC,
- "%d.%d, first 10 payload bytes, TBS size: %d \n",
- frame,
- slot,
- TBS);
- for(int i = 0; i < 10; i++) {
- LOG_I(MAC, "byte %d : %x\n", i,((uint8_t *)gNB_mac->UE_info.DLSCH_pdu[0][0].payload[0])[i]);
+ if (frame%100 == 0) {
+ LOG_I(MAC,
+ "%d.%d, first 10 payload bytes, TBS size: %d \n",
+ frame,
+ slot,
+ TBS);
+ for(int i = 0; i < 10; i++)
+ LOG_I(MAC,
+ "byte %d: %x\n",
+ i,
+ ((uint8_t *)gNB_mac->UE_info.DLSCH_pdu[0][0].payload[0])[i]);
}
- }
#endif
}
+ }
}