Merge branch 'NR_SCHED_PDCCH_PUCCH_HARQ' of...

Merge branch 'NR_SCHED_PDCCH_PUCCH_HARQ' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SCHED_PDCCH_PUCCH_HARQ

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c

@@ -421,7 +421,6 @@ void nr_simple_dlsch_preprocessor(module_id_t module_id,
   uint16_t *vrb_map = RC.nrmac[module_id]->common_channels[CC_id].vrb_map;
   /* get the PID of a HARQ process awaiting retransmission, or -1 otherwise */
   sched_ctrl->dl_harq_pid = sched_ctrl->retrans_dl_harq.head;
-  NR_UE_harq_t *harq = &sched_ctrl->harq_processes[sched_ctrl->dl_harq_pid];
   const uint16_t bwpSize = NRRIV2BW(sched_ctrl->active_bwp->bwp_Common->genericParameters.locationAndBandwidth, 275);
   int rbStart = NRRIV2PRBOFFSET(sched_ctrl->active_bwp->bwp_Common->genericParameters.locationAndBandwidth, 275);
 
@@ -807,7 +806,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
               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 */
+       * from RLC or encode MAC CEs. The TX_req structure is filled below */
       LOG_W(MAC,
             "%d.%2d DL retransmission UE %d/RNTI %04x HARQ PID %d round %d NDI %d\n",
             frame,
@@ -817,20 +816,16 @@ void nr_schedule_ue_spec(module_id_t module_id,
             current_harq_pid,
             harq->round,
             harq->ndi);
+      AssertFatal(harq->tb_size == TBS,
+                  "UE %d mismatch between scheduled TBS and buffered TB for HARQ PID %d\n",
+                  UE_id,
+                  current_harq_pid);
     } else { /* initial transmission */
 
       LOG_D(MAC, "[%s] Initial HARQ transmission in %d.%d\n", __FUNCTION__, frame, slot);
-      const int ntx_req = gNB_mac->TX_req[CC_id].Number_of_PDUs;
-      nfapi_nr_pdu_t *tx_req = &gNB_mac->TX_req[CC_id].pdu_list[ntx_req];
-      tx_req->PDU_length = TBS;
-      tx_req->PDU_index  = pduindex;
-      tx_req->num_TLV = 1;
-      tx_req->TLVs[0].length = TBS + 2;
-      /* pointer to directly generate the PDU into the nFAPI structure */
-      uint8_t *buf = (uint8_t *) tx_req->TLVs[0].value.direct;
-      gNB_mac->TX_req[CC_id].Number_of_PDUs++;
-      gNB_mac->TX_req[CC_id].SFN = frame;
-      gNB_mac->TX_req[CC_id].Slot = slot;
+
+      harq->tb_size = TBS;
+      uint8_t *buf = (uint8_t *) harq->tb;
 
       /* first, write all CEs that might be there */
       int written = nr_write_ce_dlsch_pdu(module_id,
@@ -957,6 +952,17 @@ void nr_schedule_ue_spec(module_id_t module_id,
         T_INT(frame), T_INT(slot), T_INT(current_harq_pid), T_BUFFER(buf, TBS));
     }
 
+    const int ntx_req = gNB_mac->TX_req[CC_id].Number_of_PDUs;
+    nfapi_nr_pdu_t *tx_req = &gNB_mac->TX_req[CC_id].pdu_list[ntx_req];
+    tx_req->PDU_length = TBS;
+    tx_req->PDU_index  = pduindex;
+    tx_req->num_TLV = 1;
+    tx_req->TLVs[0].length = TBS + 2;
+    memcpy(tx_req->TLVs[0].value.direct, harq->tb, TBS);
+    gNB_mac->TX_req[CC_id].Number_of_PDUs++;
+    gNB_mac->TX_req[CC_id].SFN = frame;
+    gNB_mac->TX_req[CC_id].Slot = slot;
+
     /* mark UE as scheduled */
     sched_ctrl->rbSize = 0;
   }

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c

@@ -1613,6 +1613,7 @@ int add_new_nr_ue(module_id_t mod_idP, rnti_t rntiP, NR_CellGroupConfig_t *secon
     UE_info->rnti[UE_id] = rntiP;
     UE_info->secondaryCellGroup[UE_id] = secondaryCellGroup;
     add_nr_list(&UE_info->list, UE_id);
+    memset(UE_info->mac_stats[UE_id], 0, sizeof(NR_mac_stats_t));
     set_Y(UE_info->Y[UE_id], rntiP);
     compute_csi_bitlen(secondaryCellGroup, UE_info, UE_id);
     NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];

openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h

@@ -344,6 +344,10 @@ typedef struct NR_UE_harq {
   uint8_t ndi;
   uint8_t round;
   uint16_t feedback_slot;
+
+  /* Transport block to be sent using this HARQ process */
+  uint32_t tb[16384];
+  uint32_t tb_size;
 } NR_UE_harq_t;
 
 typedef struct NR_UE_old_sched {