ofh: remove 1 port limitation in OFH PRACH handler

Author: sauka

lib/ofh/receiver/ofh_uplane_uplink_symbol_manager.cpp

@@ -78,9 +78,10 @@ void uplane_uplink_symbol_manager::handle_prach_prbs(const message_decoder_resul
 
   // Find resource grid port with eAxC.
   unsigned port = std::distance(prach_eaxc.begin(), std::find(prach_eaxc.begin(), prach_eaxc.end(), results.eaxc));
-  if (port > 0) {
-    logger.debug("Skipping port {} as PRACH buffer currently supports only 1 port", results.eaxc);
-
+  if (port >= prach_context.get_max_nof_ports()) {
+    logger.debug("Skipping port {} as stored PRACH buffer supports up to {} ports",
+                 results.eaxc,
+                 prach_context.get_max_nof_ports());
     return;
   }
   logger.debug("Handling PRACH in slot {}: port={}, symbol={}", slot, port, uplane_results.params.symbol_id);

lib/ofh/support/uplink_context_repository.h

@@ -53,8 +53,8 @@ class ul_prach_context
   ul_prach_context() = default;
 
   /// Constructs an uplink PRACH context with the given PRACH buffer and PRACH buffer context.
-  ul_prach_context(const prach_buffer_context& context_, prach_buffer& buffer_) :
-    context(context_), buffer(&buffer_), nof_symbols(get_preamble_duration(context.format))
+  ul_prach_context(const prach_buffer_context& context_, prach_buffer& buffer_, unsigned nof_ports_) :
+    context(context_), buffer(&buffer_), nof_symbols(get_preamble_duration(context.format)), nof_ports(nof_ports_)
   {
     srsran_assert(context.nof_fd_occasions == 1, "Only supporting one frequency domain occasion");
     srsran_assert(context.nof_td_occasions == 1, "Only supporting one time domain occasion");
@@ -72,7 +72,7 @@ class ul_prach_context
     }
     // Initialize statistic.
     buffer_stats.buffer_nof_re = (preamble_info.sequence_length * nof_symbols);
-    buffer_stats.re_written    = static_vector<unsigned, MAX_NOF_SUPPORTED_EAXC>(buffer->get_max_nof_ports(), 0);
+    buffer_stats.re_written    = static_vector<unsigned, MAX_NOF_SUPPORTED_EAXC>(nof_ports, 0);
   }
 
   /// Returns true if this context is empty, otherwise false.
@@ -84,6 +84,9 @@ class ul_prach_context
   /// Returns the number of symbols used by the PRACH associated with the stored context.
   unsigned get_prach_nof_symbols() const { return empty() ? 0U : nof_symbols; }
 
+  /// Gets the maximum number of ports supported in PRACH buffer.
+  unsigned get_max_nof_ports() const { return empty() ? 0U : nof_ports; }
+
   /// Writes the given IQ buffer corresponding to the given symbol and port and notifies that an uplink PRACH buffer is
   /// ready when all the PRBs for all the symbols and ports have been written in the buffer.
   bool update_buffer_and_notify(unsigned                   port,
@@ -133,6 +136,8 @@ class ul_prach_context
   prach_frequency_mapping_information freq_mapping_info;
   /// Number of OFDM symbols used by the stored PRACH.
   unsigned nof_symbols;
+  /// Number of PRACH ports.
+  unsigned nof_ports;
 };
 
 /// Uplink slot context.

lib/ofh/transmitter/ofh_uplink_request_handler_impl.cpp

@@ -61,7 +61,8 @@ void uplink_request_handler_impl::handle_prach_occasion(const prach_buffer_conte
           ? get_prach_preamble_long_info(context.format)
           : get_prach_preamble_short_info(context.format, to_ra_subcarrier_spacing(context.pusch_scs), true);
 
-  ul_prach_context repo_context(context, buffer);
+  unsigned         nof_prach_ports = std::min(size_t(buffer.get_max_nof_ports()), prach_eaxc.size());
+  ul_prach_context repo_context(context, buffer, nof_prach_ports);
 
   // Store the context in the repository, use correct slot index for long format accounting for PRACH duration.
   if (is_short_preamble(context.format)) {

lib/phy/upper/upper_phy_factories.cpp

@@ -587,9 +587,10 @@ static std::unique_ptr<prach_buffer_pool> create_prach_pool(const upper_phy_conf
     std::unique_ptr<prach_buffer> buffer;
 
     if (config.is_prach_long_format) {
-      buffer = create_prach_buffer_long(1, config.max_nof_fd_prach_occasions);
+      buffer = create_prach_buffer_long(config.nof_rx_ports, config.max_nof_fd_prach_occasions);
     } else {
-      buffer = create_prach_buffer_short(1, config.max_nof_td_prach_occasions, config.max_nof_fd_prach_occasions);
+      buffer = create_prach_buffer_short(
+          config.nof_rx_ports, config.max_nof_td_prach_occasions, config.max_nof_fd_prach_occasions);
     }
 
     report_fatal_error_if_not(buffer, "Invalid PRACH buffer.");