gnb: add PUCCH configuration for max 512 ues

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

Author: carlo-gal

apps/units/flexible_du/du_high/du_high_config_cli11_schema.cpp

@@ -820,7 +820,7 @@ static void configure_cli11_pucch_args(CLI::App& app, du_high_unit_pucch_config&
              pucch_params.nof_cell_sr_resources,
              "Number of PUCCH F1 resources available per cell for SR")
       ->capture_default_str()
-      ->check(CLI::Range(1, 50));
+      ->check(CLI::Range(1, 100));
   add_option(app,
              "--f0_intraslot_freq_hop",
              pucch_params.f0_intraslot_freq_hopping,
@@ -850,7 +850,7 @@ static void configure_cli11_pucch_args(CLI::App& app, du_high_unit_pucch_config&
              pucch_params.nof_cell_csi_resources,
              "Number of PUCCH F2 resources available per cell for CSI")
       ->capture_default_str()
-      ->check(CLI::Range(0, 50));
+      ->check(CLI::Range(0, 100));
   add_option(app, "--f2_max_nof_rbs", pucch_params.f2_max_nof_rbs, "Max number of RBs for PUCCH F2 resources")
       ->capture_default_str()
       ->check(CLI::Range(1, 16));

configs/cell_cfg_max_256_ues.yml

@@ -1,12 +1,12 @@
 #   This file contains the PUCCH configuration for the gNB to support:
 #   - SR period 20ms or 40ms.
 #   - CSI period 20ms or 40ms.
-#   - Max 128 UEs.
+#   - Max 256 UEs.
 
 #   NOTEs:
 #   - This configuration is optimized for TDD 7D-2U configuration, but it still works for TDD configurations
 #     with more than 2 UL slots.
-#   - This configuration might work for more than 128 UEs, although it hasn't been tested for those scenarios.
+#   - This configuration might work for more than 256 UEs, although it hasn't been tested for those scenarios.
 
 cell_cfg:
   pucch:

configs/cell_cfg_max_512_ues.yml

@@ -0,0 +1,29 @@
+#   This file contains the PUCCH configuration for the gNB to support:
+#   - SR period 20ms or 40ms.
+#   - CSI period 20ms (only with TDD 6D-3U configuration), 40ms (with both TDD 6D-3U and 7D-2U configurations).
+#   - SR period <= CSI period.
+#   - Max 512 UEs.
+
+#   NOTEs:
+#   - This configuration is optimized for TDD 7D-2U configuration, but it still works for TDD configurations
+#     with more than 2 UL slots.
+#   - This configuration might work for more than 512 UEs, although it hasn't been tested for those scenarios.
+
+cell_cfg:
+  pucch:
+    sr_period_ms: 20   # This can be set either 20 or 40 ms.
+    nof_ue_res_harq_per_set: 8
+    nof_cell_harq_pucch_sets: 2    # Increase this if UEs are not scheduled PDSCH due to PUCCH resources starvation.
+    f0_or_f1_nof_cell_res_sr: 80
+    f2_nof_cell_res_csi: 80
+  csi:
+    csi_rs_period: 40  # This can be set to 20 only with TDD 6D-3U.
+  ul_common:
+    max_ul_grants_per_slot: 128
+    max_pucchs_per_slot: 120
+  pusch:
+    max_puschs_per_slot: 8
+  tdd_ul_dl_cfg:
+    nof_dl_symbols: 7
+    nof_dl_slots: 7
+    nof_ul_slots: 2

lib/scheduler/pucch_scheduling/pucch_allocator_impl.cpp

@@ -1188,7 +1188,7 @@ void pucch_allocator_impl::allocate_csi_grant(cell_slot_resource_allocator& pucc
   }
 
   if (pucch_grants_alloc_grid[sl_tx.to_uint()].full()) {
-    logger.info("rnti={}: PUCCH HARQ-ACK allocation for slot={} skipped. Cause: PUCCH allocator grant list is full",
+    logger.info("rnti={}: PUCCH CSI allocation for slot={} skipped. Cause: PUCCH allocator grant list is full",
                 crnti,
                 pucch_slot_alloc.slot);
     return;