PUSCH data filling from PHY to MAC:

- IP data were fetched and passed to MAC directly at the PHY layer
- random data was generated whenever there's no upcoming data.
- Therefore these functionalities are now moved to MAC and FAPI interfaces
- are used instead.

openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c

@@ -98,7 +98,7 @@ void nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE,
                                uint8_t thread_id,
                                int gNB_id) {
 
-  uint32_t available_bits, TBS;
+  uint32_t available_bits;
   uint8_t mod_order, cwd_index, num_of_codewords, l;
   uint32_t scrambled_output[NR_MAX_NB_CODEWORDS][NR_MAX_PDSCH_ENCODED_LENGTH>>5];
   uint32_t ***pusch_dmrs;
@@ -111,7 +111,6 @@ void nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE,
   int ap, start_symbol, Nid_cell, i;
   int sample_offsetF, N_RE_prime, N_PRB_oh;
   uint16_t ul_dmrs_symb_pos;
-  uint8_t data_existing =0;
   uint8_t L_ptrs, K_ptrs; // PTRS parameters
   uint16_t beta_ptrs; // PTRS parameter related to power control
   uint8_t no_data_in_dmrs = 1;
@@ -120,7 +119,6 @@ void nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE,
   NR_UL_UE_HARQ_t *harq_process_ul_ue=NULL;
   NR_DL_FRAME_PARMS *frame_parms = &UE->frame_parms;
   NR_UE_PUSCH *pusch_ue = UE->pusch_vars[thread_id][gNB_id];
-  uint8_t ulsch_input_buffer[MAX_ULSCH_PAYLOAD_BYTES];
   // ptrs_UplinkConfig_t *ptrs_Uplink_Config = &UE->pusch_config.dmrs_UplinkConfig.ptrs_UplinkConfig;
 
   num_of_codewords = 1; // tmp assumption
@@ -174,55 +172,6 @@ void nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE,
                                              0,
                                              harq_process_ul_ue->pusch_pdu.nrOfLayers);
 
-
-    uint8_t access_mode = SCHEDULED_ACCESS;
-
-    //-----------------------------------------------------//
-    // to be removed later when MAC is ready
-
-    if (harq_process_ul_ue != NULL){
-      TBS = harq_process_ul_ue->pusch_pdu.pusch_data.tb_size;
-      data_existing = 0;
-
-      if (IS_SOFTMODEM_NOS1){
-        data_existing = nr_ue_get_sdu(UE->Mod_id, UE->CC_id, frame,
-          slot, 0, ulsch_input_buffer, TBS/8, &access_mode);
-        //IP traffic to be transmitted
-        if(data_existing){
-          //harq_process_ul_ue->a = (unsigned char*)calloc(TBS/8, sizeof(unsigned char));
-          memcpy(harq_process_ul_ue->a, ulsch_input_buffer, TBS/8);
-        }
-      }
-      //Random traffic to be transmitted if there is no IP traffic available for this Tx opportunity
-      if (!IS_SOFTMODEM_NOS1 || !data_existing) {
-        //Use zeros for the header bytes in noS1 mode, in order to make sure that the LCID is not valid
-        //and block this traffic from being forwarded to the upper layers at the gNB
-        LOG_D(PHY, "Random data to be tranmsitted: \n");
-
-        //Give the first byte a dummy value (a value not corresponding to any valid LCID based on 38.321, Table 6.2.1-2)
-        //in order to distinguish the PHY random packets at the MAC layer of the gNB receiver from the normal packets that should
-        //have a valid LCID (nr_process_mac_pdu function)
-        harq_process_ul_ue->a[0] = 0x31;
-
-        for (i = 1; i < TBS / 8; i++) {
-          harq_process_ul_ue->a[i] = (unsigned char) rand();
-          //printf(" input encoder a[%d]=0x%02x\n",i,harq_process_ul_ue->a[i]);
-        }
-      }
-#ifdef DEBUG_MAC_PDU
-      LOG_I(PHY, "Printing MAC PDU to be encoded, TBS is: %d \n", TBS/8);
-      for (i = 0; i < TBS / 8; i++) {
-        printf("%02x",harq_process_ul_ue->a[i]);
-      }
-      printf("\n");
-#endif
-    } else {
-      LOG_E(PHY, "[phy_procedures_nrUE_TX] harq_process_ul_ue is NULL !!\n");
-      return;
-    }
-
-    //-----------------------------------------------------//
-
     /////////////////////////ULSCH coding/////////////////////////
     ///////////
 
@@ -473,7 +422,6 @@ void nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE,
   ///////////
   ////////////////////////////////////////////////////////////////////////
 
-  LOG_D(PHY, "Is data existing ?: %d \n", data_existing);
 }
 
 

openair1/SCHED_NR_UE/fapi_nr_ue_l1.c

@@ -139,12 +139,32 @@ int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
           // pusch config pdu
           pusch_config_pdu = &ul_config->ul_config_list[i].pusch_config_pdu;
           current_harq_pid = pusch_config_pdu->pusch_data.harq_process_id;
