Skip to content

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

zio: update to new master 

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent 14326f81
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
kernel/fa-irq.c
View file @ a554f0f6
......@@ -272,10 +272,10 @@ static void fa_irq_work(struct work_struct *work)
zfad_dma_done(cset);
}
/*
* Lower CSET_BUSY
* Lower CSET_HW_BUSY
*/
spin_lock(&cset->lock);
cset->flags &= ~ZIO_CSET_BUSY;
cset->flags &= ~ZIO_CSET_HW_BUSY;
spin_unlock(&cset->lock);
if (res) {
......@@ -360,9 +360,9 @@ irqreturn_t fa_irq_handler(int irq_core_base, void *dev_id)
/* has deleted zio blocks. In such a case */
/* the flag is not raised and nothing is done */
if (zfad_block != NULL)
cset->flags |= ZIO_CSET_BUSY;
cset->flags |= ZIO_CSET_HW_BUSY;
spin_unlock_irqrestore(&cset->lock, flags);
if (cset->flags & ZIO_CSET_BUSY) {
if (cset->flags & ZIO_CSET_HW_BUSY) {
/* Job deferred to the workqueue: */
/* Start DMA and ack irq on the carrier */
queue_work(fa_workqueue, &fa->irq_work);
......
kernel/fa-spec-irq.c
View file @ a554f0f6
......@@ -95,7 +95,7 @@ irqreturn_t fa_spec_irq_handler(int irq_core_base, void *ptr)
* we can safely lower CSET_BUSY
*/
spin_lock(&cset->lock);
cset->flags &= ~ZIO_CSET_BUSY;
cset->flags &= ~ZIO_CSET_HW_BUSY;
spin_unlock(&cset->lock);
/* ack the irq */
......
zio @ 5c28b4a3
Subproject commit 66c61d45e4aafa524730c979ce08d242007da59d
Subproject commit 5c28b4a38ca5eb9e5038d55fc66ca90a257b195a
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