]> www.infradead.org Git - users/jedix/linux-maple.git/commit
nvme/pci: Fix stuck nvme reset
authorKeith Busch <keith.busch@intel.com>
Tue, 27 Jun 2017 23:44:05 +0000 (17:44 -0600)
committerBrian Maly <brian.maly@oracle.com>
Mon, 23 Apr 2018 20:17:36 +0000 (16:17 -0400)
commit841d7b0fe574be6d58feab05ec3b234d4bf138f6
tree1701bc2f94d69318d1c1ddd06d8945d1c9784aab
parentabd783c8ac73917bd34fc263bb0309574fa9c896
nvme/pci: Fix stuck nvme reset

The controller state is set to resetting prior to disabling the
controller, so this patch accounts for that state when deciding if it
needs to freeze the queues. Without this, an 'nvme reset /dev/nvme0'
blocks forever because the queues were never frozen.

Fixes: 82b057caefaf ("nvme-pci: fix multiple ctrl removal scheduling")
Signed-off-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
(cherry picked from ebef7368571d88f0f80b817e6898075c62265b4e)
Orabug: 27892359

Reviewed-by: Thomas Tai <thomas.tai@oracle.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Jianchao Wang <jianchao.w.wang@oracle.com>
Signed-off-by: Brian Maly <brian.maly@oracle.com>
drivers/nvme/host/pci.c