Skip to content

F
FMC TDC 1ns 5cha - Software
Commit 8f269c14 authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

drv: fix DMA wait helper

parent 4fd46dd3
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
kernel/fmc-tdc.h
View file @ 8f269c14
......@@ -360,13 +360,15 @@ static inline enum gncore_dma_status gn4124_dma_wait_done(struct fmctdc_dev *ft,
tmp = dma_readl(ft, GENNUM_DMA_STA);
switch (tmp & GENUM_DMA_STA_MASK) {
case GENNUM_DMA_STA_ERROR:
case GENNUM_DMA_STA_ABORT:
dev_err(&ft->fmc->dev, "DMA problem: 0x%x", tmp);
case GENNUM_DMA_STA_ABORT:
case GENNUM_DMA_STA_DONE:
return tmp;
default:
if (time_after(jiffies, timeout))
if (time_after(jiffies, timeout)) {
dev_err(&ft->fmc->dev, "DMA timeout: 0x%x", tmp);
gn4124_dma_abort(ft);
}
cpu_relax();
break;
}
......
kernel/ft-core.c
View file @ 8f269c14
......@@ -496,6 +496,7 @@ int test_dma(struct fmctdc_dev *ft, unsigned int buf_size, unsigned int use_sg)
if (ret < 0)
goto out_fail_r;
ret = 0;
/* Validate */
for (i = 0; i < buf_size; i++) {
dev_vdbg(&ft->fmc->dev, "%d 0x%02x 0x%02x\n",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment