[roc-status] Use different ONU sticky bit for monitoring and cli invocations

Author: kostorr

src/CommandLineUtilities/ProgramStatus.cxx

@@ -243,7 +243,7 @@ class ProgramStatus : public Program
 
       /* ONU PARAMETERS */
       if (mOptions.onu) {
-        Cru::OnuStatus onuStatus = cruBar2->reportOnuStatus();
+        Cru::OnuStatus onuStatus = cruBar2->reportOnuStatus(mOptions.monitoring);
 
         std::string onuStickyStatus;
         int onuStickyStatusInt = 0;

src/Cru/Constants.h

@@ -198,6 +198,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_PON_QUALITY(0x0010000C);
 
 /// Registers used for TTC calibration

src/Cru/CruBar.cxx

@@ -1128,10 +1128,10 @@ void CruBar::patternPlayer(PatternPlayer::Info info)
   pp.play(info);
 }
 
-Cru::OnuStatus CruBar::reportOnuStatus()
+Cru::OnuStatus CruBar::reportOnuStatus(bool monitoring)
 {
   Ttc ttc = Ttc(mPdaBar, mSerial, mEndpoint);
-  return ttc.onuStatus();
+  return ttc.onuStatus(monitoring);
 }
 
 Cru::FecStatus CruBar::reportFecStatus()

src/Cru/CruBar.h

@@ -101,7 +101,7 @@ class CruBar final : public BarInterfaceBase
   void toggleRunStatsLink(bool mRunStatsLinkEnabled);
   boost::optional<std::string> getUserLogicVersion();
 
-  Cru::OnuStatus reportOnuStatus();
+  Cru::OnuStatus reportOnuStatus(bool monitoring = false);
   Cru::FecStatus reportFecStatus();
 
   void controlUserLogic(uint32_t eventSize, bool random, uint32_t systemId, uint32_t linkId);

src/Cru/Ttc.cxx

@@ -146,13 +146,23 @@ bool Ttc::configurePonTx(uint32_t onuAddress)
   //TODO: Show calibration status..
 }
 
-LinkStatus Ttc::getOnuStickyBit()
-{
-  uint32_t was = mBar->readRegister(Cru::Registers::TTC_ONU_STICKY.index);
-  mBar->modifyRegister(Cru::Registers::TTC_DATA.index, 28, 1, 0x1);
-  mBar->modifyRegister(Cru::Registers::TTC_DATA.index, 28, 1, 0x0);
-  uint32_t is = mBar->readRegister(Cru::Registers::TTC_ONU_STICKY.index);
-
+// The monitoring parameter is set when roc-status is called through the monitoring infrastructure
+// this reports and clears a different register, so that clock information is not lost
+// from rogue invocations of roc-status
+LinkStatus Ttc::getOnuStickyBit(bool monitoring)
+{
+  uint32_t was, is;
+  if (monitoring) {
+    was = mBar->readRegister(Cru::Registers::TTC_ONU_STICKY_MON.index);
+    mBar->writeRegister(Cru::Registers::TTC_ONU_STICKY_MON.index, 0x1);
+    mBar->writeRegister(Cru::Registers::TTC_ONU_STICKY_MON.index, 0x0);
+    is = mBar->readRegister(Cru::Registers::TTC_ONU_STICKY_MON.index);
+  } else {
+    was = mBar->readRegister(Cru::Registers::TTC_ONU_STICKY.index);
+    mBar->modifyRegister(Cru::Registers::TTC_DATA.index, 28, 1, 0x1);
+    mBar->modifyRegister(Cru::Registers::TTC_DATA.index, 28, 1, 0x0);
+    is = mBar->readRegister(Cru::Registers::TTC_ONU_STICKY.index);
+  }
   if (was == 0x0 && is == 0x0) {
     return LinkStatus::Up;
   } else if (was != 0x0 && is == 0x0) {
@@ -161,7 +171,7 @@ LinkStatus Ttc::getOnuStickyBit()
   return LinkStatus::Down;
 }
 
-OnuStatus Ttc::onuStatus()
+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;
@@ -176,7 +186,7 @@ OnuStatus Ttc::onuStatus()
     (calStatus >> 5 & 0x1) == 1,
     (calStatus >> 6 & 0x1) == 1,
     (calStatus >> 7 & 0x1) == 1,
-    getOnuStickyBit(),
+    getOnuStickyBit(monitoring),
     getPonQuality(),
     getPonQualityStatus(),
     getPonRxPower()

src/Cru/Ttc.h

@@ -62,13 +62,13 @@ class Ttc
   void setEmulatorORBITINIT(uint32_t orbitInit);
   void setFixedBCTrigger(std::vector<uint32_t> FBCTVector);
 
-  OnuStatus onuStatus();
+  OnuStatus onuStatus(bool monitoring = false);
   FecStatus fecStatus();
 
  private:
   void configurePlls(uint32_t clock);
   void setRefGen(int frequency = 240);
-  LinkStatus getOnuStickyBit();
+  LinkStatus getOnuStickyBit(bool monitoring = false);
   uint32_t getPonQuality();
   int getPonQualityStatus();
   double getPonRxPower();