[config] Add "UP(was DOWN)" status when resetting the link's sticky bit

Author: kostorr

src/CommandLineUtilities/ProgramStatus.cxx

@@ -109,7 +109,15 @@ class ProgramStatus: public Program
       float rxFreq = link.rxFreq;
       float txFreq = link.txFreq;
 
-      std::string linkStatus = link.stickyBit ? "UP" : "DOWN" ;
+      std::string linkStatus;
+      if (link.stickyBit == Cru::LinkStatus::Up) {
+        linkStatus = "UP";
+      } else if (link.stickyBit == Cru::LinkStatus::UpWasDown) {
+        linkStatus = "UP (was DOWN)";
+      } else if (link.stickyBit == Cru::LinkStatus::Down) {
+        linkStatus = "DOWN";
+      }
+
       float opticalPower = link.opticalPower;
 
       auto format = boost::format(formatRow) % globalId % gbtTxRxMode % loopback % gbtMux % datapathMode % enabled % rxFreq % txFreq % linkStatus % opticalPower;

src/Cru/Common.h

@@ -25,6 +25,12 @@ namespace AliceO2 {
 namespace roc {
 namespace Cru {
 
+enum LinkStatus {
+  Up,
+  Down,
+  UpWasDown
+};
+
 struct Link {
   int dwrapper = -1;
   int wrapper = -1;
@@ -39,7 +45,7 @@ struct Link {
   bool loopback = false;
   DatapathMode::type datapathMode = DatapathMode::type::Packet;
   bool enabled = false;
-  bool stickyBit = false;
+  LinkStatus stickyBit = LinkStatus::Down;
   float opticalPower = 0.0;
   float txFreq = 0x0; //In MHz
   float rxFreq = 0x0; //In MHz

src/Cru/Gbt.cxx

@@ -14,14 +14,14 @@
 /// \author Kostas Alexopoulos ([email protected])
 
 #include <iostream>
-#include "Common.h"
 #include "Gbt.h"
 #include "Utilities/Util.h"
 
 namespace AliceO2 {
 namespace roc {
 
 using Link = Cru::Link;
+using LinkStatus = Cru::LinkStatus;
 
 Gbt::Gbt(std::shared_ptr<Pda::PdaBar> pdaBar, std::map<int, Link> &linkMap, int wrapperCount) :
   mPdaBar(pdaBar),
@@ -232,26 +232,33 @@ uint32_t Gbt::getAtxPllRegisterAddress(int wrapper, uint32_t reg)
     Cru::Registers::GBT_WRAPPER_ATX_PLL.address + 4 * reg;
 }
 
-bool Gbt::getStickyBit(Link link)
+LinkStatus Gbt::getStickyBit(Link link)
 {
   uint32_t addr = getStatusAddress(link);
   uint32_t data = mPdaBar->readRegister(addr/4);
   uint32_t lockedData = Utilities::getBit(~data, 14); //phy up 1 = locked, 0 = down
   uint32_t ready = Utilities::getBit(~data, 15); //data layer up 1 = locked, 0 = down 
   if ((lockedData == 0x0) || (ready == 0x0)) {
     resetStickyBit(link);
+    data = mPdaBar->readRegister(addr/4);
+    lockedData = Utilities::getBit(~data, 14); //phy up 1 = locked, 0 = down
+    ready = Utilities::getBit(~data, 15); //data layer up 1 = locked, 0 = down 
+
+    return (lockedData == 0x1 && ready == 0x1) ? LinkStatus::UpWasDown : LinkStatus::Down;
   }
 
-  return (lockedData == 0x1 && ready == 0x1) ? true : false;
+  return (lockedData == 0x1 && ready == 0x1) ? LinkStatus::Up : LinkStatus::UpWasDown;
 }
 
-void Gbt::resetStickyBit(Link link) {
+void Gbt::resetStickyBit(Link link)
+{
   uint32_t addr = getClearErrorAddress(link);
 
   mPdaBar->writeRegister(addr/4, 0x0);
 }
 
-uint32_t Gbt::getRxClockFrequency(Link link) { //In Hz
+uint32_t Gbt::getRxClockFrequency(Link link) //In Hz
+{
   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) +
@@ -261,7 +268,8 @@ uint32_t Gbt::getRxClockFrequency(Link link) { //In Hz
   return mPdaBar->readRegister(address/4);
 }
 
-uint32_t Gbt::getTxClockFrequency(Link link) { //In Hz
+uint32_t Gbt::getTxClockFrequency(Link link) //In Hz
+{
   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) +

src/Cru/Gbt.h

@@ -17,6 +17,7 @@
 #define ALICEO2_READOUTCARD_CRU_GBT_H_
 
 #include "Pda/PdaBar.h"
+#include "Common.h"
 #include "Constants.h"
 #include "I2c.h"
 
@@ -26,6 +27,7 @@ namespace roc {
 class Gbt {
 
   using Link = Cru::Link;
+  using LinkStatus = Cru::LinkStatus;
 
   public: 
     //Gbt(std::shared_ptr<Pda::PdaBar> pdaBar, std::vector<Link> &mLinkList, int wrapperCount);
@@ -39,7 +41,7 @@ class Gbt {
     void getGbtModes();
     void getGbtMuxes();
     void getLoopbacks();
-    bool getStickyBit(Link link);
+    LinkStatus getStickyBit(Link link);
     uint32_t getRxClockFrequency(Link link);
     uint32_t getTxClockFrequency(Link link);