[config] Don't allow user-and-common-logic w/o user-logic enabled

Author: kostorr

src/CommandLineUtilities/ProgramConfig.cxx

@@ -110,13 +110,13 @@ class ProgramConfig : public Program
                           "Flag to switch off GBT");
     options.add_options()("user-logic",
                           po::bool_switch(&mOptions.userLogicEnabled),
-                          "Flag to enable the User Logic link");
+                          "Flag to toggle the User Logic link");
     options.add_options()("run-stats",
                           po::bool_switch(&mOptions.runStatsEnabled),
-                          "Flag to enable the Run Statistics link");
+                          "Flag to toggle the Run Statistics link");
     options.add_options()("user-and-common-logic",
                           po::bool_switch(&mOptions.userAndCommonLogicEnabled),
-                          "Flag to enable the User and Common Logic");
+                          "Flag to toggle the User and Common Logic");
     Options::addOptionCardId(options);
   }
 

src/CommandLineUtilities/ProgramStatus.cxx

@@ -224,15 +224,14 @@ class ProgramStatus : public Program
         std::cout << "CRU ID: " << reportInfo.cruId << std::endl;
         std::cout << clock << " clock | ";
         std::cout << offset << " offset" << std::endl;
-        if (reportInfo.userLogicEnabled) {
+        if (reportInfo.userLogicEnabled && reportInfo.userAndCommonLogicEnabled) {
+          std::cout << "User and Common Logic enabled" << std::endl;
+        } else if (reportInfo.userLogicEnabled) {
           std::cout << "User Logic enabled" << std::endl;
         }
         if (reportInfo.runStatsEnabled) {
           std::cout << "Run statistics enabled" << std::endl;
         }
-        if (reportInfo.userAndCommonLogicEnabled) {
-          std::cout << "User and Common logic enabled" << std::endl;
-        }
       }
 
       /* ONU PARAMETERS */
@@ -241,15 +240,15 @@ class ProgramStatus : public Program
 
         if (mOptions.monitoring) {
           monitoring->send(Metric{ "onu" }
-              .addValue(std::to_string(onuStatus.onuAddress), "onuAddress")
-              .addValue(onuStatus.rx40Locked, "rx40Locked")
-              .addValue(onuStatus.phaseGood, "phaseGood")
-              .addValue(onuStatus.rxLocked, "rxLocked")
-              .addValue(onuStatus.operational, "operational")
-              .addValue(onuStatus.mgtTxReady, "mgtTxReady")
-              .addValue(onuStatus.mgtRxReady, "mgtRxReady")
-              .addValue(onuStatus.mgtTxPllLocked, "mgtTxPllLocked")
-              .addValue(onuStatus.mgtRxPllLocked, "mgtRxPllLocked"));
+                             .addValue(std::to_string(onuStatus.onuAddress), "onuAddress")
+                             .addValue(onuStatus.rx40Locked, "rx40Locked")
+                             .addValue(onuStatus.phaseGood, "phaseGood")
+                             .addValue(onuStatus.rxLocked, "rxLocked")
+                             .addValue(onuStatus.operational, "operational")
+                             .addValue(onuStatus.mgtTxReady, "mgtTxReady")
+                             .addValue(onuStatus.mgtRxReady, "mgtRxReady")
+                             .addValue(onuStatus.mgtTxPllLocked, "mgtTxPllLocked")
+                             .addValue(onuStatus.mgtRxPllLocked, "mgtRxPllLocked"));
         } else if (mOptions.jsonOut) {
           root.put("ONU address", onuStatus.onuAddress);
           root.put("ONU RX40 locked", onuStatus.rx40Locked);
@@ -275,8 +274,6 @@ class ProgramStatus : public Program
         }
       }
 
-
-
       /* PARAMETERS PER LINK */
       for (const auto& el : reportInfo.linkMap) {
         auto link = el.second;

src/Cru/CruBar.cxx

@@ -564,6 +564,13 @@ Cru::PacketMonitoringInfo CruBar::monitorPackets()
   return { linkPacketInfoMap, wrapperPacketInfoMap };
 }
 
+void CruBar::checkConfigParameters()
+{
+  if (mUserAndCommonLogicEnabled && !mUserLogicEnabled) {
+    BOOST_THROW_EXCEPTION(ParameterException() << ErrorInfo::Message("User and Common logic switch invalid when User logic disabled"));
+  }
+}
+
 /// Configures the CRU according to the parameters passed on init
 void CruBar::configure(bool force)
 {
@@ -587,6 +594,7 @@ void CruBar::configure(bool force)
     return;
   }
 
+  checkConfigParameters();
   log("Reconfiguring");
 
   Ttc ttc = Ttc(mPdaBar);
@@ -676,8 +684,8 @@ void CruBar::configure(bool force)
 
   /* UL + CL */
   if (mUserAndCommonLogicEnabled != reportInfo.userAndCommonLogicEnabled || force) {
-    log("Enabling User and Common Logic");
-    datapathWrapper.enableUserAndCommonLogic(mUserAndCommonLogicEnabled, mEndpoint);
+    log("Toggling User and Common Logic");
+    datapathWrapper.toggleUserAndCommonLogic(mUserAndCommonLogicEnabled, mEndpoint);
   }
 
   /* BSP */

src/Cru/CruBar.h

@@ -122,7 +122,7 @@ class CruBar final : public BarInterfaceBase
   void populateLinkMap(std::map<int, Link>& linkMap);
 
   uint32_t getDdgBurstLength();
-  //void checkParameters();
+  void checkConfigParameters();
 
   void setCruId(uint16_t cruId);
   uint16_t getCruId();

src/Cru/DatapathWrapper.cxx

@@ -284,7 +284,7 @@ uint32_t DatapathWrapper::getTriggerWindowSize(int wrapper)
   return mPdaBar->readRegister(address / 4);
 }
 
-void DatapathWrapper::enableUserAndCommonLogic(bool enable, int wrapper)
+void DatapathWrapper::toggleUserAndCommonLogic(bool enable, int wrapper)
 {
   uint32_t value = enable ? 0x1 : 0x0;
   uint32_t address = (wrapper == 0) ? Cru::Registers::DWRAPPER_BASE0.index : Cru::Registers::DWRAPPER_BASE1.index;

src/Cru/DatapathWrapper.h

@@ -54,7 +54,7 @@ class DatapathWrapper
   uint32_t getForcedPackets(Link link);
   void setTriggerWindowSize(int wrapper, uint32_t size = 1000);
   uint32_t getTriggerWindowSize(int wrapper);
-  void enableUserAndCommonLogic(bool enable, int wrapper);
+  void toggleUserAndCommonLogic(bool enable, int wrapper);
   bool getUserAndCommonLogicEnabled(int wrapper);
 
  private: