From 2a0142fb965fdd0c7cde9a6a29c642e64ce54b09 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Wed, 12 Apr 2023 16:32:32 +0200 Subject: [PATCH] Suppress any CellGroupConfig updates in F1 The CellGroupConfig should come from the DU. Currently, any update made to the CellGroupConfig is done at CU. In split-operation, we have no way of telling the DU about this update. Hence, in this commit, check if we are in F1 split mode operation during a CellGroupConfig update, and if so, suppress any updates to the CellGroupConfig, alongside a warning. --- openair2/RRC/NR/nr_rrc_config.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/openair2/RRC/NR/nr_rrc_config.c b/openair2/RRC/NR/nr_rrc_config.c index 6626fc2240..6b5de8188d 100644 --- a/openair2/RRC/NR/nr_rrc_config.c +++ b/openair2/RRC/NR/nr_rrc_config.c @@ -2326,6 +2326,8 @@ NR_CellGroupConfig_t *get_initial_cellGroupConfig(int uid, return cellGroupConfig; } +#include "common/ran_context.h" +#include "nr_rrc_defs.h" void update_cellGroupConfig(NR_CellGroupConfig_t *cellGroupConfig, const int uid, NR_UE_NR_Capability_t *uecap, @@ -2341,6 +2343,13 @@ void update_cellGroupConfig(NR_CellGroupConfig_t *cellGroupConfig, return; DevAssert(configuration->scc != NULL); + /* This is a hack and will be removed once the CellGroupConfig is fully + * handled at the DU */ + if (NODE_IS_CU(RC.nrrrc[0]->node_type)) { + LOG_W(RRC, "update of CellGroupConfig not yet supported in F1\n"); + return; + } + NR_SpCellConfig_t *SpCellConfig = cellGroupConfig->spCellConfig; NR_ServingCellConfigCommon_t *scc = configuration->scc;