[config] Configurable Time Frame length for the CRU

Author: kostorr

cru_template.cfg

@@ -59,6 +59,9 @@ userAndCommonLogicEnabled=true
 # 8-bit System ID
 systemId=0xfd
 
+# Time Frame Length [0-255]
+timeFrameLength=255
+
 #############################################
 # links
 #############################################

src/CardConfigurator.cxx

@@ -72,7 +72,7 @@ void CardConfigurator::parseConfigUri(CardType::type cardType, std::string confi
 void CardConfigurator::parseConfigUriCrorc(std::string configUri, Parameters& parameters)
 {
   bool dynamicOffset = false;
-  uint32_t timeFrameLength = 0x100;
+  uint16_t timeFrameLength = 0x100;
 
   std::unique_ptr<o2::configuration::ConfigurationInterface> conf;
   try {
@@ -124,6 +124,7 @@ void CardConfigurator::parseConfigUriCru(std::string configUri, Parameters& para
   bool runStatsEnabled = false;
   bool userAndCommonLogicEnabled = false;
   uint32_t systemId = 0x0;
+  uint16_t timeFrameLength = 0x100;
 
   bool enabled = false;
   std::string gbtMux = "ttc";
@@ -180,6 +181,8 @@ void CardConfigurator::parseConfigUriCru(std::string configUri, Parameters& para
         parsedString = subtree.get<std::string>("systemId");
         systemId = Hex::fromString(parsedString);
 
+        timeFrameLength = subtree.get<int>("timeFrameLength");
+
         parameters.setClock(clock);
         parameters.setDatapathMode(datapathMode);
         parameters.setGbtMode(gbtMode);
@@ -196,6 +199,7 @@ void CardConfigurator::parseConfigUriCru(std::string configUri, Parameters& para
         parameters.setRunStatsEnabled(runStatsEnabled);
         parameters.setUserAndCommonLogicEnabled(userAndCommonLogicEnabled);
         parameters.setSystemId(systemId);
+        parameters.setTimeFrameLength(timeFrameLength);
       } else if (group == "links") { // Configure all links with default values
 
         enabled = subtree.get<bool>("enabled");

src/CommandLineUtilities/ProgramConfig.cxx

@@ -218,9 +218,9 @@ class ProgramConfig : public Program
         cfgFile << "userLogicEnabled=" << std::boolalpha << mOptions.userLogicEnabled << "\n";
         cfgFile << "runStatsEnabled=" << std::boolalpha << mOptions.runStatsEnabled << "\n";
         cfgFile << "userAndCommonLogicEnabled=" << std::boolalpha << mOptions.userAndCommonLogicEnabled << "\n";
-        cfgFile << "timeFrameLength=" << mOptions.timeFrameLength << "\n";
-        cfgFile << "timeFrameDetectionEnabled=" << std::boolalpha << !mOptions.timeFrameDetectionDisabled << "\n";
+        //cfgFile << "timeFrameDetectionEnabled=" << std::boolalpha << !mOptions.timeFrameDetectionDisabled << "\n";
         cfgFile << "systemId=" << mOptions.systemId << "\n";
+        cfgFile << "timeFrameLength=" << mOptions.timeFrameLength << "\n";
 
         cfgFile << "[links]\n";
         cfgFile << "enabled=false\n";

src/Cru/Common.h

@@ -99,6 +99,7 @@ struct ReportInfo {
   bool userLogicEnabled;
   bool runStatsEnabled;
   bool userAndCommonLogicEnabled;
+  uint16_t timeFrameLength;
 };
 
 struct OnuStatus {

src/Cru/Constants.h

@@ -358,6 +358,9 @@ static constexpr Register USER_LOGIC_RESET(0x00c80000);
 static constexpr Register USER_LOGIC_EVSIZE(0x00c80004);
 static constexpr Register USER_LOGIC_EVSIZE_RAND(0x00c80008);
 
+/// Register to adjust the TimeFrame length (31 downto 20)
+static constexpr Register TIME_FRAME_LENGTH(0x00000c00);
+
 } // namespace Registers
 } // namespace Cru
 } // namespace roc

src/Cru/CruBar.cxx

@@ -66,7 +66,8 @@ CruBar::CruBar(const Parameters& parameters, std::unique_ptr<RocPciDevice> rocPc
     mGbtStatsMode(parameters.getGbtStatsMode().get_value_or(GbtStatsMode::All)),
     mGbtHighMask(parameters.getGbtHighMask().get_value_or(0xffffffff)),
     mGbtMedMask(parameters.getGbtMedMask().get_value_or(0xffffffff)),
-    mGbtLowMask(parameters.getGbtLowMask().get_value_or(0xffffffff))
+    mGbtLowMask(parameters.getGbtLowMask().get_value_or(0xffffffff)),
+    mTimeFrameLength(parameters.getTimeFrameLength().get_value_or(0x100))
 {
   if (getIndex() == 0) {
     mFeatures = parseFirmwareFeatures();
@@ -540,6 +541,7 @@ Cru::ReportInfo CruBar::report(bool forConfig)
   bool runStatsEnabled = datapathWrapper.getLinkEnabled(runStatsLink);
 
   bool userAndCommonLogicEnabled = datapathWrapper.getUserAndCommonLogicEnabled(mEndpoint);
+  uint16_t timeFrameLength = getTimeFrameLength();
 
   Cru::ReportInfo reportInfo = {
     linkMap,
@@ -553,7 +555,8 @@ Cru::ReportInfo CruBar::report(bool forConfig)
     gbtEnabled,
     userLogicEnabled,
     runStatsEnabled,
-    userAndCommonLogicEnabled
+    userAndCommonLogicEnabled,
+    timeFrameLength
   };
 
   return reportInfo;
@@ -703,6 +706,7 @@ void CruBar::configure(bool force)
       mUserAndCommonLogicEnabled == reportInfo.userAndCommonLogicEnabled &&
       mRunStatsEnabled == reportInfo.runStatsEnabled &&
       mGbtEnabled == reportInfo.gbtEnabled &&
+      mTimeFrameLength == reportInfo.timeFrameLength &&
       !force) {
     log("No need to reconfigure further", LogInfoOps);
     return;
@@ -823,6 +827,11 @@ void CruBar::configure(bool force)
     datapathWrapper.setDynamicOffset(mEndpoint, mDynamicOffset);
   }
 
+  if (mTimeFrameLength != reportInfo.timeFrameLength || force) {
+    log("Setting Time Frame length", LogInfoDevel);
+    setTimeFrameLength(mTimeFrameLength);
+  }
+
   log("CRU configuration done", LogInfoOps);
 }
 
@@ -1162,5 +1171,16 @@ std::map<int, Cru::LoopbackStats> CruBar::getGbtLoopbackStats(bool reset)
   return gbt.getLoopbackStats(reset, mGbtPatternMode, mGbtCounterType, mGbtStatsMode, mGbtLowMask, mGbtMedMask, mGbtHighMask);
 }
 
+uint16_t CruBar::getTimeFrameLength()
+{
+  uint32_t timeFrameLength = readRegister(Cru::Registers::TIME_FRAME_LENGTH.index);
+  return (uint16_t)Utilities::getBits(timeFrameLength, 12, 20);
+}
+
+void CruBar::setTimeFrameLength(uint16_t timeFrameLength)
+{
+  modifyRegister(Cru::Registers::TIME_FRAME_LENGTH.index, 20, 12, timeFrameLength);
+}
+
 } // namespace roc
 } // namespace o2

src/Cru/CruBar.h

@@ -138,6 +138,9 @@ class CruBar final : public BarInterfaceBase
 
   void setVirtualLinksIds(uint16_t systemId);
 
+  uint16_t getTimeFrameLength();
+  void setTimeFrameLength(uint16_t timeFrameLength);
+
   FirmwareFeatures parseFirmwareFeatures();
   FirmwareFeatures mFeatures;
 
@@ -172,6 +175,7 @@ class CruBar final : public BarInterfaceBase
   uint32_t mGbtMedMask;
   uint32_t mGbtLowMask;
   bool mGbtLoopbackReset;
+  uint32_t mTimeFrameLength;
 
   int mSerial;
   int mEndpoint;