moving decision on DCI format type from L1 to MAC

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

@@ -94,7 +94,7 @@ typedef struct {
 
 typedef struct {
   uint16_t rnti;
-  uint8_t dci_format;
+  nfapi_nr_dci_formats_e dci_format;
   uint8_t coreset_type;
   int ss_type;
   // n_CCE index of first CCE for PDCCH reception
@@ -426,7 +426,7 @@ typedef struct {
   // needs to monitor only upto 2 DCI lengths for a given search space.
   uint8_t num_dci_options;  // Num DCIs the UE actually needs to decode (1 or 2)
   uint8_t dci_length_options[2];
-  uint8_t dci_format_options[2];
+  nfapi_nr_dci_formats_e dci_format_options[2];
   uint8_t ss_type_options[2];
 } fapi_nr_dl_config_dci_dl_pdu_rel15_t;
 

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

@@ -240,9 +240,9 @@ typedef struct {
 } nfapi_nr_config_request_t;
 
 typedef enum {
-  NFAPI_NR_USS_FORMAT_0_0_AND_1_0,
-  NFAPI_NR_USS_FORMAT_0_1_AND_1_1,
-} nfapi_nr_uss_dci_formats_e;
+  NFAPI_NR_FORMAT_0_0_AND_1_0,
+  NFAPI_NR_FORMAT_0_1_AND_1_1,
+} nfapi_nr_dci_formats_e;
 
 typedef enum {
   NFAPI_NR_SEARCH_SPACE_TYPE_COMMON=0,

openair1/PHY/NR_UE_TRANSPORT/dci_nr.c

@@ -43,15 +43,6 @@
 #include "assertions.h"
 #include "T.h"
 
-static const char nr_dci_format_string[8][30] = {"NR_DL_DCI_FORMAT_1_0",
-                                                 "NR_DL_DCI_FORMAT_1_1",
-                                                 "NR_DL_DCI_FORMAT_2_0",
-                                                 "NR_DL_DCI_FORMAT_2_1",
-                                                 "NR_DL_DCI_FORMAT_2_2",
-                                                 "NR_DL_DCI_FORMAT_2_3",
-                                                 "NR_UL_DCI_FORMAT_0_0",
-                                                 "NR_UL_DCI_FORMAT_0_1"};
-
 //#define DEBUG_DCI_DECODING 1
 
 //#define NR_PDCCH_DCI_DEBUG            // activates NR_PDCCH_DCI_DEBUG logs
@@ -780,24 +771,22 @@ static uint16_t nr_dci_false_detection(uint64_t *dci,
                                        int rnti,
                                        int8_t messageType,
                                        uint16_t messageLength,
-                                       uint8_t aggregation_level
-                                       ) {
-
+                                       uint8_t aggregation_level)
+{
   uint32_t encoder_output[NR_MAX_DCI_SIZE_DWORD];
-  polar_encoder_fast(dci, (void*)encoder_output, rnti, 1,
-                    messageType, messageLength, aggregation_level);
+  polar_encoder_fast(dci, (void *)encoder_output, rnti, 1, messageType, messageLength, aggregation_level);
   uint8_t *enout_p = (uint8_t*)encoder_output;
   uint16_t x = 0;
 
   for (int i=0; i<encoded_length/8; i++) {
-    x += ( enout_p[i] & 1 ) ^ ( ( soft_in[i*8] >> 15 ) & 1);
-    x += ( ( enout_p[i] >> 1 ) & 1 ) ^ ( ( soft_in[i*8+1] >> 15 ) & 1 );
-    x += ( ( enout_p[i] >> 2 ) & 1 ) ^ ( ( soft_in[i*8+2] >> 15 ) & 1 );
-    x += ( ( enout_p[i] >> 3 ) & 1 ) ^ ( ( soft_in[i*8+3] >> 15 ) & 1 );
-    x += ( ( enout_p[i] >> 4 ) & 1 ) ^ ( ( soft_in[i*8+4] >> 15 ) & 1 );
-    x += ( ( enout_p[i] >> 5 ) & 1 ) ^ ( ( soft_in[i*8+5] >> 15 ) & 1 );
-    x += ( ( enout_p[i] >> 6 ) & 1 ) ^ ( ( soft_in[i*8+6] >> 15 ) & 1 );
-    x += ( ( enout_p[i] >> 7 ) & 1 ) ^ ( ( soft_in[i*8+7] >> 15 ) & 1 );
+    x += (enout_p[i] & 1) ^ ((soft_in[i * 8] >> 15) & 1);
+    x += ((enout_p[i] >> 1) & 1) ^ ((soft_in[i * 8 + 1] >> 15) & 1);
+    x += ((enout_p[i] >> 2) & 1) ^ ((soft_in[i * 8 + 2] >> 15) & 1);
+    x += ((enout_p[i] >> 3) & 1) ^ ((soft_in[i * 8 + 3] >> 15) & 1);
+    x += ((enout_p[i] >> 4) & 1) ^ ((soft_in[i * 8 + 4] >> 15) & 1);
+    x += ((enout_p[i] >> 5) & 1) ^ ((soft_in[i * 8 + 5] >> 15) & 1);
+    x += ((enout_p[i] >> 6) & 1) ^ ((soft_in[i * 8 + 6] >> 15) & 1);
+    x += ((enout_p[i] >> 7) & 1) ^ ((soft_in[i * 8 + 7] >> 15) & 1);
   }
   return x;
 }
@@ -809,11 +798,11 @@ uint8_t nr_dci_decoding_procedure(PHY_VARS_NR_UE *ue,
                                   fapi_nr_dl_config_dci_dl_pdu_rel15_t *rel15)
 {
   //int gNB_id = 0;
-  int16_t tmp_e[16*108];
+  int16_t tmp_e[16 * 108];
   rnti_t n_rnti;
   int e_rx_cand_idx = 0;
 
-  for (int j=0;j<rel15->number_of_candidates;j++) {
+  for (int j = 0; j < rel15->number_of_candidates; j++) {
     int CCEind = rel15->CCE[j];
     int L = rel15->L[j];
 
@@ -822,48 +811,75 @@ uint8_t nr_dci_decoding_procedure(PHY_VARS_NR_UE *ue,
     for (int k = 0; k < rel15->num_dci_options; k++) {
       // skip this candidate if we've already found one with the
       // same rnti and format at a different aggregation level
-      int dci_found=0;
-      for (int ind=0;ind < dci_ind->number_of_dcis ; ind++) {
-        if (rel15->rnti== dci_ind->dci_list[ind].rnti &&
-            rel15->dci_format_options[k]==dci_ind->dci_list[ind].dci_format) {
-           dci_found=1;
+      bool dci_found = false;
+      for (int ind = 0; ind < dci_ind->number_of_dcis; ind++) {
+        if (rel15->rnti == dci_ind->dci_list[ind].rnti && rel15->dci_format_options[k] == dci_ind->dci_list[ind].dci_format) {
+          dci_found = true;
           break;
         }
       }
-      if (dci_found == 1)
+      if (dci_found)
         continue;
       int dci_length = rel15->dci_length_options[k];
-      uint64_t dci_estimation[2]= {0};
+      uint64_t dci_estimation[2] = {0};
 
-      LOG_D(PHY, "(%i.%i) Trying DCI candidate %d of %d number of candidates, CCE %d (%d), L %d, length %d, format %s\n",
-            proc->frame_rx, proc->nr_slot_rx, j, rel15->number_of_candidates, CCEind, e_rx_cand_idx, L, dci_length, nr_dci_format_string[rel15->dci_format_options[k]]);
-
-
-      nr_pdcch_unscrambling(&pdcch_e_rx[e_rx_cand_idx], rel15->coreset.scrambling_rnti, L*108, rel15->coreset.pdcch_dmrs_scrambling_id, tmp_e);
+      LOG_D(PHY,
+            "(%i.%i) Trying DCI candidate %d of %d number of candidates, CCE %d (%d), L %d, length %d, format %d\n",
+            proc->frame_rx,
+            proc->nr_slot_rx,
+            j,
+            rel15->number_of_candidates,
+            CCEind,
+            e_rx_cand_idx,
+            L,
+            dci_length,
+            rel15->dci_format_options[k]);
+
+      nr_pdcch_unscrambling(&pdcch_e_rx[e_rx_cand_idx],
+                            rel15->coreset.scrambling_rnti,
+                            L * 108,
+                            rel15->coreset.pdcch_dmrs_scrambling_id,
+                            tmp_e);
 
 #ifdef DEBUG_DCI_DECODING
       uint32_t *z = (uint32_t *) &e_rx[e_rx_cand_idx];
-      for (int index_z = 0; index_z < L*6; index_z++){
-        for (int i=0; i<9; i++) {
-          LOG_I(PHY,"z[%d]=(%d,%d) \n", (9*index_z + i), *(int16_t *) &z[9*index_z + i],*(1 + (int16_t *) &z[9*index_z + i]));
+      for (int index_z = 0; index_z < L * 6; index_z++) {
+        for (int i = 0; i < 9; i++) {
+          LOG_I(PHY, "z[%d]=(%d,%d) \n", (9 * index_z + i), *(int16_t *)&z[9 * index_z + i], *(1 + (int16_t *)&z[9 * index_z + i]));
         }
       }
 #endif
-      uint16_t crc = polar_decoder_int16(tmp_e,
-                                         dci_estimation,
-                                         1,
-                                         NR_POLAR_DCI_MESSAGE_TYPE, dci_length, L);
+      uint16_t crc = polar_decoder_int16(tmp_e, dci_estimation, 1, NR_POLAR_DCI_MESSAGE_TYPE, dci_length, L);
 
       n_rnti = rel15->rnti;
-      LOG_D(PHY, "(%i.%i) dci indication (rnti %x,dci format %s,n_CCE %d,payloadSize %d,payload %llx )\n",
-            proc->frame_rx, proc->nr_slot_rx,n_rnti,nr_dci_format_string[rel15->dci_format_options[k]],CCEind,dci_length, *(unsigned long long*)dci_estimation);
+      LOG_D(PHY,
+            "(%i.%i) dci indication (rnti %x,dci format %d,n_CCE %d,payloadSize %d,payload %llx )\n",
+            proc->frame_rx,
+            proc->nr_slot_rx,
+            n_rnti,
+            rel15->dci_format_options[k],
+            CCEind,
+            dci_length,
+            *(unsigned long long *)dci_estimation);
       if (crc == n_rnti) {
-        LOG_D(PHY, "(%i.%i) Received dci indication (rnti %x,dci format %s,n_CCE %d,payloadSize %d,payload %llx)\n",
-              proc->frame_rx, proc->nr_slot_rx,n_rnti,nr_dci_format_string[rel15->dci_format_options[k]],CCEind,dci_length,*(unsigned long long*)dci_estimation);
+        LOG_D(PHY,
+              "(%i.%i) Received dci indication (rnti %x,dci format %d,n_CCE %d,payloadSize %d,payload %llx)\n",
+              proc->frame_rx,
+              proc->nr_slot_rx,
+              n_rnti,
+              rel15->dci_format_options[k],
+              CCEind,
+              dci_length,
+              *(unsigned long long *)dci_estimation);
         uint16_t mb = nr_dci_false_detection(dci_estimation,tmp_e,L*108,n_rnti, NR_POLAR_DCI_MESSAGE_TYPE, dci_length, L);
         ue->dci_thres = (ue->dci_thres + mb) / 2;
         if (mb > (ue->dci_thres+30)) {
-          LOG_W(PHY,"DCI false positive. Dropping DCI index %d. Mismatched bits: %d/%d. Current DCI threshold: %d\n",j,mb,L*108,ue->dci_thres);
+          LOG_W(PHY,
+                "DCI false positive. Dropping DCI index %d. Mismatched bits: %d/%d. Current DCI threshold: %d\n",
+                j,
+                mb,
+                L * 108,
+                ue->dci_thres);
           continue;
         } else {
           dci_ind->SFN = proc->frame_rx;
@@ -878,15 +894,22 @@ uint8_t nr_dci_decoding_procedure(PHY_VARS_NR_UE *ue,
           get_coreset_rballoc(rel15->coreset.frequency_domain_resource, &n_rb, &rb_offset);
           dci_ind->dci_list[dci_ind->number_of_dcis].cset_start = rel15->BWPStart + rb_offset;
           dci_ind->dci_list[dci_ind->number_of_dcis].payloadSize = dci_length;
-          memcpy((void*)dci_ind->dci_list[dci_ind->number_of_dcis].payloadBits,(void*)dci_estimation,8);
+          memcpy((void *)dci_ind->dci_list[dci_ind->number_of_dcis].payloadBits, (void *)dci_estimation, 8);
           dci_ind->number_of_dcis++;
           break;    // If DCI is found, no need to check for remaining DCI lengths
         }
       } else {
-        LOG_D(PHY,"(%i.%i) Decoded crc %x does not match rnti %x for DCI format %d\n", proc->frame_rx, proc->nr_slot_rx, crc, n_rnti, rel15->dci_format_options[k]);
+        LOG_D(PHY,
+              "(%i.%i) Decoded crc %x does not match rnti %x for DCI format %d\n",
+              proc->frame_rx,
+              proc->nr_slot_rx,
+              crc,
+              n_rnti,
+              rel15->dci_format_options[k]);
       }
     }
-    e_rx_cand_idx += 9*L*6*2; //e_rx index for next candidate (L CCEs, 6 REGs per CCE and 9 REs per REG and 2 uint16_t per RE)
+    e_rx_cand_idx += 9 * L * 6 * 2; // e_rx index for next candidate (L CCEs, 6 REGs per CCE and 9 REs per REG and 2 uint16_t per
+                                    // RE)
   }
   return(dci_ind->number_of_dcis);
 }

openair2/LAYER2/NR_MAC_COMMON/nr_mac_extern.h

@@ -39,8 +39,6 @@
 
 extern const uint8_t nr_slots_per_frame[5];
 
-extern dci_pdu_rel15_t *def_dci_pdu_rel15;
-
 /* Scheduler */
 extern RAN_CONTEXT_t RC;
 extern uint8_t nfapi_mode;

openair2/LAYER2/NR_MAC_UE/mac_proto.h

@@ -260,18 +260,7 @@ int nr_get_sf_periodicBSRTimer(uint8_t bucketSize);
 */
 int nr_get_sf_retxBSRTimer(uint8_t retxBSR_Timer);
 
-int8_t nr_ue_process_dci(NR_UE_MAC_INST_t *mac,
-                         int cc_id,
-                         frame_t frame,
-                         int slot,
-                         dci_pdu_rel15_t *dci,
-                         fapi_nr_dci_indication_pdu_t *dci_ind);
-int nr_ue_process_dci_indication_pdu(NR_UE_MAC_INST_t *mac,
-                                     int cc_id,
-                                     int gNB_index,
-                                     frame_t frame,
-                                     int slot,
-                                     fapi_nr_dci_indication_pdu_t *dci);
+nr_dci_format_t nr_ue_process_dci_indication_pdu(NR_UE_MAC_INST_t *mac, frame_t frame, int slot, fapi_nr_dci_indication_pdu_t *dci);
 int8_t nr_ue_process_csirs_measurements(NR_UE_MAC_INST_t *mac,
                                         frame_t frame,
                                         int slot,

openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c

@@ -101,7 +101,6 @@ NR_ControlResourceSet_t *ue_get_coreset(const NR_BWP_PDCCH_t *config, const int
   return coreset;
 }
 
-
 void config_dci_pdu(NR_UE_MAC_INST_t *mac,
                     fapi_nr_dl_config_request_t *dl_config,
                     const int rnti_type,
@@ -154,36 +153,40 @@ void config_dci_pdu(NR_UE_MAC_INST_t *mac,
     rel15->coreset.pdcch_dmrs_scrambling_id = mac->physCellId;
   }
 
-  rel15->num_dci_options = (mac->ra.ra_state == WAIT_RAR || rnti_type == TYPE_SI_RNTI_) ? 1 : 2;
-
+  int temp_num_dci_options = (mac->ra.ra_state == WAIT_RAR || rnti_type == TYPE_SI_RNTI_) ? 1 : 2;
+  int dci_format[2] = {0};
   if (ss->searchSpaceType->present == NR_SearchSpace__searchSpaceType_PR_ue_Specific) {
     if (ss->searchSpaceType->choice.ue_Specific->dci_Formats ==
         NR_SearchSpace__searchSpaceType__ue_Specific__dci_Formats_formats0_0_And_1_0) {
-      rel15->dci_format_options[0] = NR_DL_DCI_FORMAT_1_0;
-      rel15->dci_format_options[1] = NR_UL_DCI_FORMAT_0_0;
+      dci_format[0] = NR_DL_DCI_FORMAT_1_0;
+      dci_format[1] = NR_UL_DCI_FORMAT_0_0;
     }
     else {
-      rel15->dci_format_options[0] = NR_DL_DCI_FORMAT_1_1;
-      rel15->dci_format_options[1] = NR_UL_DCI_FORMAT_0_1;
+      dci_format[0] = NR_DL_DCI_FORMAT_1_1;
+      dci_format[1] = NR_UL_DCI_FORMAT_0_1;
     }
   }
   else { // common
     AssertFatal(ss->searchSpaceType->choice.common->dci_Format0_0_AndFormat1_0,
                 "Only supporting format 10 and 00 for common SS\n");
-    rel15->dci_format_options[0] = NR_DL_DCI_FORMAT_1_0;
-    rel15->dci_format_options[1] = NR_UL_DCI_FORMAT_0_0;
+    dci_format[0] = NR_DL_DCI_FORMAT_1_0;
+    dci_format[1] = NR_UL_DCI_FORMAT_0_0;
   }
 
   NR_UE_ServingCell_Info_t *sc_info = &mac->sc_info;
-  // loop over RNTI type and configure resource allocation for DCI
-  for (int i = 0; i < rel15->num_dci_options; i++) {
+  // loop over DCI options and configure resource allocation
+  // need to configure mac->def_dci_pdu_rel15 for all possible format options
+  for (int i = 0; i < temp_num_dci_options; i++) {
     rel15->ss_type_options[i] = ss->searchSpaceType->present;
-    const int dci_format = rel15->dci_format_options[i];
+    if (dci_format[i] == NR_DL_DCI_FORMAT_1_0 || dci_format[i] == NR_UL_DCI_FORMAT_0_0)
+      rel15->dci_format_options[i] = NFAPI_NR_FORMAT_0_0_AND_1_0;
+    else
+      rel15->dci_format_options[i] = NFAPI_NR_FORMAT_0_1_AND_1_1;
     uint16_t alt_size = 0;
     if(current_DL_BWP) {
-      // computing alternative size for padding
+      // computing alternative size for padding or truncation
       dci_pdu_rel15_t temp_pdu;
-      if(dci_format == NR_DL_DCI_FORMAT_1_0)
+      if (dci_format[i] == NR_DL_DCI_FORMAT_1_0)
         alt_size = nr_dci_size(current_DL_BWP,
                                current_UL_BWP,
                                sc_info,
@@ -196,7 +199,7 @@ void config_dci_pdu(NR_UE_MAC_INST_t *mac,
                                ss->searchSpaceType->present,
                                mac->type0_PDCCH_CSS_config.num_rbs,
                                0);
-      if(dci_format == NR_UL_DCI_FORMAT_0_0)
+      if (dci_format[i] == NR_UL_DCI_FORMAT_0_0)
         alt_size = nr_dci_size(current_DL_BWP,
                                current_UL_BWP,
                                sc_info,
@@ -215,8 +218,8 @@ void config_dci_pdu(NR_UE_MAC_INST_t *mac,
                                                current_UL_BWP,
                                                sc_info,
                                                mac->pdsch_HARQ_ACK_Codebook,
-                                               &mac->def_dci_pdu_rel15[dl_config->slot][dci_format],
-                                               dci_format,
+                                               &mac->def_dci_pdu_rel15[dl_config->slot][dci_format[i]],
+                                               dci_format[i],
                                                rnti_type,
                                                coreset,
                                                dl_bwp_id,
@@ -225,6 +228,13 @@ void config_dci_pdu(NR_UE_MAC_INST_t *mac,
                                                alt_size);
   }
 
+  // DCI 0_0 and 1_0 are same size, L1 just needs to look for 1 option
+  // L2 decides format based on format indicator in payload
+  if (rel15->dci_format_options[0] == NFAPI_NR_FORMAT_0_0_AND_1_0)
+    rel15->num_dci_options = 1;
+  else
+    rel15->num_dci_options = 2;
+
   rel15->BWPStart = coreset_id == 0 ? mac->type0_PDCCH_CSS_config.cset_start_rb : current_DL_BWP->BWPStart;
   rel15->BWPSize = coreset_id == 0 ? mac->type0_PDCCH_CSS_config.num_rbs : current_DL_BWP->BWPSize;
 

openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c

@@ -1064,14 +1064,9 @@ static int handle_bcch_dlsch(NR_UE_MAC_INST_t *mac,
 }
 
 //  L2 Abstraction Layer
-static int handle_dci(NR_UE_MAC_INST_t *mac,
-                      int cc_id,
-                      unsigned int gNB_index,
-                      frame_t frame,
-                      int slot,
-                      fapi_nr_dci_indication_pdu_t *dci)
+static nr_dci_format_t handle_dci(NR_UE_MAC_INST_t *mac, frame_t frame, int slot, fapi_nr_dci_indication_pdu_t *dci)
 {
-  return nr_ue_process_dci_indication_pdu(mac, cc_id, gNB_index, frame, slot, dci);
+  return nr_ue_process_dci_indication_pdu(mac, frame, slot, dci);
 }
 
 static void handle_ssb_meas(NR_UE_MAC_INST_t *mac, uint8_t ssb_index, int16_t rsrp_dbm)
@@ -1165,26 +1160,18 @@ static uint32_t nr_ue_dl_processing(nr_downlink_indication_t *dl_info)
     LOG_T(MAC, "[L2][IF MODULE][DL INDICATION][DCI_IND]\n");
     for (int i = 0; i < dl_info->dci_ind->number_of_dcis; i++) {
       LOG_T(MAC, ">>>NR_IF_Module i=%d, dl_info->dci_ind->number_of_dcis=%d\n", i, dl_info->dci_ind->number_of_dcis);
-      int8_t ret = handle_dci(mac,
-                              dl_info->cc_id,
-                              dl_info->gNB_index,
-                              dl_info->frame,
-                              dl_info->slot,
-                              dl_info->dci_ind->dci_list + i);
-      if (ret < 0)
-        continue;
-      fapi_nr_dci_indication_pdu_t *dci_index = dl_info->dci_ind->dci_list + i;
+      nr_dci_format_t dci_format = handle_dci(mac, dl_info->frame, dl_info->slot, dl_info->dci_ind->dci_list + i);
 
       /* The check below filters out UL_DCIs which are being processed as DL_DCIs. */
-      if (dci_index->dci_format != NR_DL_DCI_FORMAT_1_0 && dci_index->dci_format != NR_DL_DCI_FORMAT_1_1) {
+      if (dci_format != NR_DL_DCI_FORMAT_1_0 && dci_format != NR_DL_DCI_FORMAT_1_1) {
         LOG_D(NR_MAC, "We are filtering a UL_DCI to prevent it from being treated like a DL_DCI\n");
         continue;
       }
-      dci_pdu_rel15_t *def_dci_pdu_rel15 = &mac->def_dci_pdu_rel15[dl_info->slot][dci_index->dci_format];
+      dci_pdu_rel15_t *def_dci_pdu_rel15 = &mac->def_dci_pdu_rel15[dl_info->slot][dci_format];
       g_harq_pid = def_dci_pdu_rel15->harq_pid;
-      LOG_T(NR_MAC, "Setting harq_pid = %d and dci_index = %d (based on format)\n", g_harq_pid, dci_index->dci_format);
+      LOG_T(NR_MAC, "Setting harq_pid = %d and dci_index = %d (based on format)\n", g_harq_pid, dci_format);
 
-      ret_mask |= (ret << FAPI_NR_DCI_IND);
+      ret_mask |= (1 << FAPI_NR_DCI_IND);
       AssertFatal(nr_ue_if_module_inst[dl_info->module_id] != NULL, "IF module is NULL!\n");
       fapi_nr_dl_config_request_t *dl_config = get_dl_config_request(mac, dl_info->slot);
       nr_scheduled_response_t scheduled_response = {.dl_config = dl_config,