Fix scrambled DMA page in beginning of run

Author: kostorr

src/Crorc/Crorc.cxx

@@ -892,12 +892,20 @@ void Crorc::stopTrigger(const DiuConfig& diuConfig)
     ddlReadStatus();
   };
 
+  // Try stopping once
+  try {
+    rorcStopTrigger();
+  } catch (const Exception& e) {
+    std::cout << "STOP TRIGGER DDL TIME-OUT" << std::endl;
+  }
+
   // Try stopping twice
   try {
     rorcStopTrigger();
   } catch (const Exception& e) {
     std::cout << "STOP TRIGGER DDL TIME-OUT" << std::endl;
   }
+
 }
 
 void Crorc::setLoopbackOn(){

src/Crorc/CrorcDmaChannel.cxx

@@ -32,7 +32,7 @@ CrorcDmaChannel::CrorcDmaChannel(const Parameters& parameters)
     //mPdaBar(getRocPciDevice().getPciDevice(), getChannelNumber()), // Initialize main DMA channel BAR
     //mPdaBar2(getRocPciDevice().getPciDevice(), 2), // Initialize BAR 2
     mPageSize(parameters.getDmaPageSize().get_value_or(DMA_PAGE_SIZE)), // 8 kB default for uniformity with CRU
-    mInitialResetLevel(ResetLevel::Internal), // It's good to reset at least the card channel in general
+    mInitialResetLevel(ResetLevel::InternalDiuSiu), // It's good to reset at least the card channel in general
     mNoRDYRX(false), // Not sure
     mUseFeeAddress(false), // Not sure
     mLoopbackMode(parameters.getGeneratorLoopback().get_value_or(LoopbackMode::Internal)), // Internal loopback by default
@@ -99,6 +99,20 @@ CrorcDmaChannel::~CrorcDmaChannel()
 
 void CrorcDmaChannel::deviceStartDma()
 {
+  if (mUseContinuousReadout) {
+    log("Initializing continuous readout");
+    Crorc::Crorc::initReadoutContinuous(*(getBar()));
+  }
+
+  // Find DIU version, required for armDdl()
+  mDiuConfig = getCrorc().initDiuVersion();
+
+  // Resetting the card,according to the RESET LEVEL parameter
+  deviceResetChannel(mInitialResetLevel);
+
+  // Setting the card to be able to receive data
+  startDataReceiving();
+
   log("DMA start deferred until enough superpages available");
 
   mFreeFifoBack = 0;
@@ -121,42 +135,17 @@ void CrorcDmaChannel::startPendingDma()
 
   log("Starting pending DMA");
 
-  if (mUseContinuousReadout) {
-    log("Initializing continuous readout");
-    Crorc::Crorc::initReadoutContinuous(*(getBar()));
-  }
-
-  // Find DIU version, required for armDdl()
-  mDiuConfig = getCrorc().initDiuVersion();
-
-  // Resetting the card,according to the RESET LEVEL parameter
-  deviceResetChannel(mInitialResetLevel);
-
-  // TODO: Move datareceiving at deviceStartDma?
-  // Setting the card to be able to receive data
-  startDataReceiving();
-
-  auto superpageToPush = mTransferQueue.front(); // Push the first superpage
-                                                 // After data receiving has begun
-  for (size_t j = 0; j < READYFIFO_ENTRIES; j++) {
-    auto offset = superpageToPush.getOffset() + j * mPageSize;
-    pushFreeFifoPage(j, getBusOffsetAddress(offset));
-    //mFreeFifoSize++;
-  }
-  mFreeFifoSize = READYFIFO_ENTRIES;
-
   if (mGeneratorEnabled) {
     log("Starting data generator");
-    // Starting the data generator
     startDataGenerator();
   } else {
     if (!mNoRDYRX) {
       log("Starting trigger");
 
       // Clearing SIU/DIU status.
       getCrorc().assertLinkUp();
-      //getCrorc().siuCommand(Ddl::RandCIFST);
-      //getCrorc().diuCommand(Ddl::RandCIFST);
+      getCrorc().siuCommand(Ddl::RandCIFST);
+      getCrorc().diuCommand(Ddl::RandCIFST);
 
       // RDYRX command to FEE
       getCrorc().startTrigger(mDiuConfig);
@@ -165,29 +154,7 @@ void CrorcDmaChannel::startPendingDma()
 
   std::this_thread::sleep_for(100ms);
 
-  if (true) { // Kostas: Temp if to try and remove special handling of first superpage
-    /// Fixed wait for initial pages TODO polling wait with timeout 
-    while ((dataArrived(READYFIFO_ENTRIES - 1) != DataArrivalStatus::WholeArrived)) {
-      std::this_thread::sleep_for(100ms);
-      log("Initial pages not arrived", InfoLogger::InfoLogger::Warning);
-    }
-
-    // TODO: Move this read to fillSuperpages...
-    auto superpageToReadout = mTransferQueue.front(); // Read the first Superpage
-    //superpageToReadout.setReceived(READYFIFO_ENTRIES * mPageSize);
-    //superpageToReadout.setReady(true);
-    mReadyQueue.push_back(superpageToReadout);
-
-    getReadyFifoUser()->reset(); // Reset ReadyFifo
-    mFreeFifoBack = 0;           // Reset FreeFifo references
-    mFreeFifoSize = 0;
-
-    mPendingDmaStart = false;
-    mTransferQueue.pop_front(); // Pop the Superpage after resets; don't introduce race conditions 
-  } else {
-    mPendingDmaStart = false;
-  }
-
+  mPendingDmaStart = false;
   log("DMA started");
 }
 
@@ -211,10 +178,9 @@ void CrorcDmaChannel::deviceResetChannel(ResetLevel::type resetLevel)
   }
 
   try {
-    if (resetLevel == ResetLevel::Internal) {
-      getCrorc().resetCommand(Rorc::Reset::FF, mDiuConfig);
-      getCrorc().resetCommand(Rorc::Reset::RORC, mDiuConfig);
-    }
+    // Always reset the FreeFifo and the channel
+    getCrorc().resetCommand(Rorc::Reset::FF, mDiuConfig);
+    getCrorc().resetCommand(Rorc::Reset::RORC, mDiuConfig);
 
     if (LoopbackMode::isExternal(mLoopbackMode)) {
       getCrorc().armDdl(Rorc::Reset::DIU, mDiuConfig);
@@ -228,7 +194,7 @@ void CrorcDmaChannel::deviceResetChannel(ResetLevel::type resetLevel)
         getCrorc().armDdl(Rorc::Reset::DIU, mDiuConfig);
       }
 
-      //getCrorc().resetCommand(Rorc::Reset::FIFOS & Rorc::Reset::DIU & Rorc::Reset::SIU, mDiuConfig);
+      getCrorc().resetCommand(Rorc::Reset::FIFOS & Rorc::Reset::DIU & Rorc::Reset::SIU, mDiuConfig);
       getCrorc().armDdl(Rorc::Reset::RORC, mDiuConfig);
     }
   }
@@ -244,10 +210,6 @@ void CrorcDmaChannel::deviceResetChannel(ResetLevel::type resetLevel)
 
 void CrorcDmaChannel::startDataGenerator()
 {
-  /*if (LoopbackMode::None == mLoopbackMode) {
-    getCrorc().startTrigger(mDiuConfig);
-  }*/
-
   getCrorc().armDataGenerator(mGeneratorInitialValue, mGeneratorInitialWord, mGeneratorPattern, mGeneratorDataSize,
       mGeneratorSeed);
 
@@ -327,13 +289,6 @@ void CrorcDmaChannel::pushSuperpage(Superpage superpage)
       << ErrorInfo::Message("Could not push superpage, firmware queue was full (this should never happen)"));
   }
 
