firmware compatibility list: identify current and old versions

sy-c · sy-c · commit a4ce146f4d66 · 2023-03-10T14:53:09.000+01:00
diff --git a/README.md b/README.md
@@ -755,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  |
 | ----------- | --------------- | -------------- | ----------- | ------------ |
@@ -780,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
@@ -39,3 +39,4 @@ This file describes the main feature changes for released versions of ReadoutCar
 
 ## 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/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;
   }

Original file line number	Diff line number	Diff line change
`@@ -39,3 +39,4 @@ This file describes the main feature changes for released versions of ReadoutCar`
`39`	`39`
`40`	`40`	`## next version`
`41`	`41`	`- Fix for crorId field in configuration file.`
	`42`	`+- 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.`