[params] Remove ReadoutMode

Author: kostorr

CMakeLists.txt

@@ -110,7 +110,6 @@ add_library(ReadoutCard SHARED
   src/ParameterTypes/PciAddress.cxx
   src/ParameterTypes/PciSequenceNumber.cxx
   src/ParameterTypes/ResetLevel.cxx
-  src/ParameterTypes/ReadoutMode.cxx
   src/Utilities/Hugetlbfs.cxx
   src/Utilities/MemoryMaps.cxx
   src/Utilities/Numa.cxx

include/ReadoutCard/ParameterTypes/ReadoutMode.h

@@ -27,7 +27,6 @@
 #include "ReadoutCard/ParameterTypes/LoopbackMode.h"
 #include "ReadoutCard/ParameterTypes/PciAddress.h"
 #include "ReadoutCard/ParameterTypes/PciSequenceNumber.h"
-#include "ReadoutCard/ParameterTypes/ReadoutMode.h"
 #include "ReadoutCard/ParameterTypes/Hex.h"
 
 // CRU Specific
@@ -90,9 +89,6 @@ class Parameters
   /// Type for the generator data size parameter
   using GeneratorRandomSizeEnabledType = bool;
 
-  /// Type for the readout mode parameter
-  using ReadoutModeType = ReadoutMode::type;
-
   /// Type for the link mask parameter
   using LinkMaskType = std::set<uint32_t>;
 
@@ -276,14 +272,6 @@ class Parameters
   /// \return Reference to this object for chaining calls
   auto setBufferParameters(BufferParametersType value) -> Parameters&;
 
-  /// Sets the ReadoutMode parameter
-  ///
-  /// This is a work-in-progress feature. Currently, only the C-RORC is supported in continuous readout mode.
-  ///
-  /// \param value The value to set
-  /// \return Reference to this object for chaining calls
-  auto setReadoutMode(ReadoutModeType value) -> Parameters&;
-
   /// Sets the LinkMask parameter
   ///
   /// The BAR channel may transfer data from multiple links.
@@ -431,10 +419,6 @@ class Parameters
   /// \return The value wrapped in an optional if it is present, or an empty optional if it was not
   auto getBufferParameters() const -> boost::optional<BufferParametersType>;
 
-  /// Gets the ReadoutMode parameter
-  /// \return The value wrapped in an optional if it is present, or an empty optional if it was not
-  auto getReadoutMode() const -> boost::optional<ReadoutModeType>;
-
   /// Gets the LinkMask parameter
   /// \return The value wrapped in an optional if it is present, or an empty optional if it was not
   auto getLinkMask() const -> boost::optional<LinkMaskType>;
@@ -534,11 +518,6 @@ class Parameters
   /// \return The value
   auto getBufferParametersRequired() const -> BufferParametersType;
 
-  /// Gets the ReadoutMode parameter
-  /// \exception ParameterException The parameter was not present
-  /// \return The value
-  auto getReadoutModeRequired() const -> ReadoutModeType;
-
   /// Gets the LinkMask parameter
   /// \exception ParameterException The parameter was not present
   /// \return The value

include/ReadoutCard/Parameters.h

@@ -196,9 +196,6 @@ class ProgramDmaBench : public Program
     options.add_options()("random-pause",
                           po::bool_switch(&mOptions.randomPause),
                           "Randomly pause readout");
-    options.add_options()("readout-mode",
-                          po::value<std::string>(&mOptions.readoutModeString),
-                          "Set readout mode [CONTINUOUS]");
     options.add_options()("stbrd",
                           po::bool_switch(&mOptions.stbrd),
                           "Set the STBRD trigger command for the CRORC");
@@ -266,11 +263,6 @@ class ProgramDmaBench : public Program
       mOptions.generatorPattern = GeneratorPattern::fromString(mOptions.generatorPatternString);
     }
 
-    // Handle readout mode option
-    if (!mOptions.readoutModeString.empty()) {
-      mOptions.readoutMode = ReadoutMode::fromString(mOptions.readoutModeString);
-    }
-
     // Log IOMMU status
     getLogger() << "IOMMU " << (AliceO2::Common::Iommu::isEnabled() ? "enabled" : "not enabled") << endm;
 
