From 6302169d427f61e979e3b08d63ad36a1cfbf5987 Mon Sep 17 00:00:00 2001 From: francescomani Date: Wed, 27 Dec 2023 19:09:07 +0100 Subject: [PATCH] don't configure rach occasions for bwp without rach config --- openair2/LAYER2/NR_MAC_UE/config_ue.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/openair2/LAYER2/NR_MAC_UE/config_ue.c b/openair2/LAYER2/NR_MAC_UE/config_ue.c index 7e7da9c4f8..718dec51bb 100644 --- a/openair2/LAYER2/NR_MAC_UE/config_ue.c +++ b/openair2/LAYER2/NR_MAC_UE/config_ue.c @@ -1913,7 +1913,7 @@ static void configure_BWPs(NR_UE_MAC_INST_t *mac, NR_ServingCellConfig_t *scd) } if (scd->uplinkConfig->firstActiveUplinkBWP_Id) { mac->current_UL_BWP = get_ul_bwp_structure(mac, *scd->uplinkConfig->firstActiveUplinkBWP_Id, false); - AssertFatal(mac->current_UL_BWP, "Couldn't find DL-BWP %ld\n", *scd->uplinkConfig->firstActiveUplinkBWP_Id); + AssertFatal(mac->current_UL_BWP, "Couldn't find UL-BWP %ld\n", *scd->uplinkConfig->firstActiveUplinkBWP_Id); } } } @@ -1947,7 +1947,9 @@ void nr_rrc_mac_config_req_cg(module_id_t module_id, } // Setup the SSB to Rach Occasions mapping according to the config - build_ssb_to_ro_map(mac); + // Only if RACH is configured for current BWP + if (mac->current_UL_BWP->rach_ConfigCommon) + build_ssb_to_ro_map(mac); if (!mac->dl_config_request || !mac->ul_config_request) ue_init_config_request(mac, mac->current_DL_BWP->scs);