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
2025-10-30 17:50:36 +01:00
parent 32889870b3 5e32eb67f6
commit 314ddcebdd
6 changed files with 5 additions and 11 deletions
@@ -23,7 +23,6 @@ gNBs =
    ////////// Physical parameters:

    min_rxtxtime = 2;
-    do_CSIRS     = 1;
    do_SRS       = 1;

    servingCellConfigCommon = (
@@ -18,8 +18,6 @@ gNBs =

 ////////// Physical parameters:

-    do_CSIRS                                                  = 0;
-    do_SRS                                                    = 0;
    min_rxtxtime = 6;

    servingCellConfigCommon = (
@@ -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 = (
@@ -17,9 +17,6 @@ gNBs =

    ////////// Physical parameters:

-    do_CSIRS                                                  = 0;
-    do_SRS                                                    = 0;
-
    servingCellConfigCommon = (
    {
 #spCellConfigCommon
@@ -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;
@@ -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;
 }