feat: remove cyclic flag, enable err irq

MicroTCA-Tech-Lab · May 30, 2024 · 8962c79 · 8962c79
1 parent 254c178
commit 8962c79
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/src/UioAxiDmaIf.cpp b/src/UioAxiDmaIf.cpp
@@ -12,6 +12,7 @@
 #include "udmaio/UioAxiDmaIf.hpp"
 
 #include <ios>
+#include <stdexcept>
 
 namespace udmaio {
 
@@ -32,8 +33,9 @@ void UioAxiDmaIf::start(uintptr_t start_desc) {
  << "DMA ctrl = 0x" << std::hex << reg_to_raw(ctrl_reg) << std::dec;
 
  ctrl_reg.rs = 1;
- ctrl_reg.cyclic_bd_enable = 1;
+ ctrl_reg.cyclic_bd_enable = 0;
  ctrl_reg.ioc_irq_en = 1;
+ ctrl_reg.err_irq_en = 1;
 
  // 3.
  s2mm_dmacr.wr(ctrl_reg);
@@ -52,9 +54,18 @@ void UioAxiDmaIf::start(uintptr_t start_desc) {
 uint32_t UioAxiDmaIf::clear_interrupt() {
  uint32_t irq_count = wait_for_interrupt();
 
- s2mm_dmasr.wr({.ioc_irq = 1});
+ auto stat = s2mm_dmasr.rd();
+ if (stat.ioc_irq) {
+ BOOST_LOG_SEV(_lg, bls::trace) << "I/O IRQ";
+ }
+ if (stat.err_irq) {
+ BOOST_LOG_SEV(_lg, bls::warning) << "ERR IRQ";
+ if (check_for_errors()) {
+ throw std::runtime_error("DMA engine error raised");
+ }
+ }
+ s2mm_dmasr.wr({.ioc_irq = stat.ioc_irq, .err_irq = stat.err_irq});
 
- BOOST_LOG_SEV(_lg, bls::trace) << "clear interrupt";
  return irq_count;
 }