gnb: allow selecting between ue-dedicated and common search space for UE search space 2

Author: frankist

apps/gnb/gnb.cpp

@@ -602,9 +602,9 @@ int main(int argc, char** argv)
   phy_rx_symbol_req_adapter.connect(&lower->get_request_handler());
 
   // Create FAPI adaptors.
-  const std::vector<du_cell_config>& du_cfg = generate_du_cell_config(gnb_cfg);
-  unsigned                           sector = du_cfg.size() - 1;
-  subcarrier_spacing                 scs    = du_cfg.front().scs_common;
+  std::vector<du_cell_config> du_cfg = generate_du_cell_config(gnb_cfg);
+  unsigned                    sector = du_cfg.size() - 1;
+  subcarrier_spacing          scs    = du_cfg.front().scs_common;
 
   auto phy_adaptor = build_phy_fapi_adaptor(sector,
                                             scs,

apps/gnb/gnb_appconfig.h

@@ -14,6 +14,7 @@
 #include "srsran/ran/bs_channel_bandwidth.h"
 #include "srsran/ran/pci.h"
 #include "srsran/ran/pdcch/aggregation_level.h"
+#include "srsran/ran/pdcch/search_space.h"
 #include "srsran/ran/subcarrier_spacing.h"
 #include <string>
 #include <thread>
@@ -64,6 +65,12 @@ struct prach_appconfig {
   unsigned max_msg3_harq_retx    = 4;
 };
 
+/// PDCCH application configuration.
+struct pdcch_appconfig {
+  /// Use an UE-dedicated or Common Search Space.
+  search_space_configuration::type_t ue_ss_type = search_space_configuration::type_t::ue_dedicated;
+};
+
 /// PDSCH application configuration.
 struct pdsch_appconfig {
   /// UE modulation and coding scheme index.
@@ -108,6 +115,8 @@ struct base_cell_appconfig {
   std::string plmn = "00101";
   /// TAC.
   unsigned tac = 7;
+  /// PDCCH configuration.
+  pdcch_appconfig pdcch_cfg;
   /// PDSCH configuration.
   pdsch_appconfig pdsch_cfg;
   /// PRACH configuration.

apps/gnb/gnb_appconfig_cli11_schema.cpp

@@ -161,6 +161,19 @@ static void configure_cli11_expert_phy_args(CLI::App& app, expert_phy_appconfig&
       ->capture_default_str();
 }
 
+static void configure_cli11_pdcch_args(CLI::App& app, pdcch_appconfig& pdcch_params)
+{
+  app.add_option_function<std::string>(
+         "--ss_type",
+         [&pdcch_params](const std::string& value) {
+           pdcch_params.ue_ss_type = (value == "common") ? search_space_configuration::type_t::common
+                                                         : search_space_configuration::type_t::ue_dedicated;
+         },
+         "SearchSpace type for UE data")
+      ->default_str("ue_dedicated")
+      ->check(CLI::IsMember({"common", "ue_dedicated"}, CLI::ignore_case));
+}
+
 static void configure_cli11_pdsch_args(CLI::App& app, pdsch_appconfig& pdsch_params)
 {
   app.add_option("--fixed_ue_mcs", pdsch_params.fixed_ue_mcs, "Fixed UE MCS")
@@ -169,7 +182,7 @@ static void configure_cli11_pdsch_args(CLI::App& app, pdsch_appconfig& pdsch_par
   app.add_option("--fixed_rar_mcs", pdsch_params.fixed_rar_mcs, "Fixed RAR MCS")
       ->capture_default_str()
       ->check(CLI::Range(0, 28));
-  app.add_option("--fixed_sib1_mci", pdsch_params.fixed_sib1_mcs, "Fixed SIB1 MCS")
+  app.add_option("--fixed_sib1_mcs", pdsch_params.fixed_sib1_mcs, "Fixed SIB1 MCS")
       ->capture_default_str()
       ->check(CLI::Range(0, 28));
 }
@@ -269,6 +282,10 @@ static void configure_cli11_common_cell_args(CLI::App& app, base_cell_appconfig&
     return (tac <= 0xffffffU) ? "" : "TAC value out of range";
   });
 
+  // PDCCH configuration.
+  CLI::App* pdcch_subcmd = app.add_subcommand("pdcch", "PDCCH parameters");
+  configure_cli11_pdcch_args(*pdcch_subcmd, cell_params.pdcch_cfg);
+
   // PDSCH configuration.
   CLI::App* pdsch_subcmd = app.add_subcommand("pdsch", "PDSCH parameters");
   configure_cli11_pdsch_args(*pdsch_subcmd, cell_params.pdsch_cfg);

apps/gnb/gnb_appconfig_translators.cpp

@@ -96,6 +96,14 @@ std::vector<du_cell_config> srsran::generate_du_cell_config(const gnb_appconfig&
     rach_cfg.prach_root_seq_index                          = base_cell.prach_cfg.prach_root_sequence_index;
     rach_cfg.rach_cfg_generic.zero_correlation_zone_config = base_cell.prach_cfg.zero_correlation_zone;
 
+    // UE-dedicated config.
+    if (config.common_cell_cfg.pdcch_cfg.ue_ss_type == search_space_configuration::type_t::common) {
+      search_space_configuration& ss_cfg =
+          out_cell.ue_ded_serv_cell_cfg.dl_bwps[0].bwp_dl_common->pdcch_common.search_spaces[0];
+      ss_cfg.type                 = search_space_configuration::type_t::common;
+      ss_cfg.common.f0_0_and_f1_0 = true;
+    }
+
     error_type<std::string> error = is_du_cell_config_valid(out_cfg.back());
     if (!error) {
       report_error("Invalid configuration DU cell detected: {}\n", error.error());