[roc-ul] Update for System & Link ID options

Author: kostorr

src/CommandLineUtilities/ProgramDmaBench.cxx

@@ -69,7 +69,7 @@ constexpr auto PACKET_COUNTER_INITIAL_VALUE = std::numeric_limits<uint32_t>::max
 /// Initial value for link event counters
 constexpr auto EVENT_COUNTER_INITIAL_VALUE = std::numeric_limits<uint32_t>::max();
 /// Maximum supported links
-constexpr auto MAX_LINKS = 12;
+constexpr auto MAX_LINKS = 16;
 /// Interval for low priority thread (display updates, etc)
 constexpr auto LOW_PRIORITY_INTERVAL = 10ms;
 /// Fields: Time(hour:minute:second), Pages pushed, Pages read, Errors, °C

src/CommandLineUtilities/ProgramUserLogic.cxx

@@ -47,6 +47,12 @@ class ProgramUserLogic : public Program
     options.add_options()("status",
                           po::bool_switch(&mOptions.status),
                           "Print UL status only");
+    options.add_options()("system-id",
+                          po::value<uint32_t>(&mOptions.systemId)->default_value(0xff),
+                          "Set the System ID");
+    options.add_options()("link-id",
+                          po::value<uint32_t>(&mOptions.linkId)->default_value(0xf),
+                          "Set the Link ID");
   }
 
   virtual void run(const boost::program_options::variables_map& map)
@@ -66,13 +72,15 @@ class ProgramUserLogic : public Program
     if (mOptions.status) {
       Cru::UserLogicInfo ulInfo = cruBar2->reportUserLogic();
       std::cout << "==========================" << std::endl;
+      std::cout << "System ID : 0x" << std::hex << ulInfo.systemId << std::endl;
+      std::cout << "Link ID   : " << std::dec << ulInfo.linkId << std::endl;
       std::cout << "Event size: " << ulInfo.eventSize << " GBT words" << std::endl;
       std::cout << "Event size: " << (ulInfo.eventSize * 128) / 1024.0 << "Kb" << std::endl;
       std::cout << "Event size: " << (ulInfo.eventSize * 128) / (1024.0 * 8) << "KB" << std::endl;
       std::cout << "Randomized: " << std::boolalpha << ulInfo.random << std::endl;
       std::cout << "==========================" << std::endl;
     } else {
-      cruBar2->controlUserLogic(mOptions.eventSize, mOptions.randomEventSize);
+      cruBar2->controlUserLogic(mOptions.eventSize, mOptions.randomEventSize, mOptions.systemId, mOptions.linkId);
     }
   }
 
@@ -81,6 +89,8 @@ class ProgramUserLogic : public Program
     uint32_t eventSize;
     bool randomEventSize;
     bool status;
+    uint32_t systemId;
+    uint32_t linkId;
   } mOptions;
 };
 

src/Cru/Common.h

@@ -182,6 +182,8 @@ struct CtpInfo {
 struct UserLogicInfo {
   uint32_t eventSize;
   bool random;
+  uint32_t systemId;
+  uint32_t linkId;
 };
 
 struct LoopbackStats {

src/Cru/Constants.h

@@ -358,6 +358,8 @@ static constexpr Register SI5344(0x00030400);
 static constexpr Register USER_LOGIC_RESET(0x00c80000);
 static constexpr Register USER_LOGIC_EVSIZE(0x00c80004);
 static constexpr Register USER_LOGIC_EVSIZE_RAND(0x00c80008);
+static constexpr Register USER_LOGIC_SYSTEM_ID(0x00c8000c);
+static constexpr Register USER_LOGIC_LINK_ID(0x00c80010);
 
 /// Register to adjust the TimeFrame length (31 downto 20)
 static constexpr Register TIME_FRAME_LENGTH(0x00000c00);

src/Cru/CruBar.cxx

@@ -1175,7 +1175,7 @@ boost::optional<std::string> CruBar::getUserLogicVersion()
   return (boost::format("%x") % firmwareHash).str();
 }
 
-void CruBar::controlUserLogic(uint32_t eventSize, bool random)
+void CruBar::controlUserLogic(uint32_t eventSize, bool random, uint32_t systemId, uint32_t linkId)
 {
   // reset UL
   writeRegister(Cru::Registers::USER_LOGIC_RESET.index, 0x0);
@@ -1187,13 +1187,21 @@ void CruBar::controlUserLogic(uint32_t eventSize, bool random)
   if (random != randomEventSize) { // toggle random evsize
     writeRegister(Cru::Registers::USER_LOGIC_EVSIZE_RAND.index, 0x1);
   }
+
+  // set system id
+  writeRegister(Cru::Registers::USER_LOGIC_SYSTEM_ID.index, systemId);
+
+  // set link id
+  writeRegister(Cru::Registers::USER_LOGIC_LINK_ID.index, linkId);
 }
 
 Cru::UserLogicInfo CruBar::reportUserLogic()
 {
   bool randomEventSize = readRegister(Cru::Registers::USER_LOGIC_EVSIZE_RAND.index) == 0x1;
   uint32_t eventSize = readRegister(Cru::Registers::USER_LOGIC_EVSIZE.index);
-  return { eventSize, randomEventSize };
+  uint32_t systemId = readRegister(Cru::Registers::USER_LOGIC_SYSTEM_ID.index);
+  uint32_t linkId = readRegister(Cru::Registers::USER_LOGIC_LINK_ID.index);
+  return { eventSize, randomEventSize, systemId, linkId };
 }
 
 std::map<int, Cru::LoopbackStats> CruBar::getGbtLoopbackStats(bool reset)

src/Cru/CruBar.h

@@ -104,7 +104,7 @@ class CruBar final : public BarInterfaceBase
   Cru::OnuStatus reportOnuStatus();
   Cru::FecStatus reportFecStatus();
 
-  void controlUserLogic(uint32_t eventSize, bool random);
+  void controlUserLogic(uint32_t eventSize, bool random, uint32_t systemId, uint32_t linkId);
   Cru::UserLogicInfo reportUserLogic();
 
   std::map<int, Cru::LoopbackStats> getGbtLoopbackStats(bool reset);