[cru/dma] Data taking links should be enabled and up

Author: kostorr

src/Cru/CruBar.cxx

@@ -498,7 +498,7 @@ Cru::ReportInfo CruBar::report(bool forConfig)
   for (auto& el : linkMap) {
     auto& link = el.second;
     link.datapathMode = datapathWrapper.getDatapathMode(link);
-    link.enabled = datapathWrapper.getLinkEnabled(link);
+    link.enabled = datapathWrapper.isLinkEnabled(link);
     link.allowRejection = datapathWrapper.getFlowControl(link.dwrapper);
     link.stickyBit = gbt.getStickyBit(link);
     link.rxFreq = gbt.getRxClockFrequency(link) / 1e6; // Hz -> Mhz
@@ -534,12 +534,12 @@ Cru::ReportInfo CruBar::report(bool forConfig)
   Link userLogicLink;
   userLogicLink.dwrapper = mEndpoint;
   userLogicLink.dwrapperId = 15;
-  bool userLogicEnabled = datapathWrapper.getLinkEnabled(userLogicLink);
+  bool userLogicEnabled = datapathWrapper.isLinkEnabled(userLogicLink);
 
   Link runStatsLink;
   runStatsLink.dwrapper = mEndpoint;
   runStatsLink.dwrapperId = (mEndpoint == 0) ? 13 : 14;
-  bool runStatsEnabled = datapathWrapper.getLinkEnabled(runStatsLink);
+  bool runStatsEnabled = datapathWrapper.isLinkEnabled(runStatsLink);
 
   bool userAndCommonLogicEnabled = datapathWrapper.getUserAndCommonLogicEnabled(mEndpoint);
   uint16_t timeFrameLength = getTimeFrameLength();
@@ -913,6 +913,46 @@ std::map<int, Link> CruBar::initializeLinkMap()
   return newLinkMap;
 }
 
+// Returns a vector of the link ids that should participate in data taking
+// A link participates in data taking if it is enabled in the datapath and is not down
+std::vector<int> CruBar::getDataTakingLinks()
+{
+  std::vector<int> links;
+  DatapathWrapper datapathWrapper = DatapathWrapper(mPdaBar);
+  auto linkMap = initializeLinkMap();
+  if (mWrapperCount == 0) {
+    setWrapperCount();
+  }
+  Gbt gbt = Gbt(mPdaBar, linkMap, mWrapperCount, mEndpoint);
+
+  // Insert GBT links
+  for (auto const& el : linkMap) {
+    int id = el.first;
+    Link link = el.second;
+    if (!datapathWrapper.isLinkEnabled(link) || gbt.getStickyBit(link) == Cru::LinkStatus::Down) {
+      continue;
+    }
+    links.push_back(id);
+  }
+
+  Cru::Link newLink;
+  newLink.dwrapper = mEndpoint;
+
+  // Insert Run Statistics link
+  newLink.dwrapperId = (mEndpoint == 0) ? 13 : 14;
+  if (datapathWrapper.isLinkEnabled(newLink)) {
+    links.push_back(newLink.dwrapperId);
+  }
+
+  // Insert UL link
+  newLink.dwrapperId = 15;
+  if (datapathWrapper.isLinkEnabled(newLink)) {
+    links.push_back(newLink.dwrapperId);
+  }
+
+  return links;
+}
+
 /// Initializes and Populates the linkMap with the GBT configuration parameters
 /// Also runs the corresponding configuration
 void CruBar::populateLinkMap(std::map<int, Link>& linkMap)

src/Cru/CruBar.h

@@ -111,6 +111,8 @@ class CruBar final : public BarInterfaceBase
 
   std::map<int, Link> initializeLinkMap();
 
+  std::vector<int> getDataTakingLinks();
+
   std::shared_ptr<Pda::PdaBar> getPdaBar()
   {
     return mPdaBar;

src/Cru/CruDmaChannel.cxx

@@ -72,50 +72,23 @@ CruDmaChannel::CruDmaChannel(const Parameters& parameters)
 
   // Insert links
   {
-    DatapathWrapper dwrapper = DatapathWrapper(getBar2()->getPdaBar());
-    auto linkMap = getBar2()->initializeLinkMap();
-
-    int endpoint = getBar()->getEndpointNumber();
-
-    Cru::Link newLink;
-    newLink.dwrapper = endpoint;
-
-    // Insert UL link
-    newLink.dwrapperId = 15;
-    if (dwrapper.getLinkEnabled(newLink)) {
-      linkMap.insert({ 15, newLink });
-    }
-
-    // Insert Run Statistics link
-    newLink.dwrapperId = (endpoint == 0) ? 13 : 14;
-
-    if (dwrapper.getLinkEnabled(newLink)) {
-      linkMap.insert({ newLink.dwrapperId, newLink });
-    }
-
     std::stringstream stream;
     stream << "Using link(s): ";
 
-    for (const auto& el : linkMap) {
-      auto id = el.first;
-      auto link = el.second;
-      if (!dwrapper.getLinkEnabled(link)) {
-        //log((format("Will not push superpages to link #%1% (disabled)") % id).str(), InfoLogger::InfoLogger::Warning);
-        continue;
-      }
-
-      stream << id << " ";
+    auto links = getBar2()->getDataTakingLinks();
+    for (auto const& link : links) {
+      stream << link << " ";
       //Implicit constructors are deleted for the folly Queue. Workaround to keep the Link struct with a queue * field.
       std::shared_ptr<SuperpageQueue> linkQueue = std::make_shared<SuperpageQueue>(LINK_QUEUE_CAPACITY_ALLOCATIONS);
-      Link newLink = { static_cast<LinkId>(id), 0, linkQueue };
+      Link newLink = { static_cast<LinkId>(link), 0, linkQueue };
       mLinks.push_back(newLink);
     }
 
+    log(stream.str(), LogInfoOps);
+
     if (mLinks.empty()) {
       BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message("No links are enabled. Check with roc-status. Configure with roc-config."));
     }
-
-    log(stream.str(), LogInfoOps);
   }
 }
 

src/Cru/DatapathWrapper.cxx

@@ -55,7 +55,7 @@ void DatapathWrapper::setLinkDisabled(Link link)
 }
 
 /// Get particular link's enabled bit
-bool DatapathWrapper::getLinkEnabled(Link link)
+bool DatapathWrapper::isLinkEnabled(Link link)
 {
   uint32_t address = getDatapathWrapperBaseAddress(link.dwrapper) +
                      Cru::Registers::DWRAPPER_GREGS.address +

src/Cru/DatapathWrapper.h

@@ -37,7 +37,7 @@ class DatapathWrapper
   void setLinksEnabled(uint32_t dwrapper, uint32_t mask);
   void setLinkEnabled(Link link);
   void setLinkDisabled(Link link);
-  bool getLinkEnabled(Link link);
+  bool isLinkEnabled(Link link);
   void setDatapathMode(Link link, uint32_t mode);
   DatapathMode::type getDatapathMode(Link link);
   void setPacketArbitration(int wrapperCount, int arbitrationMode = 0);