rlc: implement rlc SRB default config generator function

Author: frankist

apps/gnb/gnb_appconfig_translators.cpp

@@ -19,6 +19,7 @@
 #include "srsran/ran/prach/prach_configuration.h"
 #include "srsran/ran/prach/prach_helper.h"
 #include "srsran/ran/subcarrier_spacing.h"
+#include "srsran/rlc/rlc_config_factory.h"
 #include "srsran/scheduler/config/cell_config_builder_params.h"
 #include "srsran/scheduler/config/csi_helper.h"
 #include "srsran/scheduler/config/scheduler_expert_config_validator.h"
@@ -995,7 +996,13 @@ std::map<srb_id_t, du_srb_config> srsran::generate_du_srb_config(const gnb_appco
 {
   std::map<srb_id_t, du_srb_config> srb_cfg;
 
-  // TODO: Set SRB parameters based on the gNB appconfig.
+  srb_cfg.insert(std::make_pair(srb_id_t::srb1, du_srb_config{}));
+  srb_cfg.at(srb_id_t::srb1).mac = make_default_srb_mac_lc_config(LCID_SRB1);
+  srb_cfg.at(srb_id_t::srb1).rlc = make_default_srb_rlc_config();
+
+  // Make SRB2/SRB3 config equal to SRB1.
+  srb_cfg.insert(std::make_pair(srb_id_t::srb2, srb_cfg.at(srb_id_t::srb1)));
+  srb_cfg.insert(std::make_pair(srb_id_t::srb3, srb_cfg.at(srb_id_t::srb1)));
 
   return srb_cfg;
 }

include/srsran/rlc/rlc_config_factory.h

@@ -0,0 +1,35 @@
+/*
+ *
+ * Copyright 2021-2023 Software Radio Systems Limited
+ *
+ * By using this file, you agree to the terms and conditions set
+ * forth in the LICENSE file which can be found at the top level of
+ * the distribution.
+ *
+ */
+
+#pragma once
+
+#include "srsran/rlc/rlc_config.h"
+
+namespace srsran {
+
+/// \brief SRB1, SRB2 and SRB3 default configuration as per TS 38.331, 9.2.1.
+inline rlc_config make_default_srb_rlc_config()
+{
+  rlc_config cfg              = {};
+  cfg.mode                    = rlc_mode::am;
+  cfg.am.tx.sn_field_length   = rlc_am_sn_size::size12bits;
+  cfg.am.tx.t_poll_retx       = 45;
+  cfg.am.tx.poll_pdu          = -1;
+  cfg.am.tx.poll_byte         = -1;
+  cfg.am.tx.max_retx_thresh   = 8;
+  cfg.am.tx.queue_size        = 256;
+  cfg.am.rx.sn_field_length   = rlc_am_sn_size::size12bits;
+  cfg.am.rx.t_reassembly      = 35;
+  cfg.am.rx.t_status_prohibit = 0;
+  cfg.metrics_period          = std::chrono::milliseconds(0); // disable metrics reporting for SRBs
+  return cfg;
+}
+
+} // namespace srsran

include/srsran/rlc/rlc_config_messages.h

@@ -14,7 +14,6 @@
 #include "srsran/adt/byte_buffer_chain.h"
 #include "srsran/ran/du_types.h"
 #include "srsran/ran/lcid.h"
-#include "srsran/rlc/rlc_config_messages.h"
 
 /*
  * This file will hold the interfaces and notifiers for the RLC entity.

include/srsran/rlc/rlc_rx.h

@@ -15,7 +15,6 @@
 #include "srsran/adt/optional.h"
 #include "srsran/ran/du_types.h"
 #include "srsran/ran/lcid.h"
-#include "srsran/rlc/rlc_config_messages.h"
 
 /*
  * This file will hold the interfaces and notifiers for the RLC entity.

include/srsran/rlc/rlc_tx.h

@@ -13,23 +13,6 @@
 using namespace srsran;
 using namespace srs_du;
 
-rlc_config srsran::srs_du::make_default_srb_rlc_config()
-{
-  rlc_config cfg              = {};
-  cfg.mode                    = rlc_mode::am;
-  cfg.am.tx.sn_field_length   = rlc_am_sn_size::size12bits;
-  cfg.am.tx.t_poll_retx       = 45;
-  cfg.am.tx.poll_pdu          = -1;
-  cfg.am.tx.poll_byte         = -1;
-  cfg.am.tx.max_retx_thresh   = 8;
-  cfg.am.tx.queue_size        = 256;
-  cfg.am.rx.sn_field_length   = rlc_am_sn_size::size12bits;
-  cfg.am.rx.t_reassembly      = 35;
-  cfg.am.rx.t_status_prohibit = 0;
-  cfg.metrics_period          = std::chrono::milliseconds(0); // disable metrics reporting for SRBs
-  return cfg;
-}
-
 template <typename Bearer>
 static void fill_rlc_entity_creation_message_common(rlc_entity_creation_message&             msg,
                                                     uint32_t                                 du_index,

lib/du_manager/converters/rlc_config_helpers.cpp

@@ -35,9 +35,6 @@ struct rlc_bearer_config {
   }
 };
 
-/// \brief Generates default SRB RLC configuration for SRBs other than SRB0.
-rlc_config make_default_srb_rlc_config();
-
 /// \brief Create configuration for RLC SRB entity.
 rlc_entity_creation_message make_rlc_entity_creation_message(uint32_t                                 du_index,
                                                              du_ue_index_t                            ue_index,

lib/du_manager/converters/rlc_config_helpers.h

@@ -11,6 +11,7 @@
 #include "du_ran_resource_manager_impl.h"
 #include "srsran/mac/config/mac_cell_group_config_factory.h"
 #include "srsran/mac/config/mac_config_helpers.h"
+#include "srsran/rlc/rlc_config_factory.h"
 #include "srsran/scheduler/config/serving_cell_config_factory.h"
 
 using namespace srsran;

lib/du_manager/ran_resource_management/du_ran_resource_manager_impl.cpp

@@ -11,6 +11,7 @@
 #include "du_manager_test_helpers.h"
 #include "srsran/mac/config/mac_cell_group_config_factory.h"
 #include "srsran/mac/config/mac_config_helpers.h"
+#include "srsran/rlc/rlc_config_factory.h"
 #include "srsran/scheduler/config/serving_cell_config_factory.h"
 
 using namespace srsran;

tests/unittests/du_manager/du_manager_test_helpers.cpp

@@ -11,6 +11,7 @@
 #include "du_manager_procedure_test_helpers.h"
 #include "lib/du_manager/procedures/ue_configuration_procedure.h"
 #include "lib/du_manager/procedures/ue_creation_procedure.h"
+#include "srsran/rlc/rlc_config_factory.h"
 #include "srsran/support/test_utils.h"
 
 using namespace srsran;