added roc-status onu glitch counter

Author: sy-c

README.md

@@ -611,6 +611,7 @@ metric format for the CRORC and the CRU is different, as different parameters ar
 | `"mgtRxPllLocked"`      | 0/1 (False/True)               | int    |
 | `"ponQualityStatus"`    | 0/1 (Bad/Good)                 | int    |
 | `"ponRxPower"`          | dBm                            | int    |
+| `"glitchCounter"`       |                                | int    |
 
 | Tag key               | Value                 |
 | --------------------- | --------------------- |

doc/releaseNotes.md

@@ -45,4 +45,6 @@ This file describes the main feature changes for released versions of ReadoutCar
 - Fix for roc-status --monitoring: glitchCounter unsigned.
 
 ## next version
-- Added some (per link) counters for roc-status --monitoring: pktProcessed, pktErrorProtocol, pktErrorCheck1, pktErrorCheck2, pktErrorOversize, orbitSor
+- Added some counters for roc-status:
+  - link (with --monitoring option only): pktProcessed, pktErrorProtocol, pktErrorCheck1, pktErrorCheck2, pktErrorOversize, orbitSor (including for UL link 15)
+  - onu (with --onu option, all output modes, including --monitoring): glitchCounter

src/CommandLineUtilities/ProgramStatus.cxx

@@ -285,6 +285,7 @@ class ProgramStatus : public Program
                              .addValue(onuStatus.mgtRxPllLocked, "mgtRxPllLocked")
                              .addValue(onuStatus.ponQualityStatus, "ponQualityStatus")
                              .addValue(onuStatus.ponRxPower, "ponRxPower")
+                             .addValue((uint64_t)onuStatus.glitchCounter, "glitchCounter")
                              .addTag(tags::Key::SerialId, card.serialId.getSerial())
                              .addTag(tags::Key::Endpoint, card.serialId.getEndpoint())
                              .addTag(tags::Key::ID, card.sequenceId)
@@ -306,6 +307,7 @@ class ProgramStatus : public Program
           root.put("PON quality", Utilities::toHexString(onuStatus.ponQuality));
           root.put("PON quality Status", ponQualityStatusStr);
           root.put("PON RX power (dBm)", onuStatus.ponRxPower);
+          root.put("ONU glitch counter", onuStatus.glitchCounter);
         } else {
           std::cout << "=============================" << std::endl;
           std::cout << "ONU downstream status: \t" << onuDownstreamStatus << std::endl;
@@ -325,6 +327,7 @@ class ProgramStatus : public Program
           std::cout << "PON quality: \t\t0x" << std::hex << onuStatus.ponQuality << std::endl;
           std::cout << "PON quality status: \t" << ponQualityStatusStr << std::endl;
           std::cout << "PON RX power (dBm): \t" << onuStatus.ponRxPower << std::endl;
+          std::cout << "ONU glitch counter: \t" << onuStatus.glitchCounter << std::endl;
         }
       }
 

src/Cru/Common.h

@@ -149,6 +149,7 @@ struct OnuStatus {
   uint32_t ponQuality;
   int ponQualityStatus;
   double ponRxPower;
+  uint32_t glitchCounter;
 };
 
 struct FecStatus {

src/Cru/Constants.h

@@ -201,6 +201,7 @@ static constexpr uint32_t DATA_MIDTRG(0x2);*/
 /// Registers for getting TTC info
 static constexpr Register TTC_ONU_STICKY(0x00200014);
 static constexpr Register TTC_ONU_STICKY_MON(0x00200014);
+static constexpr Register TTC_ONU_GLITCH_COUNTER(0x00200020);
 static constexpr Register TTC_PON_QUALITY(0x0010000C);
 
 /// Registers used for TTC calibration

src/Cru/Ttc.cxx

@@ -193,6 +193,7 @@ OnuStatus Ttc::onuStatus(bool monitoring)
 {
   uint32_t calStatus = mBar->readRegister(Cru::Registers::ONU_USER_LOGIC.index + 0xc / 4);
   uint32_t onuAddress = mBar->readRegister(Cru::Registers::ONU_USER_LOGIC.index) >> 1;
+  uint32_t onuGlitchCounter = mBar->readRegister(Cru::Registers::TTC_ONU_GLITCH_COUNTER.index);
 
   return {
     onuAddress,
@@ -207,7 +208,8 @@ OnuStatus Ttc::onuStatus(bool monitoring)
     getOnuStickyStatus(monitoring),
     getPonQuality(),
     getPonQualityStatus(),
-    getPonRxPower()
+    getPonRxPower(),
+    onuGlitchCounter,
   };
 }