Merge remote-tracking branch 'origin/nrUE_no_CSI_report' into integration_2025_w44 (!3728)

Fix for scenario with no CSI report configured for CSI-RS

After changes in !3714 (merged), if we select to measure RSRP on SSB and not
CSI-RS (default option) and there is a single antenna port (so no MIMO report
either) we won't schedule any CSI-RS measurements for the UE. In that case
ideally we shouldn't set do_CSIRS = 1  in configuration file but still the
option is possible. So the fix is to not perform any measurements at UE on
that CSI-RS but not asserting.

Closes #1015

ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf

@@ -23,7 +23,6 @@ gNBs =
     ////////// Physical parameters:
 
     min_rxtxtime = 2;
-    do_CSIRS     = 1;
     do_SRS       = 1;
 
     servingCellConfigCommon = (

ci-scripts/conf_files/gnb.sa.band78.106prb.rfsim.neighbour.conf

@@ -18,8 +18,6 @@ gNBs =
 
  ////////// Physical parameters:
 
-    do_CSIRS                                                  = 0;
-    do_SRS                                                    = 0;
     min_rxtxtime = 6;
 
     servingCellConfigCommon = (

ci-scripts/conf_files/gnb.sa.band78.51prb.aw2s.ddsuu.conf

@@ -21,10 +21,6 @@ gNBs =
     nr_cellid = 12345678L
 
     ////////// Physical parameters:
-    pdsch_AntennaPorts_XP                                     = 1;
-    pusch_AntennaPorts                                        = 1;
-    do_CSIRS                                                  = 1;
-    do_SRS                                                    = 0;
     uess_agg_levels = [2, 2, 2, 0, 0];
 
     servingCellConfigCommon = (

ci-scripts/conf_files/untested/gnb.sa.band78.fr1.51PRB.usrpb210.conf

@@ -17,9 +17,6 @@ gNBs =
 
     ////////// Physical parameters:
 
-    do_CSIRS                                                  = 0;
-    do_SRS                                                    = 0;
-
     servingCellConfigCommon = (
     {
  #spCellConfigCommon

openair1/PHY/NR_UE_TRANSPORT/csi_rx.c

@@ -905,6 +905,11 @@ void nr_ue_csi_rs_procedures(PHY_VARS_NR_UE *ue,
                        rxdataF);
 
 
+  if (csirs_config_pdu->measurement_bitmap == 0) {
+    LOG_D(NR_PHY, "No CSI-RS measurements configured\n");
+    return;
+  }
+
   uint32_t noise_power = 0;
   int16_t log2_re = 0;
   int16_t log2_maxh = 0;

openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c

@@ -1918,7 +1918,6 @@ uint8_t set_csirs_measurement_bitmap(NR_CSI_MeasConfig_t *csi_measconfig, NR_CSI
         AssertFatal(false, "Unexpected measurement report type %d\n", report_config->reportQuantity.present);
     }
   }
-  AssertFatal(meas_bitmap > 0, "Expected to have at least 1 measurement configured for CSI-RS\n");
   return meas_bitmap;
 }