Merge pull request #428 from sy-c/master

v0.45.7

Author: sy-c

CMakeLists.txt

@@ -24,7 +24,7 @@ endif()
 
 # Define project
 project(ReadoutCard
-  VERSION 0.45.6
+  VERSION 0.45.7
   DESCRIPTION "O2 ReadoutCard library"
   LANGUAGES C CXX
 )

doc/releaseNotes.md

@@ -90,3 +90,6 @@ This file describes the main feature changes for released versions of ReadoutCar
 
 ## v0.45.6 - 07/02/2025
 - Updated list of firmwares.
+
+## v0.45.7 - 13/03/2025
+- o2-roc-config: added (temporary) option --test-mode-ORC501 to enable testing of new firmware as described in [ORC-501](https://its.cern.ch/jira/browse/ORC-501).

src/CommandLineUtilities/ProgramConfig.cxx

@@ -36,6 +36,14 @@ namespace po = boost::program_options;
 
 std::string cmd; // program command invoked
 
+namespace o2
+{
+namespace roc
+{
+extern bool testModeORC501; // testMode flag used for some FW dev, cf JIRA ORC-501
+}
+}
+
 /// Get a status report of given card
 std::string getStatusReport(Parameters::CardIdType cardId)
 {
@@ -322,6 +330,9 @@ class ProgramConfig : public Program
     options.add_options()("drop-bad-rdh",
                           po::bool_switch(&mOptions.dropBadRdhEnabled),
                           "Flag to enable dropping of packets with bad RDH");
+    options.add_options()("test-mode-ORC501",
+                          po::bool_switch(&o2::roc::testModeORC501),
+                          "Flag to enable test mode as described in JIRA ORC-501");
     Options::addOptionCardId(options);
   }
 

src/Cru/CruBar.cxx

@@ -39,6 +39,8 @@ namespace o2
 namespace roc
 {
 
+bool testModeORC501 = false; // testMode flag used for some FW dev, cf JIRA ORC-501
+
 using Link = Cru::Link;
 
 CruBar::CruBar(const Parameters& parameters, std::unique_ptr<RocPciDevice> rocPciDevice)
@@ -776,9 +778,14 @@ void CruBar::configure(bool force)
     }
 
     if (mGbtEnabled /*|| !checkClockConsistent(reportInfo.linkMap)*/) {
+      if (testModeORC501) {
+        log("GBT :  using test mode, cf JIRA ORC-501", LogInfoDevel_(4601));
+      }
       Gbt gbt = Gbt(mPdaBar, mLinkMap, mWrapperCount, mEndpoint);
       gbt.calibrateGbt(mLinkMap);
-      Cru::fpllref(mLinkMap, mPdaBar, 2);
+      if (!testModeORC501) { // testMode flag used for some FW dev, cf JIRA ORC-501
+        Cru::fpllref(mLinkMap, mPdaBar, 2);
+      }
       Cru::fpllcal(mLinkMap, mPdaBar);
       gbt.resetFifo();
     }

src/Cru/Gbt.cxx

@@ -84,7 +84,10 @@ void Gbt::calibrateGbt(std::map<int, Link> linkMap)
 {
   //Cru::fpllref(linkMap, mPdaBar, 2); //Has been bound with clock configuration
   //Cru::fpllcal(linkMap, mPdaBar); //same
-  cdrref(linkMap, 2);
+  extern bool testModeORC501; // testMode flag used for some FW dev, cf JIRA ORC-501
+  if (!testModeORC501) { // testMode flag used for some FW dev, cf JIRA ORC-501
+    cdrref(linkMap, 2);
+  }
   txcal(linkMap);
   rxcal(linkMap);
 }

src/ReadoutCardVersion.cxx

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