added DMA status

Author: sy-c

doc/releaseNotes.md

@@ -27,3 +27,4 @@ This file describes the main feature changes for released versions of ReadoutCar
 
 ## next version
 - Added glitchCounter to roc-status (all output styles, including monitoring).
+- Added DMA status (enabled / disabled) to roc-status (all output styles, including monitoring).

src/CommandLineUtilities/ProgramStatus.cxx

@@ -198,6 +198,7 @@ class ProgramStatus : public Program
       std::string userLogic = (reportInfo.userLogicEnabled ? "Enabled" : "Disabled");
       std::string runStats = (reportInfo.runStatsEnabled ? "Enabled" : "Disabled");
       std::string userAndCommonLogic = (reportInfo.userAndCommonLogicEnabled ? "Enabled" : "Disabled");
+      std::string dmaStatus = reportInfo.dmaStatus ? "Enabled" : "Disabled";
 
       /* GENERAL PARAMETERS */
       if (mOptions.monitoring) {
@@ -210,6 +211,7 @@ class ProgramStatus : public Program
                            .addValue(reportInfo.runStatsEnabled, "runStats")
                            .addValue(reportInfo.userAndCommonLogicEnabled, "userAndCommonLogic")
                            .addValue(reportInfo.timeFrameLength, "timeFrameLength")
+                           .addValue(reportInfo.dmaStatus, "dmaStatus")
                            .addTag(tags::Key::SerialId, card.serialId.getSerial())
                            .addTag(tags::Key::Endpoint, card.serialId.getEndpoint())
                            .addTag(tags::Key::ID, card.sequenceId)
@@ -225,6 +227,7 @@ class ProgramStatus : public Program
         root.put("runStats", runStats);
         root.put("userAndCommonLogic", userAndCommonLogic);
         root.put("timeFrameLength", reportInfo.timeFrameLength);
+        root.put("dmaStatus", dmaStatus);
       } else {
         std::cout << "-----------------------------" << std::endl;
         std::cout << "CRU ID: " << reportInfo.cruId << std::endl;
@@ -239,6 +242,7 @@ class ProgramStatus : public Program
         if (reportInfo.runStatsEnabled) {
           std::cout << "Run statistics enabled" << std::endl;
         }
+         std::cout << "DMA: "<< dmaStatus << std::endl;
       }
 
       /* ONU PARAMETERS */

src/Cru/Common.h

@@ -116,6 +116,7 @@ struct ReportInfo {
   bool runStatsEnabled;
   bool userAndCommonLogicEnabled;
   uint16_t timeFrameLength;
+  bool dmaStatus;
 };
 
 struct OnuStickyStatus {

src/Cru/CruBar.cxx

@@ -406,6 +406,12 @@ uint32_t CruBar::getPonStatusRegister()
   return readRegister((Cru::Registers::ONU_USER_LOGIC.address + 0x0c) / 4);
 }
 
+bool CruBar::getDmaStatus()
+{
+  mPdaBar->assertBarIndex(2, "Can only get DMA status register from BAR 2");
+  return readRegister(Cru::Registers::BSP_USER_CONTROL.index) & 0x1; // DMA enabled = bit 0
+}
+
 uint32_t CruBar::getOnuAddress()
 {
   mPdaBar->assertBarIndex(2, "Can only get PON status register from BAR 2");
@@ -545,6 +551,8 @@ Cru::ReportInfo CruBar::report(bool forConfig)
   bool userAndCommonLogicEnabled = datapathWrapper.getUserAndCommonLogicEnabled(mEndpoint);
   uint16_t timeFrameLength = getTimeFrameLength();
 
+  bool dmaStatus = getDmaStatus();
+
   Cru::ReportInfo reportInfo = {
     linkMap,
     clock,
@@ -558,7 +566,8 @@ Cru::ReportInfo CruBar::report(bool forConfig)
     userLogicEnabled,
     runStatsEnabled,
     userAndCommonLogicEnabled,
-    timeFrameLength
+    timeFrameLength,
+    dmaStatus
   };
 
   return reportInfo;

src/Cru/CruBar.h

@@ -135,6 +135,7 @@ class CruBar final : public BarInterfaceBase
   uint32_t getFpgaChipLow();
   uint32_t getPonStatusRegister();
   uint32_t getOnuAddress();
+  bool getDmaStatus();
   bool checkPonUpstreamStatusExpected(uint32_t ponUpstreamRegister, uint32_t onuAddress);
   bool checkClockConsistent(std::map<int, Link> linkMap);
   void populateLinkMap(std::map<int, Link>& linkMap);