-  if (mPendingDmaStart) { // TODO: Don't let someone push more than one superpage at this stage
-                          // TODO: Return a "retry" flag?
-    log("DMA has not started, pushSuperpage only updates mTransferQueue");
-    mTransferQueue.push_back(superpage);
-    return;
-  }
-
   for (int i = 0; i < READYFIFO_ENTRIES; i++) { //TODO: *always* push 128 FIFO entries
     auto busAddress = getBusOffsetAddress(superpage.getOffset() + i * mPageSize);
     pushFreeFifoPage(i, busAddress);
@@ -378,7 +333,7 @@ void CrorcDmaChannel::fillSuperpages()
 
         if (mFreeFifoBack == 0) { // Push the superpage after all of the 128 fifo entries are pushed
           auto superpage = mTransferQueue.front();
-          superpage.setReceived(mPageSize * READYFIFO_ENTRIES); //TODO: Always full pages?
+          superpage.setReceived(mPageSize * READYFIFO_ENTRIES); // Always full Superpages
           superpage.setReady(true);
           mReadyQueue.push_back(superpage);
           mTransferQueue.pop_front();

src/Crorc/CrorcDmaChannel.h

@@ -67,7 +67,7 @@ class CrorcDmaChannel final : public DmaChannelPdaBase
 
     /// Max amount of superpages in the ready queue (i.e. finished transfer).
     /// This is an arbitrary size, can easily be increased if more headroom is needed.
-    static constexpr size_t READY_QUEUE_CAPACITY = TRANSFER_QUEUE_CAPACITY + 1; //Allow for some leeway
+    static constexpr size_t READY_QUEUE_CAPACITY = TRANSFER_QUEUE_CAPACITY;
 
 
     /// Minimum number of superpages needed to bootstrap DMA

src/ParameterTypes/LoopbackMode.cxx

@@ -22,7 +22,7 @@ static const auto converter = Utilities::makeEnumConverter<LoopbackMode::type>("
 
 bool LoopbackMode::isExternal(const LoopbackMode::type& mode)
 {
-  return mode == LoopbackMode::Siu || mode == LoopbackMode::Diu;
+  return mode == LoopbackMode::Siu || mode == LoopbackMode::Diu || mode == LoopbackMode::None;
 }
 
 std::string LoopbackMode::toString(const LoopbackMode::type& mode)