]> www.infradead.org Git - users/jedix/linux-maple.git/commit
nvme: do not restart the request timeout if we're resetting the controller
authorKeith Busch <keith.busch@intel.com>
Thu, 26 Nov 2015 11:11:07 +0000 (12:11 +0100)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 1 Jun 2017 20:40:45 +0000 (13:40 -0700)
commitbe6c16ceaa10f8658535382bff1b8320f6866009
tree13998d9e34d44dad927edee43617b28f7fd3e341
parentaa78ebe177d849b2524b3600bed07f0a5915ce94
nvme: do not restart the request timeout if we're resetting the controller

Otherwise we're never going to complete a command when it is restarted just
after we completed all other outstanding commands in nvme_clear_queue.

The controller must be disabled prior to completing a presumed lost
command, do this by directly shutting down the controller before
queueing the reset work, and return EH_HANDLED from the timeout handler
after we shut the controller down.

Signed-off-by: Keith Busch <keith.busch@intel.com>
[hch: split and rebase]
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
(cherry picked from commit e1569a16180aef4311ff5fc54f54b23ae9e8a03e)

Orabug: 25130845

Signed-off-by: Ashok Vairavan <ashok.vairavan@oracle.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/nvme/host/pci.c