[config] Check for TX freqs when reconfiguring

Author: kostorr

src/Cru/CruBar.cxx

@@ -396,6 +396,20 @@ bool CruBar::checkPonUpstreamStatusExpected(uint32_t ponUpstreamRegister, uint32
     return false;
   }
 }
+
+bool CruBar::checkClockConsistent(std::map<int, Link> linkMap)
+{
+  float prevTxFreq = -1;
+  for (auto& el : linkMap) {
+    auto& link = el.second;
+    if (prevTxFreq != link.txFreq && prevTxFreq != -1) {
+      return false;
+    }
+    prevTxFreq = link.txFreq;
+  }
+  return true;
+}
+
 /// Get the enabled features for the card's firmware.
 FirmwareFeatures CruBar::parseFirmwareFeatures()
 {
@@ -537,6 +551,7 @@ void CruBar::configure(bool force)
       static_cast<uint32_t>(mDownstreamData) == reportInfo.downstreamData &&
       std::equal(mLinkMap.begin(), mLinkMap.end(), reportInfo.linkMap.begin()) &&
       checkPonUpstreamStatusExpected(reportInfo.ponStatusRegister, reportInfo.onuAddress) &&
+      checkClockConsistent(reportInfo.linkMap) &&
       mCruId == reportInfo.cruId &&
       mDynamicOffset == reportInfo.dynamicOffset &&
       mTriggerWindowSize == reportInfo.triggerWindowSize &&
@@ -553,7 +568,7 @@ void CruBar::configure(bool force)
   DatapathWrapper datapathWrapper = DatapathWrapper(mPdaBar);
 
   /* TTC */
-  if (static_cast<uint32_t>(mClock) != reportInfo.ttcClock || force) {
+  if (static_cast<uint32_t>(mClock) != reportInfo.ttcClock || !checkClockConsistent(reportInfo.linkMap) || force) {
     log("Setting the clock");
     ttc.setClock(mClock);
 
@@ -569,7 +584,7 @@ void CruBar::configure(bool force)
       }
     }
 
-    if (mGbtEnabled) {
+    if (mGbtEnabled || !checkClockConsistent(reportInfo.linkMap)) {
       log("Calibrating the fPLLs");
       Gbt gbt = Gbt(mPdaBar, mLinkMap, mWrapperCount, mEndpoint);
       gbt.calibrateGbt(mLinkMap);

src/Cru/CruBar.h

@@ -116,6 +116,7 @@ class CruBar final : public BarInterfaceBase
   uint32_t getPonStatusRegister();
   uint32_t getOnuAddress();
   bool checkPonUpstreamStatusExpected(uint32_t ponUpstreamRegister, uint32_t onuAddress);
+  bool checkClockConsistent(std::map<int, Link> linkMap);
   void populateLinkMap(std::map<int, Link>& linkMap);
 
   uint32_t getDdgBurstLength();