sched: refactor pucch alloc draft

Signed-off-by: Carlo Galiotto <[email protected]>

Author: carlo-gal

include/srsran/ran/pucch/pucch_configuration.h

@@ -201,6 +201,15 @@ struct pucch_config {
   /// \c dl-DataToUL-ACK. Values {0..15}.
   static_vector<uint8_t, 8> dl_data_to_ul_ack;
 
+  /// PUCCH resource max UCI payload, depending on the format. The index defines the format.
+  /// \remark All the resources of the same format are configured with the same max UCI payload.
+  /// \remark For Format 0 and 1, only the max number of HARQ-ACK bits are considered.
+  static_vector<unsigned, 5> format_max_payload{0, 0, 0, 0, 0};
+
+  /// Returns the PUCCH resource max UCI payload for the given format.
+  /// \remark For Format 0 and 1, it returns only the max number of HARQ-ACK bits.
+  unsigned get_max_payload(pucch_format format) const { return format_max_payload[pucch_format_to_uint(format)]; }
+
   bool operator==(const pucch_config& rhs) const
   {
     return pucch_res_set == rhs.pucch_res_set && pucch_res_list == rhs.pucch_res_list &&

include/srsran/ran/pucch/pucch_mapping.h

@@ -25,7 +25,12 @@ enum class pucch_group_hopping {
 };
 
 /// \brief PUCCH Formats as described in TS38.213 Section 9.2.
-enum class pucch_format { FORMAT_0, FORMAT_1, FORMAT_2, FORMAT_3, FORMAT_4, NOF_FORMATS };
+enum class pucch_format : uint8_t { FORMAT_0, FORMAT_1, FORMAT_2, FORMAT_3, FORMAT_4, NOF_FORMATS };
+
+inline uint8_t pucch_format_to_uint(pucch_format format)
+{
+  return static_cast<uint8_t>(format);
+}
 
 /// Defines whether the PUCCH within the current slot belongs to a PUCCH repetition. For more details, refer to
 /// TS38.213, Section 9.2.6.

include/srsran/scheduler/scheduler_pucch_format.h

@@ -43,7 +43,12 @@ enum class pucch_format_4_sf { sf2, sf4 };
 struct pucch_resources {
   prb_interval      prbs;
   ofdm_symbol_range symbols;
-  prb_interval      second_hop_prbs;
+  prb_interval      second_hop_prbs{0U, 0U};
+
+  bool operator==(const pucch_resources& rhs) const
+  {
+    return prbs != rhs.prbs && symbols == rhs.symbols && second_hop_prbs == rhs.second_hop_prbs;
+  }
 };
 
 /// Scheduler output for PUCCH Format 0.

lib/du_manager/ran_resource_management/du_pucch_resource_manager.cpp

@@ -288,6 +288,15 @@ bool du_pucch_resource_manager::alloc_resources(cell_group_config& cell_grp_cfg)
         .report_slot_offset = csi_res_offset.value().second;
   }
 
+  // Update the PUCCH max payload.
+  cell_grp_cfg.cells[0].serv_cell_cfg.ul_config->init_ul_bwp.pucch_cfg.value().format_max_payload[pucch_format_to_uint(
+      pucch_format::FORMAT_1)] = 2U;
+  cell_grp_cfg.cells[0].serv_cell_cfg.ul_config->init_ul_bwp.pucch_cfg.value().format_max_payload[pucch_format_to_uint(
+      pucch_format::FORMAT_2)] =
+      get_pucch_format2_max_payload(user_defined_pucch_cfg.f2_params.max_nof_rbs,
+                                    user_defined_pucch_cfg.f2_params.nof_symbols.to_uint(),
+                                    to_max_code_rate_float(default_pucch_cfg.format_2_common_param.value().max_c_rate));
+
   ++cells[0].ue_idx;
   return true;
 }

lib/scheduler/config/serving_cell_config_factory.cpp

@@ -17,6 +17,7 @@
 #include "srsran/ran/pdcch/search_space.h"
 #include "srsran/ran/prach/prach_configuration.h"
 #include "srsran/ran/prach/prach_helper.h"
+#include "srsran/ran/pucch/pucch_info.h"
 #include "srsran/ran/resource_allocation/ofdm_symbol_range.h"
 #include "srsran/scheduler/config/csi_helper.h"
 #include "srsran/srslog/srslog.h"
@@ -645,6 +646,12 @@ uplink_config srsran::config_helpers::make_default_ue_uplink_config(const cell_c
     pucch_cfg.dl_data_to_ul_ack = generate_k1_candidates(*params.tdd_ul_dl_cfg_common, params.min_k1);
   }
 
+  // Compute the max UCI payload per format.
+  pucch_cfg.format_max_payload[pucch_format_to_uint(pucch_format::FORMAT_1)] = 2U;
+  const auto& res_f2 = std::get<pucch_format_2_3_cfg>(res_basic_f2.format_params);
+  pucch_cfg.format_max_payload[pucch_format_to_uint(pucch_format::FORMAT_2)] = get_pucch_format2_max_payload(
+      res_f2.nof_prbs, res_f2.nof_symbols, to_max_code_rate_float(pucch_cfg.format_2_common_param.value().max_c_rate));
+
   // > PUSCH config.
   ul_config.init_ul_bwp.pusch_cfg.emplace(make_default_pusch_config());