-          nfapi_nr_ue_pusch_pdu_t *pusch_pdu = &ulsch0->harq_processes[current_harq_pid]->pusch_pdu;
+          NR_UL_UE_HARQ_t *harq_process_ul_ue = ulsch0->harq_processes[current_harq_pid];
+
+          if (harq_process_ul_ue){
+
+            nfapi_nr_ue_pusch_pdu_t *pusch_pdu = &harq_process_ul_ue->pusch_pdu;
 
             memcpy(pusch_pdu, pusch_config_pdu, sizeof(nfapi_nr_ue_pusch_pdu_t));
 
             ulsch0->f_pusch = pusch_config_pdu->absolute_delta_PUSCH;
-          ulsch0->harq_processes[current_harq_pid]->status = ACTIVE;
+
+            if (scheduled_response->tx_request){
+              fapi_nr_tx_request_body_t *tx_req_body = scheduled_response->tx_request->tx_request_body;
+
+              //harq_process_ul_ue->a = (unsigned char*)calloc(TBS/8, sizeof(unsigned char));
+              memcpy(harq_process_ul_ue->a, tx_req_body->pdu, tx_req_body->pdu_length);
+
+              harq_process_ul_ue->status = ACTIVE;
+            }
+
+          } else {
+
+            LOG_E(PHY, "[phy_procedures_nrUE_TX] harq_process_ul_ue is NULL !!\n");
+            return -1;
+
+          }
+
         break;
 
         case (FAPI_NR_UL_CONFIG_TYPE_PUCCH):
@@ -206,9 +226,6 @@ int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
     } else {
     }
 
-    if (scheduled_response->tx_request != NULL){
-    } else {
-    }
   }
 
   return 0;

openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c

@@ -755,17 +755,32 @@ NR_UE_L2_STATE_t nr_ue_scheduler(nr_downlink_indication_t *dl_info, nr_uplink_in
         }
       */
     }