@@ -302,10 +294,6 @@ class ProgramDmaBench : public Program
     mInfinitePages = (mOptions.maxBytes <= 0);
     mMaxPages = mOptions.maxBytes / mPageSize;
 
-    if (mOptions.readoutMode) {
-      params.setReadoutMode(*mOptions.readoutMode);
-    }
-
     if (!Utilities::isMultiple(mSuperpageSize, mPageSize)) {
       throw ParameterException() << ErrorInfo::Message("Superpage size not a multiple of page size");
     }
@@ -1126,11 +1114,9 @@ class ProgramDmaBench : public Program
     bool barHammer = false;
     bool noRemovePagesFile = false;
     std::string generatorPatternString;
-    std::string readoutModeString;
     std::string fileOutputPathBin;
     std::string fileOutputPathAscii;
     GeneratorPattern::type generatorPattern = GeneratorPattern::Incremental;
-    b::optional<ReadoutMode::type> readoutMode;
     std::string links;
     bool generatorEnabled = false;
     bool bufferFullCheck = false;

src/CommandLineUtilities/ProgramDmaBench.cxx

@@ -993,39 +993,6 @@ void Crorc::pushRxFreeFifo(uintptr_t blockAddress, uint32_t blockLength, uint32_
   write(Rorc::C_RAFL, (blockLength << 8) | readyFifoIndex);
 }
 
