[cru] Proper GBT MUX handling per endpoint

Author: kostorr

src/Cru/CruBar.cxx

@@ -410,7 +410,7 @@ Cru::ReportInfo CruBar::report()
 
   bool gbtEnabled = false;
   // Update linkMap
-  Gbt gbt = Gbt(mPdaBar, linkMap, mWrapperCount);
+  Gbt gbt = Gbt(mPdaBar, linkMap, mWrapperCount, mEndpoint);
   gbt.getGbtModes();
   gbt.getGbtMuxes();
   gbt.getLoopbacks();
@@ -546,7 +546,7 @@ void CruBar::configure(bool force)
 
     if (mGbtEnabled) {
       log("Calibrating the fPLLs");
-      Gbt gbt = Gbt(mPdaBar, mLinkMap, mWrapperCount);
+      Gbt gbt = Gbt(mPdaBar, mLinkMap, mWrapperCount, mEndpoint);
       gbt.calibrateGbt(mLinkMap);
       Cru::fpllref(mLinkMap, mPdaBar, 2);
       Cru::fpllcal(mLinkMap, mPdaBar);
@@ -704,7 +704,7 @@ void CruBar::populateLinkMap(std::map<int, Link>& linkMap)
 {
   linkMap = initializeLinkMap();
 
-  Gbt gbt = Gbt(mPdaBar, linkMap, mWrapperCount);
+  Gbt gbt = Gbt(mPdaBar, linkMap, mWrapperCount, mEndpoint);
 
   for (auto& el : linkMap) {
     auto& link = el.second;

src/Cru/Gbt.cxx

@@ -25,14 +25,18 @@ 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),
-                                                                                                mLinkMap(linkMap),
-                                                                                                mWrapperCount(wrapperCount)
+Gbt::Gbt(std::shared_ptr<Pda::PdaBar> pdaBar, std::map<int, Link>& linkMap, int wrapperCount, int endpoint) : mPdaBar(pdaBar),
+                                                                                                              mLinkMap(linkMap),
+                                                                                                              mWrapperCount(wrapperCount),
+                                                                                                              mEndpoint(endpoint)
 {
 }
 
 void Gbt::setMux(int index, uint32_t mux)
 {
+  if (mEndpoint == 1) {
+    index += 12;
+  }
   uint32_t reg = index / 16;
   uint32_t bitOffset = (index % 16) * 2;
   uint32_t address = Cru::Registers::GBT_MUX_SELECT.address + (reg * 4);
@@ -103,6 +107,9 @@ void Gbt::getGbtMuxes()
 {
   for (auto& el : mLinkMap) {
     int index = el.first;
+    if (mEndpoint == 1) {
+      index += 12;
+    }
     auto& link = el.second;
     uint32_t reg = (index / 16);
     uint32_t bitOffset = (index % 16) * 2;

src/Cru/Gbt.h

@@ -34,7 +34,7 @@ class Gbt
 
  public:
   //Gbt(std::shared_ptr<Pda::PdaBar> pdaBar, std::vector<Link> &mLinkList, int wrapperCount);
-  Gbt(std::shared_ptr<Pda::PdaBar> pdaBar, std::map<int, Link>& mLinkMap, int wrapperCount);
+  Gbt(std::shared_ptr<Pda::PdaBar> pdaBar, std::map<int, Link>& mLinkMap, int wrapperCount, int endpoint);
   void setMux(int link, uint32_t mux);
   void setInternalDataGenerator(Link link, uint32_t value);
   void setTxMode(Link link, uint32_t mode);
@@ -66,6 +66,7 @@ class Gbt
   std::shared_ptr<Pda::PdaBar> mPdaBar;
   std::map<int, Link>& mLinkMap;
   int mWrapperCount;
+  int mEndpoint;
 };
 } // namespace roc
 } // namespace AliceO2