-  } else if (ul_info && ul_info->slot_tx == 8) {
+  } else if (ul_info) {
+
+    if (get_softmodem_params()->phy_test && ul_info->slot_tx == 8) { // ULSCH is handled only in phy-test mode (consistently with OAI gNB)
+
+      uint8_t nb_dmrs_re_per_rb;
+      uint8_t ulsch_input_buffer[MAX_ULSCH_PAYLOAD_BYTES];
+      uint8_t data_existing = 0;
+      uint16_t TBS_bytes;
+      uint32_t TBS;
+      int i;
+
       module_id_t mod_id    = ul_info->module_id;
       uint32_t gNB_index    = ul_info->gNB_index;
       int cc_id             = ul_info->cc_id;
       frame_t rx_frame      = ul_info->frame_rx;
       slot_t rx_slot        = ul_info->slot_rx;
+      frame_t frame_tx      = ul_info->frame_tx;
+      slot_t slot_tx        = ul_info->slot_tx;
       NR_UE_MAC_INST_t *mac = get_mac_inst(mod_id);
+      uint8_t access_mode   = SCHEDULED_ACCESS;
 
       // program PUSCH. this should actually be done upon reception of an UL DCI
       nr_dcireq_t dcireq;
       nr_scheduled_response_t scheduled_response;
+      fapi_nr_tx_request_t tx_req;
+      fapi_nr_tx_request_body_t tx_req_body;
 
       //--------------------------Temporary configuration-----------------------------//
       uint16_t rnti               = 0x1234;
@@ -788,8 +803,71 @@ NR_UE_L2_STATE_t nr_ue_scheduler(nr_downlink_indication_t *dl_info, nr_uplink_in
       uint16_t pdu_bit_map        = PUSCH_PDU_BITMAP_PUSCH_DATA;
       uint8_t  ptrs_time_density  = get_L_ptrs(ptrs_mcs1, ptrs_mcs2, ptrs_mcs3, mcs_index, mcs_table);
       uint8_t  ptrs_freq_density  = get_K_ptrs(n_rb0, n_rb1, rb_size);
+      uint8_t  no_data_in_dmrs    = 1;
+      uint16_t number_dmrs_symbols = 0;
+      uint16_t ul_dmrs_symb_pos   = l_prime_mask << start_symbol_index;
       //------------------------------------------------------------------------------//
 
+        for (i = start_symbol_index; i < start_symbol_index + nr_of_symbols; i++) {
+          if((ul_dmrs_symb_pos >> i) & 0x01)
+            number_dmrs_symbols += 1;
+        }
+
+        if(no_data_in_dmrs)
+          nb_dmrs_re_per_rb = 12;
+        else
+          nb_dmrs_re_per_rb = ((dmrs_config_type == pusch_dmrs_type1) ? 6:4);
+
+        TBS = nr_compute_tbs(nr_get_Qm_ul(mcs_index, 0),
+                             nr_get_code_rate_ul(mcs_index, 0),
+                             rb_size,
+                             nr_of_symbols,
+                             nb_dmrs_re_per_rb*number_dmrs_symbols,
+                             0,
+                             0,
+                             nrOfLayers);
+        TBS_bytes = TBS/8;
+
+        if (IS_SOFTMODEM_NOS1){
+          // Getting IP traffic to be transmitted
+          data_existing = nr_ue_get_sdu(mod_id,
+                                        cc_id,
+                                        frame_tx,
+                                        slot_tx,
+                                        0,
+                                        ulsch_input_buffer,
+                                        TBS_bytes,
+                                        &access_mode);
+        }
+
+        //Random traffic to be transmitted if there is no IP traffic available for this Tx opportunity
+        if (!IS_SOFTMODEM_NOS1 || !data_existing) {
+          //Use zeros for the header bytes in noS1 mode, in order to make sure that the LCID is not valid
+          //and block this traffic from being forwarded to the upper layers at the gNB
+          LOG_D(PHY, "Random data to be tranmsitted: \n");
+
+          //Give the first byte a dummy value (a value not corresponding to any valid LCID based on 38.321, Table 6.2.1-2)
+          //in order to distinguish the PHY random packets at the MAC layer of the gNB receiver from the normal packets that should
+          //have a valid LCID (nr_process_mac_pdu function)
+          ulsch_input_buffer[0] = 0x31;
+
+          for (i = 1; i < TBS_bytes; i++) {
+            ulsch_input_buffer[i] = (unsigned char) rand();
+            //printf(" input encoder a[%d]=0x%02x\n",i,harq_process_ul_ue->a[i]);
+          }
+        }
+
+#ifdef DEBUG_MAC_PDU
+
+        LOG_D(PHY, "Is data existing ?: %d \n", data_existing);
+        LOG_I(PHY, "Printing MAC PDU to be encoded, TBS is: %d \n", TBS_bytes);
+        for (i = 0; i < TBS_bytes; i++) {
+          printf("%02x", ulsch_input_buffer[i]);
+        }
+        printf("\n");
+
+#endif
+
       dcireq.module_id = mod_id;
       dcireq.gNB_index = gNB_index;
       dcireq.cc_id     = cc_id;
@@ -798,12 +876,24 @@ NR_UE_L2_STATE_t nr_ue_scheduler(nr_downlink_indication_t *dl_info, nr_uplink_in
 
       scheduled_response.dl_config  = NULL;
       scheduled_response.ul_config  = &dcireq.ul_config_req;
-    scheduled_response.tx_request = NULL;
+      // Config UL TX PDU
+      tx_req.slot = slot_tx;
+      tx_req.sfn = frame_tx;
+      // tx_req->tx_config // TbD
+      tx_req.number_of_pdus = 1;
+      tx_req_body.pdu_length = TBS_bytes;
+      tx_req_body.pdu_index = 0;
+      tx_req_body.pdu = ulsch_input_buffer;
+
+      scheduled_response.tx_request = &tx_req;
+      scheduled_response.tx_request->tx_request_body = &tx_req_body;
       scheduled_response.module_id  = mod_id;
       scheduled_response.CC_id      = cc_id;
       scheduled_response.frame      = rx_frame;
       scheduled_response.slot       = rx_slot;
 
+      printf("DEGUG nr_ue_scheduler Scheduling FAPI_NR_UL_CONFIG_TYPE_PUSCH \n");
+
       scheduled_response.ul_config->slot = ul_info->slot_tx;
       scheduled_response.ul_config->number_pdus = 1;
       scheduled_response.ul_config->ul_config_list[0].pdu_type = FAPI_NR_UL_CONFIG_TYPE_PUSCH;
@@ -812,7 +902,7 @@ NR_UE_L2_STATE_t nr_ue_scheduler(nr_downlink_indication_t *dl_info, nr_uplink_in
       scheduled_response.ul_config->ul_config_list[0].pusch_config_pdu.rb_start = rb_start;
       scheduled_response.ul_config->ul_config_list[0].pusch_config_pdu.nr_of_symbols = nr_of_symbols;
       scheduled_response.ul_config->ul_config_list[0].pusch_config_pdu.start_symbol_index = start_symbol_index;
-    scheduled_response.ul_config->ul_config_list[0].pusch_config_pdu.ul_dmrs_symb_pos = l_prime_mask << start_symbol_index;
+      scheduled_response.ul_config->ul_config_list[0].pusch_config_pdu.ul_dmrs_symb_pos = ul_dmrs_symb_pos;
       scheduled_response.ul_config->ul_config_list[0].pusch_config_pdu.dmrs_config_type = dmrs_config_type;
       scheduled_response.ul_config->ul_config_list[0].pusch_config_pdu.mcs_index = mcs_index;
       scheduled_response.ul_config->ul_config_list[0].pusch_config_pdu.mcs_table = mcs_table;
@@ -839,7 +929,7 @@ NR_UE_L2_STATE_t nr_ue_scheduler(nr_downlink_indication_t *dl_info, nr_uplink_in
       if (mac->RA_contention_resolution_timer_active == 1)
         ue_contention_resolution(mod_id, gNB_index, cc_id, ul_info->frame_tx);
     }
-
+  }
   return UE_CONNECTION_OK;
 }