[config] Take dynamic offset into account for reconfiguration

Author: kostorr

src/Cru/Common.h

@@ -83,6 +83,7 @@ struct ReportInfo {
   uint32_t ponStatusRegister;
   uint32_t onuAddress;
   uint16_t cruId;
+  bool dynamicOffset;
 };
 
 uint32_t getWrapperBaseAddress(int wrapper);

src/Cru/CruBar.cxx

@@ -428,6 +428,7 @@ Cru::ReportInfo CruBar::report()
   uint32_t ponStatusRegister = getPonStatusRegister();
   uint32_t onuAddress = getOnuAddress();
   uint16_t cruId = getCruId();
+  bool dynamicOffset = datapathWrapper.getDynamicOffsetEnabled(0) && datapathWrapper.getDynamicOffsetEnabled(1); // should be enabled for both wrappers
 
   Cru::ReportInfo reportInfo = {
     linkMap,
@@ -436,6 +437,7 @@ Cru::ReportInfo CruBar::report()
     ponStatusRegister,
     onuAddress,
     cruId,
+    dynamicOffset,
   };
 
   return reportInfo;
@@ -452,7 +454,8 @@ void CruBar::reconfigure()
       static_cast<uint32_t>(mDownstreamData) == reportInfo.downstreamData &&
       std::equal(mLinkMap.begin(), mLinkMap.end(), reportInfo.linkMap.begin()) &&
       checkPonUpstreamStatusExpected(reportInfo.ponStatusRegister, reportInfo.onuAddress) &&
-      mCruId == reportInfo.cruId) { //TODO: Add the dynamic offset in reconfigure
+      mCruId == reportInfo.cruId &&
+      mDynamicOffset == reportInfo.dynamicOffset) {
     log("No need to reconfigure further");
   } else {
     log("Reconfiguring");

src/Cru/DatapathWrapper.cxx

@@ -15,6 +15,7 @@
 
 #include "Constants.h"
 #include "DatapathWrapper.h"
+#include "Utilities/Util.h"
 
 namespace AliceO2
 {
@@ -189,5 +190,19 @@ void DatapathWrapper::setDynamicOffset(int wrapper, bool enable)
   }
 }
 
+bool DatapathWrapper::getDynamicOffsetEnabled(int wrapper)
+{
+  // Enable dynamic offset setting of the RDH (instead of fixed 0x2000)
+  uint32_t address = getDatapathWrapperBaseAddress(wrapper) +
+                     Cru::Registers::DWRAPPER_GREGS.address +
+                     Cru::Registers::DWRAPPER_ENREG.address;
+
+  uint32_t value = mPdaBar->readRegister(address / 4);
+  if (Utilities::getBit(value, 31) == 0x1) {
+    return true;
+  }
+  return false;
+}
+
 } // namespace roc
 } // namespace AliceO2

src/Cru/DatapathWrapper.h

@@ -45,6 +45,7 @@ class DatapathWrapper
   void useDataGeneratorSource(bool enable);
   void enableDataGenerator(bool enable);
   void setDynamicOffset(int wrapper, bool enable);
+  bool getDynamicOffsetEnabled(int wrapper);
 
  private:
   uint32_t getDatapathWrapperBaseAddress(int wrapper);