diff options
| author | Asai Thambi S P | 2013-01-11 14:16:04 +0100 |
|---|---|---|
| committer | Jens Axboe | 2013-01-11 14:35:55 +0100 |
| commit | 47cd4b3c7e80cc8d5ac82930c5af835870b5aba1 (patch) | |
| tree | 259f9754916aa8f29c969a330eece233ae95592e /drivers/block/mtip32xx | |
| parent | Merge branch 'stable/for-jens-3.8' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| download | kernel-qcow2-linux-47cd4b3c7e80cc8d5ac82930c5af835870b5aba1.tar.gz kernel-qcow2-linux-47cd4b3c7e80cc8d5ac82930c5af835870b5aba1.tar.xz kernel-qcow2-linux-47cd4b3c7e80cc8d5ac82930c5af835870b5aba1.zip | |
mtip32xx: fix for driver hang after a command timeout
If an I/O command times out when a PIO command is active,
MTIP_PF_EH_ACTIVE_BIT is not cleared. This results in I/O
hang in the driver. Fix is to clear this bit.
Signed-off-by: Asai Thambi S P <asamymuthupa@micron.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block/mtip32xx')
| -rw-r--r-- | drivers/block/mtip32xx/mtip32xx.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c index 9694dd99bbbc..b93282019632 100644 --- a/drivers/block/mtip32xx/mtip32xx.c +++ b/drivers/block/mtip32xx/mtip32xx.c @@ -626,12 +626,13 @@ static void mtip_timeout_function(unsigned long int data) } } - if (cmdto_cnt && !test_bit(MTIP_PF_IC_ACTIVE_BIT, &port->flags)) { + if (cmdto_cnt) { print_tags(port->dd, "timed out", tagaccum, cmdto_cnt); - - mtip_restart_port(port); + if (!test_bit(MTIP_PF_IC_ACTIVE_BIT, &port->flags)) { + mtip_restart_port(port); + wake_up_interruptible(&port->svc_wait); + } clear_bit(MTIP_PF_EH_ACTIVE_BIT, &port->flags); - wake_up_interruptible(&port->svc_wait); } if (port->ic_pause_timer) { |