added glitchCounter

Author: sy-c

doc/releaseNotes.md

@@ -24,3 +24,6 @@ This file describes the main feature changes for released versions of ReadoutCar
 
 ## v0.40.2 - 16/02/2023
 - Fixed bug with o2-roc-ctp-emulator failing to parse hexadecimal values of the init-orbit option.
+
+## next version
+- Added glitchCounter to roc-status (all output styles, including monitoring).

src/CommandLineUtilities/ProgramStatus.cxx

@@ -176,9 +176,9 @@ class ProgramStatus : public Program
         }
       }
     } else if (cardType == CardType::type::Cru) {
-      formatHeader = "  %-9s %-16s %-10s %-14s %-15s %-10s %-14s %-14s %-8s %-19s %-11s %-7s\n";
-      formatRow = "  %-9s %-16s %-10s %-14s %-15s %-10s %-14.2f %-14.2f %-8s %-19.1f %-11s %-7s\n";
-      header = (boost::format(formatHeader) % "Link ID" % "GBT Mode Tx/Rx" % "Loopback" % "GBT MUX" % "Datapath Mode" % "Datapath" % "RX freq(MHz)" % "TX freq(MHz)" % "Status" % "Optical power(uW)" % "System ID" % "FEE ID").str();
+      formatHeader = "  %-9s %-16s %-10s %-14s %-15s %-10s %-14s %-14s %-8s %-19s %-11s %-7s %-10s\n";
+      formatRow = "  %-9s %-16s %-10s %-14s %-15s %-10s %-14.2f %-14.2f %-8s %-19.1f %-11s %-7s %-10s\n";
+      header = (boost::format(formatHeader) % "Link ID" % "GBT Mode Tx/Rx" % "Loopback" % "GBT MUX" % "Datapath Mode" % "Datapath" % "RX freq(MHz)" % "TX freq(MHz)" % "Status" % "Optical power(uW)" % "System ID" % "FEE ID" % "Glitches").str();
       lineFat = std::string(header.length(), '=') + '\n';
       lineThin = std::string(header.length(), '-') + '\n';
 
@@ -379,6 +379,7 @@ class ProgramStatus : public Program
 
         float rxFreq = link.rxFreq;
         float txFreq = link.txFreq;
+        int glitchCounter = link.glitchCounter;
 
         std::string linkStatus;
         if (link.stickyBit == Cru::LinkStatus::Up) {
@@ -407,6 +408,7 @@ class ProgramStatus : public Program
                              .addValue(opticalPower, "opticalPower")
                              .addValue(systemId, "systemId")
                              .addValue(feeId, "feeId")
+                             .addValue(glitchCounter, "glitchCounter")
                              .addTag(tags::Key::SerialId, card.serialId.getSerial())
                              .addTag(tags::Key::Endpoint, card.serialId.getEndpoint())
                              .addTag(tags::Key::CRU, card.sequenceId)
@@ -427,11 +429,12 @@ class ProgramStatus : public Program
           linkNode.put("opticalPower", Utilities::toPreciseString(opticalPower));
           linkNode.put("systemId", systemId);
           linkNode.put("feeId", feeId);
+          linkNode.put("glitchCounter", glitchCounter);
 
           // add the link node to the tree
           root.add_child(std::to_string(globalId), linkNode);
         } else {
-          auto format = boost::format(formatRow) % globalId % gbtTxRxMode % loopback % gbtMux % datapathMode % enabled % rxFreq % txFreq % linkStatus % opticalPower % systemId % feeId;
+          auto format = boost::format(formatRow) % globalId % gbtTxRxMode % loopback % gbtMux % datapathMode % enabled % rxFreq % txFreq % linkStatus % opticalPower % systemId % feeId % glitchCounter;
           table << format;
         }
       }

src/Cru/Common.h

@@ -71,6 +71,7 @@ struct Link {
   uint32_t feeId = 0x0;
   /*uint32_t systemId = 0x1ff; // invalid, used as "unset" placeholder
   uint32_t feeId = 0x1f; // invalid, used as "unset" placeholder*/
+  uint32_t glitchCounter = 0;
 
   bool operator==(const Link& dlink) const
   {

src/Cru/Constants.h

@@ -254,6 +254,9 @@ static constexpr Register GBT_LINK_CLEAR_ERRORS(0x00000038);
 static constexpr Register GBT_LINK_RX_CLOCK(0x00000008);
 static constexpr Register GBT_LINK_TX_CLOCK(0x00000004);
 
+/// Register for getting the glitch counter
+static constexpr Register GBT_LINK_GLITCH_COUNTER(0x00000044);
+
 /// Register for selecting the the GBT Multiplexer
 static constexpr Register GBT_MUX_SELECT(0x0000001c);
 /*static constexpr uint32_t GBT_MUX_TTC(0x0);

src/Cru/CruBar.cxx

@@ -503,6 +503,7 @@ Cru::ReportInfo CruBar::report(bool forConfig)
     link.stickyBit = gbt.getStickyBit(link);
     link.rxFreq = gbt.getRxClockFrequency(link) / 1e6; // Hz -> Mhz
     link.txFreq = gbt.getTxClockFrequency(link) / 1e6; // Hz -> Mhz
+    link.glitchCounter = gbt.getGlitchCounter(link);
     link.systemId = datapathWrapper.getSystemId(link);
     link.feeId = datapathWrapper.getFeeId(link);
 

src/Cru/Gbt.cxx

@@ -315,6 +315,17 @@ uint32_t Gbt::getTxClockFrequency(Link link) //In Hz
   return mPdaBar->readRegister(address / 4);
 }
 
+uint32_t Gbt::getGlitchCounter(Link link)
+{
+  uint32_t address = Cru::getWrapperBaseAddress(link.wrapper) +
+                     Cru::Registers::GBT_WRAPPER_BANK_OFFSET.address * (link.bank + 1) +
+                     Cru::Registers::GBT_BANK_LINK_OFFSET.address * (link.id + 1) +
+                     Cru::Registers::GBT_LINK_REGS_OFFSET.address +
+                     Cru::Registers::GBT_LINK_GLITCH_COUNTER.address;
+
+  return mPdaBar->readRegister(address / 4);
+}
+
 void Gbt::resetFifo()
 {
   mPdaBar->modifyRegister(Cru::Registers::BSP_USER_CONTROL.index, 7, 1, 0x1); // reset TX

src/Cru/Gbt.h

@@ -51,6 +51,7 @@ class Gbt
   LinkStatus getStickyBit(Link link);
   uint32_t getRxClockFrequency(Link link);
   uint32_t getTxClockFrequency(Link link);
+  uint32_t getGlitchCounter(Link link);
   void resetFifo();
   std::map<int, LoopbackStats> getLoopbackStats(bool reset, GbtPatternMode::type patternMode = GbtPatternMode::type::Counter,
                                                 GbtCounterType::type counterType = GbtCounterType::type::ThirtyBit,