Merge pull request #417 from sy-c/master

v0.44.3

Author: sy-c

CMakeLists.txt

@@ -78,11 +78,6 @@ if(NOT APPLE)
   find_package(Python3 3.6 COMPONENTS Interpreter Development)
   if(Python3_FOUND)
     set(boost_python_component "python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}")
-  else()
-    # Backwards compatible. Can be removed once the Python3 recipe is stable
-    message(WARNING "Python 3 was not found: falling back to Python 2")
-    find_package(Python2 2.7 COMPONENTS Development REQUIRED)
-    set(boost_python_component "python27")
   endif()
 endif()
 

doc/releaseNotes.md

@@ -61,3 +61,8 @@ This file describes the main feature changes for released versions of ReadoutCar
 
 ## 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.
+
+## v0.44.3 - 29/08/2023
+- Fix registers for FEC status counters.
+- Updated list of firmwares for CRORC
+- CMake cleanup: removed python2 support.

src/Cru/Constants.h

@@ -215,7 +215,9 @@ static constexpr Register CLOCK_PLL_CONTROL_ONU(0x00240018);
 static constexpr Register ONU_USER_LOGIC(0x0022a000);
 
 /// Register for getting FEC status
-static constexpr Register ONU_FEC_COUNTERS(0x0022200c);
+static constexpr Register ONU_FEC_COUNTERS_STATUS(0x0022A004);
+static constexpr Register ONU_FEC_COUNTERS_SERR(0x0022A020);
+static constexpr Register ONU_FEC_COUNTERS_DERR(0x0022A028);
 
 /// Registers for setting the Ref Gen
 static constexpr Register ONU_USER_REFGEN(0x0022c000);

src/Cru/Ttc.cxx

@@ -215,14 +215,14 @@ OnuStatus Ttc::onuStatus(bool monitoring)
 
 FecStatus Ttc::fecStatus()
 {
-  uint32_t fecStatus = mBar->readRegister(Cru::Registers::ONU_FEC_COUNTERS.index);
+  uint32_t fecStatus = mBar->readRegister(Cru::Registers::ONU_FEC_COUNTERS_STATUS.index);
   return {
     Utilities::getBit(fecStatus, 0) == 1,
     Utilities::getBit(fecStatus, 1) == 1,
-    Utilities::getBit(fecStatus, 7) == 1,
-    (uint8_t)Utilities::getBits(fecStatus, 8, 15),
-    (uint8_t)Utilities::getBits(fecStatus, 16, 23),
-    (uint8_t)Utilities::getBits(fecStatus, 24, 31)
+    0, // meaningless, kept for compatibility
+    (uint8_t)mBar->readRegister(Cru::Registers::ONU_FEC_COUNTERS_SERR.index),
+    (uint8_t)mBar->readRegister(Cru::Registers::ONU_FEC_COUNTERS_DERR.index),
+    0 // meaningless, kept for compatibility
   };
 }
 

src/DmaChannelPdaBase.cxx

@@ -102,7 +102,7 @@ DmaChannelPdaBase::DmaChannelPdaBase(const Parameters& parameters,
           log("Buffer is hugepage-backed", LogDebugTrace_(4209));
         } else {
           if (AliceO2::Common::Iommu::isEnabled()) {
-            log("Buffer is NOT hugepage-backed, but IOMMU is enabled", LogWarningTrace_(4210));
+            log("Buffer is NOT hugepage-backed, but IOMMU is enabled", LogDebugTrace_(4210));
           } else {
             std::string message =
               "Buffer is NOT hugepage-backed and IOMMU is disabled - unsupported buffer "

src/FirmwareChecker.cxx

@@ -35,14 +35,15 @@ FirmwareChecker::FirmwareChecker() : mCompatibleFirmwareList({
                                        { "9052c0dd", "v3.18.1" },
                                        { "47df4106", "v3.19.0" },
                                        { "adc37d07", "v3.19.0" },
-                                       /* CRORC - keep 7 chars only for the hash */
+                                       /* CRORC (before 2.14, keep 7 chars only for the hash) */
                                        { "267f8e5", "v2.9.1" },
                                        { "cecc295", "v2.9.0" },
                                        { "221ff28", "v2.10.0" },
                                        { "cfa0bc9", "2.10.1" },
                                        { "2d4c902", "2.11.0" },
                                        { "c7ff568", "2.12.0" },
                                        { "ac9dd57", "2.12.1" },
+                                       { "828801a2", "2.14.2" },
                                      })
 
                                      // second list for older firmware

src/ReadoutCardVersion.cxx

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