dmaengine: ioat: stop mod_timer from resurrecting deleted timer in __cleanup()
[ Upstream commit898ec89dbb
] 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:3372de5813
("dmaengine: ioatdma: removal of dma_v3.c and relevant ioat3 references") Signed-off-by: Dave Jiang <dave.jiang@intel.com> Link: https://lore.kernel.org/r/166360672197.3851724.17040290563764838369.stgit@djiang5-desk3.ch.intel.com Signed-off-by: Vinod Koul <vkoul@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
2a853c206e
commit
fad8b6b567
|
@ -656,7 +656,7 @@ static void __cleanup(struct ioatdma_chan *ioat_chan, dma_addr_t phys_complete)
|
||||||
if (active - i == 0) {
|
if (active - i == 0) {
|
||||||
dev_dbg(to_dev(ioat_chan), "%s: cancel completion timeout\n",
|
dev_dbg(to_dev(ioat_chan), "%s: cancel completion timeout\n",
|
||||||
__func__);
|
__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 */
|
/* microsecond delay by sysfs variable per pending descriptor */
|
||||||
|
@ -682,7 +682,7 @@ static void ioat_cleanup(struct ioatdma_chan *ioat_chan)
|
||||||
|
|
||||||
if (chanerr &
|
if (chanerr &
|
||||||
(IOAT_CHANERR_HANDLE_MASK | IOAT_CHANERR_RECOVER_MASK)) {
|
(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);
|
ioat_eh(ioat_chan);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -879,7 +879,7 @@ static void check_active(struct ioatdma_chan *ioat_chan)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (test_and_clear_bit(IOAT_CHAN_ACTIVE, &ioat_chan->state))
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void ioat_reboot_chan(struct ioatdma_chan *ioat_chan)
|
static void ioat_reboot_chan(struct ioatdma_chan *ioat_chan)
|
||||||
|
|
Loading…
Reference in New Issue