[cru] Add GBT MUX UL option

Author: kostorr

README.md

@@ -151,7 +151,7 @@ The Parameters that affect the configuration of the CRU, their possible values (
 
 `GbtMode (GBT | WB) [GBT]`
 
-`GbtMux (TTC | DDG | SWT | TTCUP) [TTC]`
+`GbtMux (TTC | DDG | SWT | TTCUP |UL) [TTC]`
 
 `LinkLoopbackEnabled (true | false) [false]`
 

cru_template.cfg

@@ -69,7 +69,7 @@ systemId=0xfd
 # [true | false]
 enabled=true
 
-# [TTC | DDG | SWT | TTCUP]
+# [TTC | DDG | SWT | TTCUP | UL]
 gbtMux=TTC
 
 # 16-bit FEE ID

include/ReadoutCard/Cru.h

@@ -38,6 +38,7 @@ static constexpr uint32_t GBT_MUX_TTC(0x0);
 static constexpr uint32_t GBT_MUX_DDG(0x1);
 static constexpr uint32_t GBT_MUX_SWT(0x2);
 static constexpr uint32_t GBT_MUX_TTCUP(0x3);
+static constexpr uint32_t GBT_MUX_UL(0x4);
 
 static constexpr uint32_t GBT_MODE_GBT(0x0);
 static constexpr uint32_t GBT_MODE_WB(0x1);

include/ReadoutCard/ParameterTypes/GbtMux.h

@@ -31,6 +31,7 @@ struct GbtMux {
     Ddg = Cru::GBT_MUX_DDG,
     Swt = Cru::GBT_MUX_SWT,
     TtcUp = Cru::GBT_MUX_TTCUP,
+    Ul = Cru::GBT_MUX_UL,
     Na = -1,
   };
 

src/CommandLineUtilities/ProgramConfig.cxx

@@ -65,7 +65,7 @@ class ProgramConfig : public Program
                           "GBT MODE [GBT, WB]");
     options.add_options()("gbtmux",
                           po::value<std::string>(&mOptions.gbtMux)->default_value("TTC"),
-                          "GBT MUX [TTC, DDG, SWT, TTCUP]");
+                          "GBT MUX [TTC, DDG, SWT, TTCUP, UL]");
     options.add_options()("links",
                           po::value<std::string>(&mOptions.links)->default_value("0"),
                           "Links to enable");

src/Cru/Gbt.cxx

@@ -37,10 +37,10 @@ void Gbt::setMux(int index, uint32_t mux)
   if (mEndpoint == 1) {
     index += 12;
   }
-  uint32_t reg = index / 16;
-  uint32_t bitOffset = (index % 16) * 2;
+  uint32_t reg = index / 8;
+  uint32_t bitOffset = (index % 8) * 4;
   uint32_t address = Cru::Registers::GBT_MUX_SELECT.address + (reg * 4);
-  mPdaBar->modifyRegister(address / 4, bitOffset, 2, mux);
+  mPdaBar->modifyRegister(address / 4, bitOffset, 4, mux);
 }
 
 void Gbt::setInternalDataGenerator(Link link, uint32_t value)
@@ -111,10 +111,10 @@ void Gbt::getGbtMuxes()
       index += 12;
     }
     auto& link = el.second;
-    uint32_t reg = (index / 16);
-    uint32_t bitOffset = (index % 16) * 2;
+    uint32_t reg = (index / 8);
+    uint32_t bitOffset = (index % 8) * 4;
     uint32_t txMux = mPdaBar->readRegister((Cru::Registers::GBT_MUX_SELECT.address + reg * 4) / 4);
-    txMux = (txMux >> bitOffset) & 0x3;
+    txMux = (txMux >> bitOffset) & 0xf;
     if (txMux == Cru::GBT_MUX_TTC) {
       link.gbtMux = GbtMux::type::Ttc;
     } else if (txMux == Cru::GBT_MUX_DDG) {
@@ -123,6 +123,8 @@ void Gbt::getGbtMuxes()
       link.gbtMux = GbtMux::type::Swt;
     } else if (txMux == Cru::GBT_MUX_TTCUP) {
       link.gbtMux = GbtMux::type::TtcUp;
+    } else if (txMux == Cru::GBT_MUX_UL) {
+      link.gbtMux = GbtMux::type::Ul;
     } else {
       link.gbtMux = GbtMux::type::Na;
     }

src/ParameterTypes/GbtMux.cxx

@@ -28,6 +28,7 @@ static const auto converter = Utilities::makeEnumConverter<GbtMux::type>("GbtMux
                                                                                      { GbtMux::Ddg, "DDG" },
                                                                                      { GbtMux::Swt, "SWT" },
                                                                                      { GbtMux::TtcUp, "TTCUP" },
+                                                                                     { GbtMux::Ul, "UL" },
                                                                                      { GbtMux::Na, "N/A" },
                                                                                    });