[cru] Get effective superpage size from the firmware

Author: kostorr

src/Cru/Constants.h

@@ -45,7 +45,7 @@ namespace Registers
 /// * bit 0: Flow control
 static constexpr Register DMA_CONTROL(0x00000200);
 
-/// Interval for link BAR addresses
+/// Link interval for superpage addresses to push
 static constexpr uintptr_t LINK_INTERVAL = 0x10;
 
 /// High address of superpage
@@ -55,13 +55,16 @@ static constexpr IntervalRegister LINK_SUPERPAGE_ADDRESS_HIGH(0x00000204, LINK_I
 static constexpr IntervalRegister LINK_SUPERPAGE_ADDRESS_LOW(0x00000208, LINK_INTERVAL);
 
 /// Size of the superpage in 8KiB pages
-static constexpr IntervalRegister LINK_SUPERPAGE_SIZE(0x0000020c, LINK_INTERVAL);
+static constexpr IntervalRegister LINK_SUPERPAGE_PAGES(0x0000020c, LINK_INTERVAL);
 
-/// Interval for SUPERPAGES_PUSHED addresses
-static constexpr uintptr_t SUPERPAGES_PUSHED_INTERVAL = 0x4;
+/// Link interval for superpage ready addresses
+static constexpr uintptr_t SUPERPAGES_READY_INTERVAL = 0x4;
 
-/// Amount of completely pushed superpages
-static constexpr IntervalRegister LINK_SUPERPAGES_PUSHED(0x00000800, SUPERPAGES_PUSHED_INTERVAL);
+/// Amount of ready superpages
+static constexpr IntervalRegister LINK_SUPERPAGE_COUNT(0x00000800, SUPERPAGES_READY_INTERVAL);
+
+// FIFO containing the size of the ready superpages
+static constexpr IntervalRegister LINK_SUPERPAGE_SIZE(0x00000840, SUPERPAGES_READY_INTERVAL);
 
 /// Enable/disable links
 /// Every bit represents a link. Set a bit to 0 to disable a link.

src/Cru/CruBar.cxx

@@ -117,14 +117,24 @@ void CruBar::pushSuperpageDescriptor(uint32_t link, uint32_t pages, uintptr_t bu
   writeRegister(Cru::Registers::LINK_SUPERPAGE_ADDRESS_LOW.get(link).index,
                 Utilities::getLower32Bits(busAddress));
   // Set superpage size. This write signals the push of the descriptor into the link's FIFO.
-  writeRegister(Cru::Registers::LINK_SUPERPAGE_SIZE.get(link).index, pages);
+  writeRegister(Cru::Registers::LINK_SUPERPAGE_PAGES.get(link).index, pages);
 }
 
 /// Get amount of superpages pushed by a link
 /// \param link Link number
 uint32_t CruBar::getSuperpageCount(uint32_t link)
 {
-  return readRegister(Cru::Registers::LINK_SUPERPAGES_PUSHED.get(link).index);
+  return readRegister(Cru::Registers::LINK_SUPERPAGE_COUNT.get(link).index);
+}
+
+uint32_t CruBar::getSuperpageSize(uint32_t link)
+{
+  writeRegister(Cru::Registers::LINK_SUPERPAGE_SIZE.get(link).index, 0xbadcafe); // write a dummy value to update the FIFO
+  uint32_t superpageSizeFifo = readRegister(Cru::Registers::LINK_SUPERPAGE_SIZE.get(link).index);
+  uint32_t superpageSize = Utilities::getBits(superpageSizeFifo, 0, 23); // [0-23] -> superpage size (in bytes)
+  //uint32_t superpageIndex = Utilities::getBits(superpageSizeFifo, 24, 31); // [24-31] -> superpage index (0-255) for _testing_
+
+  return superpageSize;
 }
 
 /// Enables the data emulator

src/Cru/CruBar.h

@@ -64,6 +64,7 @@ class CruBar final : public BarInterfaceBase
 
   void pushSuperpageDescriptor(uint32_t link, uint32_t pages, uintptr_t busAddress);
   uint32_t getSuperpageCount(uint32_t link);
+  uint32_t getSuperpageSize(uint32_t link);
   void setDataEmulatorEnabled(bool enabled);
   void resetDataGeneratorCounter();
   void resetCard();

src/Cru/CruDmaChannel.cxx

@@ -275,7 +275,12 @@ void CruDmaChannel::transferSuperpageFromLinkToReady(Link& link)
   }
 
   link.queue.front().setReady(true);
-  link.queue.front().setReceived(link.queue.front().getSize()); //TODO: Update this with the effective superpage size when available
+  uint32_t superpageSize = getBar()->getSuperpageSize(link.id);
+  if (superpageSize == 0) {                                       //backwards compatible in case the superpage size register is empty
+    link.queue.front().setReceived(link.queue.front().getSize()); // force the full superpage size
+  } else {
+    link.queue.front().setReceived(getBar()->getSuperpageSize(link.id));
+  }
   mReadyQueue.push_back(link.queue.front());
   link.queue.pop_front();
   link.superpageCounter++;
@@ -285,8 +290,8 @@ void CruDmaChannel::transferSuperpageFromLinkToReady(Link& link)
 void CruDmaChannel::fillSuperpages()
 {
   // Check for arrivals & handle them
-  const auto size = mLinks.size();
-  for (LinkIndex linkIndex = 0; linkIndex < size; ++linkIndex) {
+  const auto links = mLinks.size();
+  for (LinkIndex linkIndex = 0; linkIndex < links; ++linkIndex) {
     auto& link = mLinks[linkIndex];
     uint32_t superpageCount = getBar()->getSuperpageCount(link.id);
     auto available = superpageCount > link.superpageCounter;

src/Cru/cru_constants_populate.py

@@ -7,8 +7,8 @@
 'add_pcie_dma_ctrl':'DMA_CONTROL',
 'add_pcie_dma_desc_h':'LINK_SUPERPAGE_ADDRESS_HIGH',
 'add_pcie_dma_desc_l':'LINK_SUPERPAGE_ADDRESS_LOW',
-'add_pcie_dma_desc_sz':'LINK_SUPERPAGE_SIZE',
-'add_pcie_dma_spg0_ack':'LINK_SUPERPAGES_PUSHED',
+'add_pcie_dma_desc_sz':'LINK_SUPERPAGE_PAGES',
+'add_pcie_dma_spg0_ack':'LINK_SUPERPAGES_COUNT',
 'add_pcie_dma_ddg_cfg0':'DATA_GENERATOR_CONTROL',
 'add_pcie_dma_ddg_cfg2':'DATA_GENERATOR_INJECT_ERROR',
 'add_pcie_dma_data_sel':'DATA_SOURCE_SELECT',