drv: move out HW_BUSY flag set|get and use ZIO API

the HW_BUSY flag must be cleared before doing data_done in order to hold only during DMA. Signed-off-by: Federico Vaga <federico.vaga@cern.ch>

drv: move out HW_BUSY flag set|get and use ZIO API
the HW_BUSY flag must be cleared before doing data_done in order to hold only during DMA. Signed-off-by: Federico Vaga <federico.vaga@cern.ch>
e9567174 · Federico Vaga · 31d98b13 · e9567174 · e9567174
Commit e9567174 authored Aug 15, 2018 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 8 deletions

ft-irq.c kernel/ft-irq.c +2 -0

ft-zio.c kernel/ft-zio.c +0 -8

No files found.
--- a/kernel/ft-irq.c
+++ b/kernel/ft-irq.c
@@ -212,8 +212,10 @@ static void ft_readout_dma_start(struct fmctdc_dev *ft, int channel)
 	while (total > 0) {
 		cset->ti->nsamples  = min((unsigned long)total,
 					  KMALLOC_MAX_SIZE);
+		zio_cset_busy_set(cset, 1);
 		zio_arm_trigger(cset->ti); /* actually a fire */
 		ft_readout_dma_run(cset, base_cur, count, cset->ti->nsamples);
+		zio_cset_busy_clear(cset, 1);
 		zio_trigger_data_done(cset);
 		count += cset->ti->nsamples;

--- a/kernel/ft-zio.c
+++ b/kernel/ft-zio.c
@@ -186,12 +186,6 @@ static int ft_zio_conf_channel(struct device *dev, struct zio_attribute *zattr,
 */
 static int ft_zio_input(struct zio_cset *cset)
 {
-	unsigned long flags;
-	spin_lock_irqsave(&cset->lock, flags);
-	cset->flags |= ZIO_CSET_HW_BUSY;
-	spin_unlock_irqrestore(&cset->lock, flags);
 	return -EAGAIN;
 }
@@ -541,8 +535,6 @@ static int ft_trig_data_done(struct zio_cset *cset)
 out:
 	ret = zio_generic_data_done(cset);
-	cset->flags &= ~ZIO_CSET_HW_BUSY;
 	return ret;
 }