Merge pull request #416 from sy-c/master

v0.44.2

Author: sy-c

doc/releaseNotes.md

@@ -58,3 +58,6 @@ This file describes the main feature changes for released versions of ReadoutCar
 - Updated list of CRORC firmwares: hash truncated to 7 chars, because CRORC does not report all 8.
 - roc-status:
   - added pciAddress for user logic link 15
+
+## v0.44.2 - 23/06/2023
+- Added a workaround to avoid HW lock issues for CRORC: prevent concurrency in the calls to feed superpages to the card. Added a check to detect write discrepencies.

src/Crorc/CrorcBar.cxx

@@ -372,13 +372,64 @@ void CrorcBar::stopDataReceiver()
     Utilities::setBit(CSRRegister, Crorc::Registers::DATA_RX_ON_OFF_BIT, true);
     writeRegister(Crorc::Registers::CHANNEL_CSR.index, CSRRegister);
   }
+
+  nSPpush = 0;
+  nSPpushErr = 0;
+  nSPcounter = 0;
 }
 
 void CrorcBar::pushSuperpageAddressAndSize(uintptr_t blockAddress, uint32_t blockLength)
 {
+/*
   writeRegister(Crorc::Registers::SP_WR_ADDR_HIGH.index, arch64() ? (blockAddress >> 32) : 0x0);
   writeRegister(Crorc::Registers::SP_WR_ADDR_LOW.index, blockAddress & 0xffffffff);
   writeRegister(Crorc::Registers::SP_WR_SIZE.index, blockLength);
+*/
+
+  uint32_t vwr; // value to write
+  uint32_t vxp; // value expected on read back (not always = vwr)
+  uint32_t vrd; // value read back
+  size_t ix; // address index
+
+  auto checkSuccess = [&] () {
+    if (vrd != vxp) {
+      char err[1024];
+      snprintf(err,1024, "pushSuperpageAddress : write failed ix = 0x%X write = 0x%X expected = 0x%X != read 0x%X", (int)ix, (int)vwr, (int)vxp, (int)vrd);
+      log(err, LogErrorDevel_(4699));
+      nSPpushErr++;
+      return -1;
+    }
+    return 0;
+  };
+
+  try {
+    nSPpush++;
+
+    ix = Crorc::Registers::SP_WR_ADDR_HIGH.index;
+    vxp = vwr = arch64() ? (blockAddress >> 32) : 0x0;
+    writeRegister(ix, vwr);
+    vrd = readRegister(ix);
+    checkSuccess();
+
+    ix = Crorc::Registers::SP_WR_ADDR_LOW.index;
+    vxp = vwr = blockAddress & 0xffffffff;
+    writeRegister(ix, vwr);
+    vrd = readRegister(ix);
+    checkSuccess();
+
+    ix = Crorc::Registers::SP_WR_SIZE.index;
+    vxp = vwr = blockLength;
+    vxp = (vwr << 8) | (++nSPcounter); // weird feature of crorc
+    writeRegister(ix, vwr);
+    vrd = readRegister(ix);
+    if (!checkSuccess()) {
+      nSPcounter = vrd & 0xFF;
+    }
+  } catch(...) {
+    nSPpushErr++;
+    log("pushSuperpageAddress exception", LogErrorDevel_(4699));
+  }
+  return;
 }
 
 void CrorcBar::startDataGenerator()

src/Crorc/CrorcBar.h

@@ -72,6 +72,10 @@ class CrorcBar final : public BarInterfaceBase
   void setSiuLoopback();
   Crorc::PacketMonitoringInfo monitorPackets();
 
+  int nSPpush = 0; // total pages pushed
+  int nSPpushErr = 0; // number of push errors
+  uint8_t nSPcounter = 0; // 8-bit push counter as in device
+
  private:
   std::map<int, Crorc::Link> initializeLinkMap();
 

src/Crorc/CrorcDmaChannel.cxx

@@ -267,8 +267,14 @@ bool CrorcDmaChannel::isASuperpageAvailable()
   return diff > 0;
 }
 
+std::mutex lockFillSuperpages;
+
 void CrorcDmaChannel::fillSuperpages()
 {
+  // ensure there is no concurrency to access registers
+  // because this causes HW problems, cf issue O2-3772
+  std::unique_lock<std::mutex> lock(lockFillSuperpages);
+
   // Check for arrivals & handle them
   if (!mIntermediateQueue.isEmpty() && isASuperpageAvailable()) {
 

src/ReadoutCardVersion.cxx

@@ -11,7 +11,7 @@
 
 #include "ReadoutCard/Version.h"
 
-#define O2_READOUTCARD_VERSION "0.44.1"
+#define O2_READOUTCARD_VERSION "0.44.2"
 
 namespace o2
 {