-void Crorc::initReadoutContinuous(RegisterReadWriteInterface& bar2)
-{
-  // Based on:
-  // https://gitlab.cern.ch/costaf/grorc_sw/blob/master/script/grorc_cont_readout.sh
-
-  // this script works with the G-RORC firmware 3.16
-  // SET the card in CONT MODE
-  bar2.writeRegister(0x190 / 4, 0x02000000);
-  // s_send_wide            <= s_reg(0);
-  // s_gbt_tx_pol           <= s_reg(1);
-  // s_gbt_tx_sel           <= s_reg(3 downto 2);
-  // s_gbt_reset            <= s_reg(4);
-  // s_rx_encoding          <= s_reg(8);
-  // s_tx_encoding          <= s_reg(9);
-  // s_read_gate            <= s_reg(12);
-  // s_disable_bank         <= s_reg(17 downto 16);
-  // s_bar_rd_ch(2).reg_194 <= s_reg;
-  // Choose only BANK0
-  bar2.writeRegister(0x194 / 4, 0x21005);
-  // number of GBT words per event
-  bar2.writeRegister(0x18c / 4, 0x1f);
-}
-
-void Crorc::startReadoutContinuous(RegisterReadWriteInterface& bar2)
-{
-  // Based on:
-  // https://gitlab.cern.ch/costaf/grorc_sw/blob/master/script/grorc_send_IDLE_SYNC.sh
-
-  // SET IT AS CUSTOM PATTERN FOR 1 CC and open the GATE READOUT
-  bar2.writeRegister(0x198 / 4, 0x60000001);
-  bar2.writeRegister(0x198 / 4, 0x0);
-}
-
 void Crorc::initReadoutTriggered(RegisterReadWriteInterface&)
 {
   BOOST_THROW_EXCEPTION(std::runtime_error("not implemented"));

src/Crorc/Crorc.cxx

@@ -164,12 +164,6 @@ class Crorc
 
   static ScaReadResult scaGpioWrite(RegisterReadWriteInterface& bar2, uint32_t data);
 
-  /// Set C-RORC for continuous readout
-  static void initReadoutContinuous(RegisterReadWriteInterface& bar2);
-
-  /// Enable (or re-enable) continuous readout
-  static void startReadoutContinuous(RegisterReadWriteInterface& bar2);
-
   /// Set C-RORC for triggered readout
   static void initReadoutTriggered(RegisterReadWriteInterface& bar2);
 

src/Crorc/Crorc.h

@@ -48,12 +48,11 @@ CrorcDmaChannel::CrorcDmaChannel(const Parameters& parameters)
     mLoopbackMode(parameters.getGeneratorLoopback().get_value_or(LoopbackMode::Internal)), // Internal loopback by default
     mGeneratorEnabled(parameters.getGeneratorEnabled().get_value_or(true)),                // Use data generator by default
     mGeneratorPattern(parameters.getGeneratorPattern().get_value_or(GeneratorPattern::Incremental)),
-    mGeneratorMaximumEvents(0),                                                    // Infinite events
-    mGeneratorInitialValue(0),                                                     // Start from 0
-    mGeneratorInitialWord(0),                                                      // First word
-    mGeneratorSeed(mGeneratorPattern == GeneratorPattern::Random ? 1 : 0),         // We use a seed for random only
-    mGeneratorDataSize(parameters.getGeneratorDataSize().get_value_or(mPageSize)), // Can use page size
-    mUseContinuousReadout(parameters.getReadoutMode().is_initialized() ? parameters.getReadoutModeRequired() == ReadoutMode::Continuous : false)
+    mGeneratorMaximumEvents(0),                                                   // Infinite events
+    mGeneratorInitialValue(0),                                                    // Start from 0
+    mGeneratorInitialWord(0),                                                     // First word
+    mGeneratorSeed(mGeneratorPattern == GeneratorPattern::Random ? 1 : 0),        // We use a seed for random only
+    mGeneratorDataSize(parameters.getGeneratorDataSize().get_value_or(mPageSize)) // Can use page size
 {
   // Check that the DMA page is valid
   if (mPageSize != DMA_PAGE_SIZE) {
@@ -116,11 +115,6 @@ CrorcDmaChannel::~CrorcDmaChannel()
 
 void CrorcDmaChannel::deviceStartDma()
 {
-  if (mUseContinuousReadout) {
-    log("Initializing continuous readout");
-    Crorc::Crorc::initReadoutContinuous(*(getBar()));
-  }
-
   // Find DIU version, required for armDdl()
   mDiuConfig = getCrorc().initDiuVersion();
 

src/Crorc/CrorcDmaChannel.cxx

@@ -218,9 +218,6 @@ class CrorcDmaChannel final : public DmaChannelPdaBase
   /// Length of data written to each page
   const size_t mGeneratorDataSize;
 
-  /// Use continuous readout mode
-  const bool mUseContinuousReadout;
-
   Crorc::Crorc::DiuConfig mDiuConfig;
 };
 

src/Crorc/CrorcDmaChannel.h

@@ -32,10 +32,10 @@ namespace roc
 
 /// Variant used for internal storage of parameters
 using Variant = boost::variant<size_t, int32_t, bool, Parameters::BufferParametersType, Parameters::CardIdType,
-                               Parameters::GeneratorLoopbackType, Parameters::GeneratorPatternType, Parameters::ReadoutModeType,
-                               Parameters::LinkMaskType, Parameters::AllowRejectionType, Parameters::ClockType, Parameters::CruIdType,
-                               Parameters::DatapathModeType, Parameters::DownstreamDataType, Parameters::GbtModeType, Parameters::GbtMuxType,
-                               Parameters::GbtMuxMapType, Parameters::PonUpstreamEnabledType, Parameters::OnuAddressType>;
+                               Parameters::GeneratorLoopbackType, Parameters::GeneratorPatternType, Parameters::LinkMaskType,
+                               Parameters::AllowRejectionType, Parameters::ClockType, Parameters::CruIdType,
+                               Parameters::DatapathModeType, Parameters::DownstreamDataType, Parameters::GbtModeType,
+                               Parameters::GbtMuxType, Parameters::GbtMuxMapType, Parameters::PonUpstreamEnabledType, Parameters::OnuAddressType>;
 
 using KeyType = const char*;
 
@@ -123,7 +123,6 @@ _PARAMETER_FUNCTIONS(GeneratorLoopback, "generator_loopback")
 _PARAMETER_FUNCTIONS(GeneratorDataSize, "generator_data_size")
 _PARAMETER_FUNCTIONS(GeneratorPattern, "generator_pattern")
 _PARAMETER_FUNCTIONS(GeneratorRandomSizeEnabled, "generator_random_size_enabled")
-_PARAMETER_FUNCTIONS(ReadoutMode, "readout_mode")
 _PARAMETER_FUNCTIONS(LinkMask, "link_mask")
 _PARAMETER_FUNCTIONS(AllowRejection, "allow_rejection")
 _PARAMETER_FUNCTIONS(Clock, "clock")