Don't disable Rx DMA when stopping stream.

myriadrf · Sep 11, 2024 · 62d0a53 · 62d0a53
1 parent bb9d640
commit 62d0a53
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/comms/PCIe/linux-kernel-module/limepcie.c b/src/comms/PCIe/linux-kernel-module/limepcie.c
@@ -442,6 +442,7 @@ static void limepcie_dma_stop(struct limepcie_dma *dma)
  dma_dir_str(dma->direction),
  transfersDone);
  dma->enabled = false;
+ dma->transferCounter = 0;
  wake_up_interruptible(&dma->wait_transfer);
 }
 

diff --git a/src/streaming/TRXLooper.cpp b/src/streaming/TRXLooper.cpp
@@ -214,13 +214,11 @@ void TRXLooper::Stop()
  return;
  lime::debug("TRXLooper::Stop()");
  mStreamEnabled = false;
- fpga->StopStreaming();
 
  // wait for loop ends
  if (mRx.stage.load(std::memory_order_relaxed) == Stream::ReadyStage::Active)
  {
  mRx.terminate.store(true, std::memory_order_relaxed);
- mRxArgs.dma->Enable(false);
  lime::debug("TRXLooper: wait for Rx loop end.");
  {
  std::unique_lock lck{ mRx.mutex };
@@ -268,6 +266,11 @@ void TRXLooper::Stop()
  }
  }
 
+ // Disable FPGA streaming only after data transfer threads finish work.
+ // Becase stream disable halts DMA, and threads could get stuck waiting for interrupt
+ // of the next data batch.
+ fpga->StopStreaming();
+
  if (mRx.stagingPacket != nullptr)
  {
  mRx.memPool->Free(mRx.stagingPacket);

diff --git a/tests/streaming/streaming.cpp b/tests/streaming/streaming.cpp
@@ -134,7 +134,7 @@ TEST_F(SDRDevice_streaming, RepeatedStartStopWorks)
  samplesGot = device->StreamRx(moduleIndex, rxSamples, toRead, &rxMeta);
  if (firstRead)
  {
- EXPECT_TRUE(rxMeta.timestamp == 0);
+ EXPECT_EQ(rxMeta.timestamp, 0);
  firstRead = false;
  }
 
@@ -144,7 +144,7 @@ TEST_F(SDRDevice_streaming, RepeatedStartStopWorks)
  break;
  samplesReceived += samplesGot;
  samplesRemaining -= toRead;
- EXPECT_TRUE(rxMeta.timestamp >= lastTimestamp);
+ EXPECT_GE(rxMeta.timestamp, lastTimestamp);
  lastTimestamp = rxMeta.timestamp;
  }
 
@@ -165,7 +165,7 @@ TEST_F(SDRDevice_streaming, RepeatedStartStopWorks)
  samplesGot = device->StreamRx(moduleIndex, rxSamples, toRead, &rxMeta);
  if (firstRead)
  {
- EXPECT_TRUE(rxMeta.timestamp == 0);
+ EXPECT_EQ(rxMeta.timestamp, 0);
  firstRead = false;
  }
 
@@ -175,7 +175,7 @@ TEST_F(SDRDevice_streaming, RepeatedStartStopWorks)
  break;
  samplesReceived += samplesGot;
  samplesRemaining -= toRead;
- EXPECT_TRUE(rxMeta.timestamp >= lastTimestamp);
+ EXPECT_GE(rxMeta.timestamp, lastTimestamp);
  lastTimestamp = rxMeta.timestamp;
  }
  ASSERT_EQ(samplesRemaining, 0);