Skip to content

F
FMC ADC 100M 14b 4cha - Software
Commit bb1017c3 authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

TEMP dma debugging 

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent 43aa735f
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
kernel/fa-irq.c
View file @ bb1017c3
...@@ -81,7 +81,7 @@ int zfad_dma_start(struct zio_cset *cset) ...@@ -81,7 +81,7 @@ int zfad_dma_start(struct zio_cset *cset)
zfad_block[0].dev_mem_off = dev_mem_off; zfad_block[0].dev_mem_off = dev_mem_off;
} }
dev_dbg(&fa->fmc->dev, "Start DMA transfer\n"); dev_info(&fa->fmc->dev, "Start DMA transfer\n");
err = fa->carrier_op->dma_start(cset); err = fa->carrier_op->dma_start(cset);
if (err) if (err)
return err; return err;
...@@ -218,7 +218,7 @@ void zfat_irq_acq_end(struct zio_cset *cset) ...@@ -218,7 +218,7 @@ void zfat_irq_acq_end(struct zio_cset *cset)
{ {
struct fa_dev *fa = cset->zdev->priv_d; struct fa_dev *fa = cset->zdev->priv_d;
dev_dbg(&fa->fmc->dev, "Acquisition done\n"); dev_info(&fa->fmc->dev, "Acquisition done\n");
/* /*
* because the driver doesn't listen anymore trig-event * because the driver doesn't listen anymore trig-event
* we agreed that the HW will provide a dedicated register * we agreed that the HW will provide a dedicated register
......
kernel/fa-spec-dma.c
View file @ bb1017c3
...@@ -47,8 +47,10 @@ static int gncore_dma_fill(struct zio_dma_sg *zsg) ...@@ -47,8 +47,10 @@ static int gncore_dma_fill(struct zio_dma_sg *zsg)
} else { } else {
/* more transfers */ /* more transfers */
/* uint64_t so it works on 32 and 64 bit */ /* uint64_t so it works on 32 and 64 bit */
tmp = zsg->zsgt->dma_page_desc_pool; tmp = zsg->zsgt->page_desc_pool_dma_next;
tmp += (zsg->zsgt->page_desc_size * (zsg->page_idx + 1)); //tmp = zsg->zsgt->dma_page_desc_pool;
//tmp += (zsg->zsgt->page_desc_size * (zsg->page_idx + 1));
item->next_addr_l = ((uint64_t)tmp) & 0xFFFFFFFF; item->next_addr_l = ((uint64_t)tmp) & 0xFFFFFFFF;
item->next_addr_h = ((uint64_t)tmp) >> 32; item->next_addr_h = ((uint64_t)tmp) >> 32;
item->attribute = 0x1; /* more items */ item->attribute = 0x1; /* more items */
...@@ -122,9 +124,11 @@ int fa_spec_dma_start(struct zio_cset *cset) ...@@ -122,9 +124,11 @@ int fa_spec_dma_start(struct zio_cset *cset)
if (err) if (err)
goto out_map_sg; goto out_map_sg;
dev_dbg(&fa->fmc->dev, "Starting DMA\n");
/* Start DMA transfer */ /* Start DMA transfer */
fa_writel(fa, spec_data->fa_dma_base, fa_writel(fa, spec_data->fa_dma_base,
&fa_spec_regs[ZFA_DMA_CTL_START], 1); &fa_spec_regs[ZFA_DMA_CTL_START], 1);
dev_dbg(&fa->fmc->dev, "Started DMA\n");
return 0; return 0;
out_map_sg: out_map_sg:
......
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