Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3289eb9 authored by Dave Jiang's avatar Dave Jiang Committed by Greg Kroah-Hartman
Browse files

dmaengine: ioat: stop mod_timer from resurrecting deleted timer in __cleanup() 



[ Upstream commit 898ec89dbb55b8294695ad71694a0684e62b2a73 ]

User reports observing timer event report channel halted but no error
observed in CHANERR register. The driver finished self-test and released
channel resources. Debug shows that __cleanup() can call
mod_timer() after the timer has been deleted and thus resurrect the
timer. While harmless, it causes suprious error message to be emitted.
Use mod_timer_pending() call to prevent deleted timer from being
resurrected.

Fixes: 3372de58 ("dmaengine: ioatdma: removal of dma_v3.c and relevant ioat3 references")
Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
Link: https://lore.kernel.org/r/166360672197.3851724.17040290563764838369.stgit@djiang5-desk3.ch.intel.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent cb6aaef0

drivers/dma/ioat/dma.c

+3 −3
Original line number Diff line number Diff line
@@ -653,7 +653,7 @@ static void __cleanup(struct ioatdma_chan *ioat_chan, dma_addr_t phys_complete) 
	if (active - i == 0) {

		dev_dbg(to_dev(ioat_chan), "%s: cancel completion timeout\n",

			__func__);

		mod_timer(&ioat_chan->timer, jiffies + IDLE_TIMEOUT);

		mod_timer_pending(&ioat_chan->timer, jiffies + IDLE_TIMEOUT);

	}



	/* microsecond delay by sysfs variable  per pending descriptor */
@@ -679,7 +679,7 @@ static void ioat_cleanup(struct ioatdma_chan *ioat_chan) 


		if (chanerr &

		    (IOAT_CHANERR_HANDLE_MASK | IOAT_CHANERR_RECOVER_MASK)) {

			mod_timer(&ioat_chan->timer, jiffies + IDLE_TIMEOUT);

			mod_timer_pending(&ioat_chan->timer, jiffies + IDLE_TIMEOUT);

			ioat_eh(ioat_chan);

		}

	}
@@ -876,7 +876,7 @@ static void check_active(struct ioatdma_chan *ioat_chan) 
	}



	if (test_and_clear_bit(IOAT_CHAN_ACTIVE, &ioat_chan->state))

		mod_timer(&ioat_chan->timer, jiffies + IDLE_TIMEOUT);

		mod_timer_pending(&ioat_chan->timer, jiffies + IDLE_TIMEOUT);

}



void ioat_timer_event(struct timer_list *t)