From c8d2932172911cc122c65158daec6ace4acbd46a Mon Sep 17 00:00:00 2001
From: Raymond Knopp <raymond.knopp@eurecom.fr>
Date: Sat, 11 Sep 2021 20:07:36 +0200
Subject: [PATCH] small fix in dci handling in UE for multiple aggregation
 levels.

---
 openair1/PHY/NR_UE_TRANSPORT/dci_nr.c            | 13 ++++++++++++-
 openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c      |  1 +
 openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c b/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
index c062366b8d..a6dce88801 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
@@ -933,11 +933,22 @@ uint8_t nr_dci_decoding_procedure(PHY_VARS_NR_UE *ue,
 
     // Loop over possible DCI lengths
     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;
+           break;
+        }
+      }
+      if (dci_found==1) continue;
       int dci_length = rel15->dci_length_options[k];
       uint64_t dci_estimation[2]= {0};
       const t_nrPolar_params *currentPtrDCI = nr_polar_params(NR_POLAR_DCI_MESSAGE_TYPE, dci_length, L, 1, &ue->polarList);
 
-      LOG_D(PHY, "Trying DCI candidate %d of %d number of candidates, CCE %d (%d), L %d\n", j, rel15->number_of_candidates, CCEind, CCEind*9*6*2, L);
+      LOG_D(PHY, "Trying DCI candidate %d of %d number of candidates, CCE %d (%d), L %d, length %d, format %s\n", j, rel15->number_of_candidates, CCEind, CCEind*9*6*2, L, dci_length,nr_dci_format_string[rel15->dci_format_options[k]]);
 
       nr_pdcch_unscrambling(&pdcch_vars->e_rx[CCEind*108], rel15->coreset.scrambling_rnti, L*108, rel15->coreset.pdcch_dmrs_scrambling_id, tmp_e);
 
diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c b/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
index 7e375e4cdc..ce3b1f502e 100644
--- a/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
+++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
@@ -1064,6 +1064,7 @@ int nr_ue_pusch_scheduler(NR_UE_MAC_INST_t *mac,
     // Get slot offset K2 which will be used to calculate TX slot
     k2 = get_k2(mac, tda_id);
     if (k2 < 0) { // This can happen when a false DCI is received
+      LOG_W(PHY,"%d.%d. Received k2 %d, tda_id %d\n",current_frame,current_slot,k2,tda_id);
       return -1;
     }
 
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
index 8b3ec4458a..b95dd29aeb 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
@@ -1044,7 +1044,7 @@ void pf_ul(module_id_t module_id,
   gNB_MAC_INST *nrmac = RC.nrmac[module_id];
   NR_ServingCellConfigCommon_t *scc = nrmac->common_channels[CC_id].ServingCellConfigCommon;
   NR_UE_info_t *UE_info = &nrmac->UE_info;
-  const int min_rb = 40;
+  const int min_rb = 80;
   float coeff_ue[MAX_MOBILES_PER_GNB];
   // UEs that could be scheduled
   int ue_array[MAX_MOBILES_PER_GNB];