[cru] Last pages no longer need to be popped

Author: kostorr

src/CommandLineUtilities/ProgramDmaBench.cxx

@@ -346,8 +346,6 @@ class ProgramDmaBench : public Program
 
     std::cout << "\n\n";
     mChannel->stopDma();
-    int numPopped = freeExcessPages(10ms);
-    getLogger() << "Popped " << numPopped << " remaining superpages" << endm;
 
     outputErrors();
     outputStats();
@@ -550,39 +548,6 @@ class ProgramDmaBench : public Program
     lowPriorityFuture.get();
   }
 
-  /// Free the pages that remain after stopping DMA (these may not be filled)
-  int freeExcessPages(std::chrono::milliseconds timeout)
-  {
-    auto start = std::chrono::steady_clock::now();
-    int popped = 0;
-    while ((std::chrono::steady_clock::now() - start) < timeout) {
-      auto size = mChannel->getReadyQueueSize();
-      for (int i = 0; i < size; ++i) {
-        auto superpage = mChannel->popSuperpage();
-        fetchAddSuperpagesReadOut();
-        if ((mDataSource == DataSource::Fee) || (mDataSource == DataSource::Ddg)) {
-          auto superpageAddress = mBufferBaseAddress + superpage.getOffset();
-          size_t readoutBytes = 0;
-          bool atStartOfSuperpage = true;
-          while ((readoutBytes < superpage.getReceived())) { // At least one more dma page fits in the superpage
-            auto pageAddress = superpageAddress + readoutBytes;
-            auto readoutCount = fetchAddDmaPagesReadOut();
-            size_t pageSize = readoutPage(pageAddress, readoutCount, atStartOfSuperpage);
-            atStartOfSuperpage = false; // Update the boolean value as soon as we move...
-            readoutBytes += pageSize;
-          }
-
-          if (readoutBytes > mSuperpageSize) {
-            BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message("RDH reports cumulative dma page sizes that exceed the superpage size"));
-          }
-        }
-        std::cout << "[popped superpage " << i << " ], size= " << superpage.getSize() << " received= " << superpage.getReceived() << " isFilled=" << superpage.isFilled() << " isReady=" << superpage.isReady() << std::endl;
-      }
-      popped += size;
-    }
-    return popped;
-  }
-
   uint32_t getDataGeneratorCounterFromPage(uintptr_t pageAddress, size_t headerSize)
   {
     auto payload = reinterpret_cast<const volatile uint32_t*>(pageAddress + headerSize);

src/Cru/CruDmaChannel.cxx

@@ -164,22 +164,15 @@ void CruDmaChannel::deviceStopDma()
   int moved = 0;
   for (auto& link : mLinks) {
     int32_t superpageCount = getBar()->getSuperpageCount(link.id);
-    if (superpageCount == 0) { // Do not pop superpages if the link has been inactive
-      continue;
-    }
     uint32_t amountAvailable = superpageCount - link.superpageCounter;
     //log((format("superpageCount %1% amountAvailable %2%") % superpageCount % amountAvailable).str());
-    for (uint32_t i = 0; i < (amountAvailable + 1); ++i) { // get an extra, possibly partly filled superpage
+    for (uint32_t i = 0; i < amountAvailable; ++i) {
       if (mReadyQueue.size() >= READY_QUEUE_CAPACITY) {
         break;
       }
 
       if (!link.queue.empty()) {    // care for the extra filled superpage
-        if (i == amountAvailable) { // Propagate that it is the last popped to set the size only to the RDH (eox)
-          transferSuperpageFromLinkToReady(link, true);
-        } else {
-          transferSuperpageFromLinkToReady(link);
-        }
+        transferSuperpageFromLinkToReady(link);
         moved++;
       }
     }
@@ -276,23 +269,19 @@ void CruDmaChannel::pushSuperpageToLink(Link& link, const Superpage& superpage)
   link.queue.push_back(superpage);
 }
 
-void CruDmaChannel::transferSuperpageFromLinkToReady(Link& link, bool isPopped)
+void CruDmaChannel::transferSuperpageFromLinkToReady(Link& link)
 {
   if (link.queue.empty()) {
     BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message("Could not transfer Superpage from link to ready queue, link queue is empty"));
   }
 
   link.queue.front().setReady(true);
 
-  if (isPopped) {
-    link.queue.front().setReceived(0x40); // Only RDH in case it's popped
+  uint32_t superpageSize = getBar()->getSuperpageSize(link.id);
+  if (superpageSize == 0) {
+    link.queue.front().setReceived(link.queue.front().getSize()); // force the full superpage size for backwards compatibility
   } else {
-    uint32_t superpageSize = getBar()->getSuperpageSize(link.id);
-    if (superpageSize == 0) {
-      link.queue.front().setReceived(link.queue.front().getSize()); // force the full superpage size for backwards compatibility
-    } else {
-      link.queue.front().setReceived(superpageSize);
-    }
+    link.queue.front().setReceived(superpageSize);
   }
 
   mReadyQueue.push_back(link.queue.front());

src/Cru/CruDmaChannel.h

@@ -115,7 +115,7 @@ class CruDmaChannel final : public DmaChannelPdaBase
   void pushSuperpageToLink(Link& link, const Superpage& superpage);
 
   /// Mark the front superpage of a link ready and transfer it to the ready queue
-  void transferSuperpageFromLinkToReady(Link& link, bool isPopped = false);
+  void transferSuperpageFromLinkToReady(Link& link);
 
   /// Enable debug mode by writing to the appropriate CRU register
   void enableDebugMode();