Merge pull request #408 from sy-c/master

sy-c · web-flow · commit f7a4daf3c473 · 2023-03-10T15:55:45.000+01:00
readoutcard
diff --git a/README.md b/README.md
@@ -171,11 +171,11 @@ The `Data Source` parameter for the CRU DMA Channel should be used as follows:
 
 Card Configurator
 -------------------
-The `CardConfigurator` class offers an interface to configure the Readout Card (_currently only implemented for the CRU_). In
-order to configure the CRU one has to create a `CardConfigurator` object. The constructor can either be called with a list of
+The `CardConfigurator` class offers an interface to configure the Readout Card. In
+order to configure the CRU or CRORC, one has to create a `CardConfigurator` object. The constructor can either be called with a list of
 parameters, or a path to a configuration file, specifying these parameters.
 
-### Parameters
+### CRU Parameters
 
 The `CardConfigurator` utilizes the `Parameters` class, the same class where Parameters are specified for DMA channels. For the
 Card Configurator, the parameters need to be initialized for the card on BAR2. The command that
@@ -244,6 +244,11 @@ Likewise for `OnuAddress`, passing the int is enough.
 params.setOnuAddress(42)
 ```
 
+### CRORC Parameters
+
+The CRORC parameters which can be defined from configuration file are: `crorcId`, `dynamicOffset`, `timeframeLength`.
+
+
 ### Configuration File
 
 The string containing the path to the configuration file has to start with "file:", otherwise the
@@ -750,7 +755,7 @@ Dependencies
 -------------------
 ### Compatibility
 
-In order to use a CRU the package versions have to adhere to the following table.
+In order to use a CRU/CRORC the package versions have to adhere to the following table.
 
 | ReadoutCard | CRU firmware    | CRORC firmware | PDA Driver  | PDA Library  |
 | ----------- | --------------- | -------------- | ----------- | ------------ |
@@ -775,6 +780,7 @@ In order to use a CRU the package versions have to adhere to the following table
 | v0.34.0     | v3.13.0         | v2.7.0-v2.8.1  | v1.1.0+     | v12.0.0      |
 | v0.35.0     | v3.13.0         | v2.9.0-v2.9.1  | v1.1.0+     | v12.0.0      |
 | v0.36.0     | v3.13.0/v3.14.0 | v2.9.0-v2.9.1  | v1.1.0+     | v12.0.0      |
+| v0.41.0     | v3.13.0/v3.17.1 | v2.9.0-v2.11.0 | v1.1.0+     | v12.0.0      |
 
 The _PDA Driver_ entry refers to the `pda-kadapter-dkms-*.rpm` package which is availabe through the [o2-daq-yum](http://alice-daq-yum-o2.web.cern.ch/alice-daq-yum-o2/cc7_64/) repo as an RPM.
 
diff --git a/doc/releaseNotes.md b/doc/releaseNotes.md
@@ -36,3 +36,7 @@ This file describes the main feature changes for released versions of ReadoutCar
 
 ## v0.42.1 - 06/03/2023
 - Fixed bug with roc-config JSON: crorc-id wrongly set in "cru" section. Now named crorcId and to be set under "crorc" section.
+
+## next version
+- Fix for crorId field in configuration file.
+- o2-roc-list-cards is able to identify previous versions of the firmware. Their version number is displayed and they are flagged as "old", when not on the compatibility list any more.
diff --git a/include/ReadoutCard/FirmwareChecker.h b/include/ReadoutCard/FirmwareChecker.h
@@ -41,6 +41,7 @@ class FirmwareChecker
   void checkFirmwareCompatibilityWrapped(Parameters::CardIdType cardId);
   std::string getFirmwareCompatibilityList();
   std::unordered_map<std::string, std::string> mCompatibleFirmwareList;
+  std::unordered_map<std::string, std::string> mOtherFirmwareList;
   static constexpr char kFirmwareListFile[] = "json:///etc/o2.d/readoutcard/o2-roc-fw-list.json";
 };
 
diff --git a/src/CardConfigurator.cxx b/src/CardConfigurator.cxx
@@ -86,6 +86,7 @@ void CardConfigurator::parseConfigUriCrorc(std::string configUri, Parameters& pa
 {
   bool dynamicOffset = false;
   uint16_t timeFrameLength = 0x100;
+  uint16_t crorcId = 0x0;
 
   std::unique_ptr<o2::configuration::ConfigurationInterface> conf;
   try {
@@ -104,10 +105,13 @@ void CardConfigurator::parseConfigUriCrorc(std::string configUri, Parameters& pa
       if (group == "crorc") { // Configure the CRORC
         dynamicOffset = subtree.get<bool>("dynamicOffset");
         timeFrameLength = subtree.get<int>("timeFrameLength");
+        std::string parsedString = subtree.get<std::string>("crorcId");
+        crorcId = Hex::fromString(parsedString);
       }
 
       parameters.setDynamicOffsetEnabled(dynamicOffset);
       parameters.setTimeFrameLength(timeFrameLength);
+      parameters.setCrorcId(crorcId);
     }
   } catch (...) {
     BOOST_THROW_EXCEPTION(ParseException() << ErrorInfo::ConfigParse(group));
@@ -129,7 +133,6 @@ void CardConfigurator::parseConfigUriCru(std::string configUri, Parameters& para
   bool dynamicOffset = false;
   uint32_t onuAddress = 0x0;
   uint16_t cruId = 0x0;
-  uint16_t crorcId = 0x0;
   GbtMode::type gbtMode = GbtMode::type::Gbt;
   DownstreamData::type downstreamData = DownstreamData::type::Ctp;
   uint32_t triggerWindowSize = 1000;
@@ -213,14 +216,6 @@ void CardConfigurator::parseConfigUriCru(std::string configUri, Parameters& para
         parameters.setUserAndCommonLogicEnabled(userAndCommonLogicEnabled);
         parameters.setSystemId(systemId);
         parameters.setTimeFrameLength(timeFrameLength);
-
-      } else if (group == "crorc") {
-
-        parsedString = subtree.get<std::string>("crorcId");
-        crorcId = Hex::fromString(parsedString);
-
-        parameters.setCrorcId(crorcId);
-
       } else if (group == "links") { // Configure all links with default values
 
         enabled = subtree.get<bool>("enabled");
diff --git a/src/CommandLineUtilities/ProgramListCards.cxx b/src/CommandLineUtilities/ProgramListCards.cxx
@@ -56,8 +56,8 @@ class ProgramListCards : public Program
   {
     std::ostringstream table;
 
-    auto formatHeader = "  %-3s %-6s %-10s %-8s %-10s %-5s %-12s %-12s\n";
-    auto formatRow = "  %-3s %-6s %-10s %-8s %-10s %-5s %-12s %-12s\n";
+    auto formatHeader = "  %-3s %-6s %-10s %-8s %-10s %-5s %-15s %-12s\n";
+    auto formatRow = "  %-3s %-6s %-10s %-8s %-10s %-5s %-15s %-12s\n";
     auto header = (boost::format(formatHeader) % "#" % "Type" % "PCI Addr" % "Serial" % "Endpoint" % "NUMA" % "FW Version" % "UL Version").str();
     auto lineFat = std::string(header.length(), '=') + '\n';
     auto lineThin = std::string(header.length(), '-') + '\n';
diff --git a/src/FirmwareChecker.cxx b/src/FirmwareChecker.cxx
@@ -32,28 +32,34 @@ FirmwareChecker::FirmwareChecker() : mCompatibleFirmwareList({
                                        { "82b4662d", "MFT PSU" },
                                        { "6838510f", "v3.17.0" },
                                        { "8e74a7f8", "v3.17.1" },
-                                       /*{ "6a85d30c", "v3.12.0" },
-                                       { "7be5aa1c", "v3.11.0" },
-                                       { "e4a5a46e", "v3.10.0" },
-                                       { "f71faa86", "v3.9.1" },
-                                       { "8e0d2ffa", "v3.9.0" },
-                                       { "e8e58cff", "v3.8.0" },
-                                                               { "f8cecade", "v3.7.0" },
-                                                               { "75b96268", "v3.6.1" },
-                                                               { "6955404", "v3.6.0" },
-                                                               { "d458317e", "v3.5.2" },
-                                                               { "6baf11da", "v3.5.1" },*/
                                        /* CRORC */
                                        { "267f8e5", "v2.9.1" },
                                        { "cecc295", "v2.9.0" },
                                        { "221ff280", "v2.10.0" },
                                        { "cfa0bc9c", "2.10.1" },
                                        { "2d4c9028", "2.11.0" },
-                                       /*{ "59e9955", "v2.8.1" },
+                                     })
+
+                                     // second list for older firmware
+                                     , mOtherFirmwareList({
+                                       /* CRU */
+                                       { "6a85d30c", "v3.12.0" },
+                                       { "7be5aa1c", "v3.11.0" },
+                                       { "e4a5a46e", "v3.10.0" },
+                                       { "f71faa86", "v3.9.1" },
+                                       { "8e0d2ffa", "v3.9.0" },
+                                       { "e8e58cff", "v3.8.0" },
+                                       { "f8cecade", "v3.7.0" },
+                                       { "75b96268", "v3.6.1" },
+                                       { "6955404", "v3.6.0" },
+                                       { "d458317e", "v3.5.2" },
+                                       { "6baf11da", "v3.5.1" },
+                                       /* CRORC */
+                                       { "59e9955", "v2.8.1" },
                                        { "f086417", "v2.8.0" },
-                                       { "474f9e1", "v2.7.0" }
+                                       { "474f9e1", "v2.7.0" },
                                        { "8e3a98e", "v2.6.1" },
-                                                               { "72cdb92", "v2.4.1" }*/
+                                       { "72cdb92", "v2.4.1" }
                                      })
 {
   std::unordered_map<std::string, std::string> parsedList;
@@ -80,6 +86,8 @@ std::string FirmwareChecker::resolveFirmwareTag(std::string firmware)
   //firmware = firmware.substr(firmware.find_last_of("-") + 1);
   if (mCompatibleFirmwareList.find(firmware) != mCompatibleFirmwareList.end()) {
     return mCompatibleFirmwareList.at(firmware);
+  } else if (mOtherFirmwareList.find(firmware) != mOtherFirmwareList.end()) {
+    return mOtherFirmwareList.at(firmware) + " (old)";
   } else {
     return firmware;
   }
