From e57789adb2725756af4e6c49c8f1eb2a2969c621 Mon Sep 17 00:00:00 2001 From: francescomani Date: Wed, 29 Oct 2025 10:52:39 +0100 Subject: [PATCH] prevent assertion in case of no measurements configured for CSI-RS at UE --- openair1/PHY/NR_UE_TRANSPORT/csi_rx.c | 5 +++++ openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/openair1/PHY/NR_UE_TRANSPORT/csi_rx.c b/openair1/PHY/NR_UE_TRANSPORT/csi_rx.c index c28830e4d7..26cad50f12 100644 --- a/openair1/PHY/NR_UE_TRANSPORT/csi_rx.c +++ b/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; diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c b/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c index 3825a49fd2..714d2eacfd 100644 --- a/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c +++ b/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; }