UE RAR DCI reception

- NR UE scheduled response for RA PDSCH case
- UE processing of RAR DCI
- some cleanup and formatting

nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_constants.h

@@ -43,6 +43,7 @@
 
 #define FAPI_NR_DL_CONFIG_TYPE_DCI 0x01
 #define FAPI_NR_DL_CONFIG_TYPE_DLSCH 0x02
+#define FAPI_NR_DL_CONFIG_TYPE_RA_DLSCH 0x03
 
 
 #define FAPI_NR_CCE_REG_MAPPING_TYPE_INTERLEAVED 0x01

openair1/SCHED_NR_UE/fapi_nr_ue_l1.c

@@ -51,8 +51,8 @@ int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
 
     // Note: we have to handle the thread IDs for this. To be revisited completely.
     thread_id = PHY_vars_UE_g[module_id][cc_id]->current_thread_id[slot];
+    NR_UE_DLSCH_t *dlsch0;
     NR_UE_PDCCH *pdcch_vars = PHY_vars_UE_g[module_id][cc_id]->pdcch_vars[thread_id][0];
-    NR_UE_DLSCH_t *dlsch0 = PHY_vars_UE_g[module_id][cc_id]->dlsch[thread_id][0][0];
     NR_UE_ULSCH_t *ulsch0 = PHY_vars_UE_g[module_id][cc_id]->ulsch[thread_id][0][0];
 
     if(scheduled_response->dl_config != NULL){
@@ -69,7 +69,14 @@ int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
           pdcch_vars->nb_search_space = pdcch_vars->nb_search_space + 1;
           LOG_D(PHY,"Number of DCI SearchSpaces %d\n",pdcch_vars->nb_search_space);
 
-        } else {  //FAPI_NR_DL_CONFIG_TYPE_DLSCH
+        } else {
+
+          if (dl_config->dl_config_list[i].pdu_type == FAPI_NR_DL_CONFIG_TYPE_DLSCH){
+            dlsch0 = PHY_vars_UE_g[module_id][cc_id]->dlsch[thread_id][0][0];
+          }
+          else if (dl_config->dl_config_list[i].pdu_type == FAPI_NR_DL_CONFIG_TYPE_RA_DLSCH){
+            dlsch0 = PHY_vars_UE_g[module_id][cc_id]->dlsch_ra[0];
+          }
 
           fapi_nr_dl_config_dlsch_pdu_rel15_t *dlsch_config_pdu = &dl_config->dl_config_list[i].dlsch_config_pdu.dlsch_config_rel15;
           uint8_t current_harq_pid = dlsch_config_pdu->harq_process_nbr;
@@ -80,7 +87,9 @@ int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
           dlsch0->rnti = dl_config->dl_config_list[i].dlsch_config_pdu.rnti;
           //dlsch0->harq_processes[0]->mcs = &dlsch_config_pdu->mcs;
           dlsch0_harq = dlsch0->harq_processes[current_harq_pid];
-          if (dlsch0_harq != NULL){
+
+          if (dlsch0_harq){
+
             dlsch0_harq->BWPStart = dlsch_config_pdu->BWPStart;
             dlsch0_harq->BWPSize = dlsch_config_pdu->BWPSize;
             dlsch0_harq->nb_rb = dlsch_config_pdu->number_rbs;

openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c

@@ -36,6 +36,7 @@
 #include "LAYER2/NR_MAC_UE/mac_extern.h"
 #include "mac_defs.h"
 #include "common/utils/nr/nr_common.h"
+#include "executables/softmodem-common.h"
 #include <stdio.h>
 
 #ifdef NR_PDCCH_DCI_TOOLS_DEBUG
@@ -104,7 +105,7 @@ void ue_dci_configuration(NR_UE_MAC_INST_t *mac,fapi_nr_dl_config_request_t *dl_
       AssertFatal(mac->ULbwp[0]->bwp_Dedicated!=NULL,"bwp_Dedicated is null\n");
     }
     // check search spaces
-	
+
     int ss_id=0;
     fapi_nr_dl_config_dci_dl_pdu_rel15_t *rel15;
     int sps =mac->DLbwp[0]->bwp_Common->genericParameters.cyclicPrefix == NULL ? 14 : 12;
@@ -120,18 +121,31 @@ void ue_dci_configuration(NR_UE_MAC_INST_t *mac,fapi_nr_dl_config_request_t *dl_
     if (mac->ra_state == WAIT_RAR) {
       // check for RAR
       rel15 = &dl_config->dl_config_list[dl_config->number_pdus].dci_config_pdu.dci_config_rel15; 
-      rel15->rnti = 2;//get_RA_RNTI(mac,frame,slot); // WIP
-      dl_config->number_pdus = dl_config->number_pdus + 1;
+      // rel15->rnti = 2;//get_RA_RNTI(mac,frame,slot); // WIP
     }
     else if (mac->ra_state == WAIT_CONTENTION_RESOLUTION) {
       rel15 = &dl_config->dl_config_list[dl_config->number_pdus].dci_config_pdu.dci_config_rel15; 
       rel15->rnti = mac->t_crnti;
-      dl_config->number_pdus = dl_config->number_pdus + 1;
+      //dl_config->number_pdus = dl_config->number_pdus + 1;
     }
     if (mac->crnti>0) {
       rel15 = &dl_config->dl_config_list[dl_config->number_pdus].dci_config_pdu.dci_config_rel15; 
-      rel15->rnti = mac->crnti;
-      rel15->BWPSize = NRRIV2BW(mac->DLbwp[0]->bwp_Common->genericParameters.locationAndBandwidth,275);
+
+      if (get_softmodem_params()->do_ra == 1)
+        rel15->rnti = 0x00;
+      else // phy_test
+        rel15->rnti = mac->crnti;
+
+      rel15->dci_format = NR_DL_DCI_FORMAT_1_0;
+
+      if (slot == 0 || slot == 1){
+        rel15->BWPSize = NRRIV2BW(mac->DLbwp[0]->bwp_Common->genericParameters.locationAndBandwidth,275);
+        rel15->dci_length = nr_dci_size(rel15->dci_format, NR_RNTI_C, rel15->BWPSize);
+      } else if (slot == 7){
+        rel15->BWPSize = NRRIV2BW(mac->scc->downlinkConfigCommon->initialDownlinkBWP->genericParameters.locationAndBandwidth, 275);
+        rel15->dci_length = nr_dci_size(rel15->dci_format, NR_RNTI_RA, rel15->BWPSize);
+      }
+
       rel15->BWPStart = NRRIV2PRBOFFSET(mac->DLbwp[0]->bwp_Common->genericParameters.locationAndBandwidth,275);
       rel15->SubcarrierSpacing = mac->DLbwp[0]->bwp_Common->genericParameters.subcarrierSpacing;
       // get UE-specific search space
@@ -166,19 +180,15 @@ void ue_dci_configuration(NR_UE_MAC_INST_t *mac,fapi_nr_dl_config_request_t *dl_
       }
       rel15->coreset.CoreSetType = 1;
       rel15->coreset.precoder_granularity = mac->coreset[0][0]->precoderGranularity;
+
       if (mac->coreset[0][0]->pdcch_DMRS_ScramblingID)
 	rel15->coreset.pdcch_dmrs_scrambling_id = *mac->coreset[0][0]->pdcch_DMRS_ScramblingID;
       else
 	rel15->coreset.pdcch_dmrs_scrambling_id = *mac->scc->physCellId;
+
       fill_dci_search_candidates(mac->SSpace[0][0][ss_id],rel15);
-      rel15->dci_format = NR_DL_DCI_FORMAT_1_0;
-      rel15->dci_length = nr_dci_size(rel15->dci_format,NR_RNTI_C,rel15->BWPSize);
       dl_config->dl_config_list[dl_config->number_pdus].pdu_type = FAPI_NR_DL_CONFIG_TYPE_DCI;
       dl_config->number_pdus = dl_config->number_pdus + 1;
     }
   }
 }
-
-
-
-

openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c

@@ -2622,7 +2622,11 @@ int8_t nr_ue_process_dci(module_id_t module_id, int cc_id, uint8_t gNB_index, nr
 	  dlsch_config_pdu_1_0->pucch_resource_id,
 	  dlsch_config_pdu_1_0->pdsch_to_harq_feedback_time_ind);
 
-    dl_config->dl_config_list[dl_config->number_pdus].pdu_type = FAPI_NR_DL_CONFIG_TYPE_DLSCH;
+    if (mac->ra_rnti == rnti)
+      dl_config->dl_config_list[dl_config->number_pdus].pdu_type = FAPI_NR_DL_CONFIG_TYPE_RA_DLSCH;
+    else
+      dl_config->dl_config_list[dl_config->number_pdus].pdu_type = FAPI_NR_DL_CONFIG_TYPE_DLSCH;
+
     //	    dl_config->dl_config_list[dl_config->number_pdus].dci_config_pdu.dci_config_rel15.N_RB_BWP = n_RB_DLBWP;
 	    
     LOG_D(MAC,"(nr_ue_procedures.c) pdu_type=%d\n\n",dl_config->dl_config_list[dl_config->number_pdus].pdu_type);