[config] Add allow-rejection parameter check for reconfiguration

Author: kostorr

src/Cru/Common.h

@@ -43,6 +43,7 @@ struct Link {
   float opticalPower = 0.0;
   float txFreq = 0x0; //In MHz
   float rxFreq = 0x0; //In MHz
+  uint32_t allowRejection = 0;
 
   bool operator== (const Link &dlink) const {
     if (enabled == dlink.enabled && enabled == false) {
@@ -59,7 +60,8 @@ struct Link {
       gbtRxMode == dlink.gbtRxMode &&
       loopback == dlink.loopback &&
       datapathMode == dlink.datapathMode &&
-      enabled == dlink.enabled);
+      enabled == dlink.enabled &&
+      allowRejection == dlink.allowRejection);
     }
   }
 };

src/Cru/CruBar.cxx

@@ -35,7 +35,6 @@ using Link = Cru::Link;
 
 CruBar::CruBar(const Parameters& parameters)
     : BarInterfaceBase(parameters),
-      mAllowRejection(parameters.getAllowRejection().get_value_or(false)),
       mClock(parameters.getClock().get_value_or(Clock::Local)),
       mCruId(parameters.getCruId().get_value_or(0x0)),
       mDatapathMode(parameters.getDatapathMode().get_value_or(DatapathMode::Packet)),
@@ -56,6 +55,12 @@ CruBar::CruBar(const Parameters& parameters)
   } else { //default to disabled
     mLoopback = 0x0;
   }
+
+  if (parameters.getAllowRejection() == true) {
+    mAllowRejection = 0x1;
+  } else {
+    mAllowRejection = 0x0;
+  }
 }
 
 CruBar::CruBar(std::shared_ptr<Pda::PdaBar> bar)
@@ -451,6 +456,7 @@ Cru::ReportInfo CruBar::report()
     auto& link = el.second;
     link.datapathMode = datapathWrapper.getDatapathMode(link);
     link.enabled = datapathWrapper.getLinkEnabled(link);
+    link.allowRejection = datapathWrapper.getFlowControl(link.dwrapper);
     link.stickyBit = gbt.getStickyBit(link);
     link.rxFreq = gbt.getRxClockFrequency(link) / 1e6; // Hz -> Mhz
     link.txFreq = gbt.getTxClockFrequency(link) / 1e6; // Hz -> Mhz
@@ -476,7 +482,7 @@ Cru::ReportInfo CruBar::report()
     downstreamData,
     ponStatusRegister,
     onuAddress,
-    cruId
+    cruId,
   };
 
   return reportInfo;
@@ -493,7 +499,7 @@ 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){
+      mCruId == reportInfo.cruId) {
     log("No need to reconfigure further");
   } else {
     log("Reconfiguring");
@@ -542,20 +548,18 @@ void CruBar::configure()
   datapathWrapper.setLinksEnabled(0, 0x0);
   datapathWrapper.setLinksEnabled(1, 0x0);
 
-  log("Enabling links and setting datapath mode");
+  log("Enabling links and setting datapath mode and flow control");
   for (auto const& el: mLinkMap) {
     auto& link = el.second;
     if (link.enabled) {
       datapathWrapper.setLinkEnabled(link);
       datapathWrapper.setDatapathMode(link, mDatapathMode);
     }
+    datapathWrapper.setFlowControl(link.dwrapper, mAllowRejection); //Set flow control anyway as it's per dwrapper
   }
 
-  log("Setting packet arbitration and flow control");
+  log("Setting packet arbitration");
   datapathWrapper.setPacketArbitration(mWrapperCount, 0);
-  if (mAllowRejection) {
-    datapathWrapper.setFlowControl(0, 1);
-  }
 
   log("CRU configuration done.");
 }
@@ -669,6 +673,7 @@ void CruBar::populateLinkMap(std::map<int, Link> &linkMap)
       gbt.setMux(el.first, link.gbtMux);
 
       link.datapathMode = mDatapathMode;
+      link.allowRejection = mAllowRejection;
     }
   }
 }

src/Cru/CruBar.h

@@ -118,7 +118,7 @@ class CruBar final : public BarInterfaceBase
     FirmwareFeatures parseFirmwareFeatures(); 
     FirmwareFeatures mFeatures;
 
-    bool mAllowRejection;
+    uint32_t mAllowRejection;
     Clock::type mClock;
     uint16_t mCruId;
     DatapathMode::type mDatapathMode;

src/Cru/DatapathWrapper.cxx

@@ -113,6 +113,14 @@ void DatapathWrapper::setFlowControl(int wrapper, int allowReject)
   mPdaBar->writeRegister(address/4, value);
 }
 
+uint32_t DatapathWrapper::getFlowControl(int wrapper)
+{
+  uint32_t address = getDatapathWrapperBaseAddress(wrapper) +
+    Cru::Registers::FLOW_CONTROL_OFFSET.address +
+    Cru::Registers::FLOW_CONTROL_REGISTER.address;
+  return mPdaBar->readRegister(address/4);
+}
+
 uint32_t DatapathWrapper::getDatapathWrapperBaseAddress(int wrapper)
 {
   if (wrapper == 0) {

src/Cru/DatapathWrapper.h

@@ -37,6 +37,7 @@ class DatapathWrapper{
     DatapathMode::type getDatapathMode(Link link);
     void setPacketArbitration(int wrapperCount, int arbitrationMode=0);
     void setFlowControl(int wrapper, int allowReject=0);
+    uint32_t getFlowControl(int wrapper);
 
   private:
     uint32_t getDatapathWrapperBaseAddress(int wrapper);