[cru] Don't read the superpage size from the card twice

Author: kostorr

src/CommandLineUtilities/ProgramDmaBench.cxx

@@ -526,7 +526,9 @@ class ProgramDmaBench : public Program
           }
 
           if (readoutBytes > mSuperpageSize) {
-            mDmaLoopBreak = true;
+            mDmaLoopBreak = true; // Dump superpage somewhere
+            mReadoutStream.open("RDH_CUMULATIVE_SP_SIZE_FAILURE.bin");
+            mReadoutStream.write(reinterpret_cast<const char*>(superpageAddress), mSuperpageSize);
             BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message("RDH reports cumulative dma page sizes that exceed the superpage size"));
           }
 
@@ -604,6 +606,8 @@ class ProgramDmaBench : public Program
       if (mCardType == CardType::Cru && mDataSource != DataSource::Internal) {
         linkId = DataFormat::getLinkId(reinterpret_cast<const char*>(pageAddress));
         if (linkId >= mDataGeneratorCounters.size()) {
+          mReadoutStream.open("LINK_ID_OUT_OF_RANGE.bin");
+          mReadoutStream.write(reinterpret_cast<const char*>(pageAddress), mSuperpageSize);
           BOOST_THROW_EXCEPTION(Exception()
                                 << ErrorInfo::Message("Link ID from superpage out of range")
                                 << ErrorInfo::Index(linkId));

src/Cru/CruBar.cxx

@@ -133,7 +133,7 @@ uint32_t CruBar::getSuperpageSize(uint32_t link)
   writeRegister(Cru::Registers::LINK_SUPERPAGE_SIZE.get(link).index, 0xbadcafe); // write a dummy value to update the FIFO
   uint32_t superpageSizeFifo = readRegister(Cru::Registers::LINK_SUPERPAGE_SIZE.get(link).index);
   uint32_t superpageSize = Utilities::getBits(superpageSizeFifo, 0, 23); // [0-23] -> superpage size (in bytes)
-  //uint32_t superpageIndex = Utilities::getBits(superpageSizeFifo, 24, 31); // [24-31] -> superpage index (0-255) for _testing_
+  //uint32_t superpageIndex = Utilities::getBits(superpageSizeFifo, 24, 31); // [24-31] -> superpage index (0-255) _for testing_
 
   return superpageSize;
 }
@@ -440,7 +440,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) { //TODO: Add the dynamic offset in reconfigure
     log("No need to reconfigure further");
   } else {
     log("Reconfiguring");

src/Cru/CruDmaChannel.cxx

@@ -279,7 +279,7 @@ void CruDmaChannel::transferSuperpageFromLinkToReady(Link& link)
   if (superpageSize == 0) {                                       //backwards compatible in case the superpage size register is empty
     link.queue.front().setReceived(link.queue.front().getSize()); // force the full superpage size
   } else {
-    link.queue.front().setReceived(getBar()->getSuperpageSize(link.id));
+    link.queue.front().setReceived(superpageSize);
   }
   mReadyQueue.push_back(link.queue.front());
   link.queue.pop_front();