diff options
| author | Keith Busch | 2019-04-30 17:33:41 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-06-15 11:54:06 +0200 |
| commit | 6ce2ad24ae9c3f88692fbbe0d8223133c67b2aac (patch) | |
| tree | 68951f4ce1d7456d7f7696b222db6f22e224dac6 /drivers/nvme | |
| parent | PCI: designware-ep: Use aligned ATU window for raising MSI interrupts (diff) | |
| download | kernel-qcow2-linux-6ce2ad24ae9c3f88692fbbe0d8223133c67b2aac.tar.gz kernel-qcow2-linux-6ce2ad24ae9c3f88692fbbe0d8223133c67b2aac.tar.xz kernel-qcow2-linux-6ce2ad24ae9c3f88692fbbe0d8223133c67b2aac.zip | |
nvme-pci: unquiesce admin queue on shutdown
[ Upstream commit c8e9e9b7646ebe1c5066ddc420d7630876277eb4 ]
Just like IO queues, the admin queue also will not be restarted after a
controller shutdown. Unquiesce this queue so that we do not block
request dispatch on a permanently disabled controller.
Reported-by: Yufen Yu <yuyufen@huawei.com>
Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/pci.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 7b9ef8e734e7..377f6fff420d 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -2187,8 +2187,11 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown) * must flush all entered requests to their failed completion to avoid * deadlocking blk-mq hot-cpu notifier. */ - if (shutdown) + if (shutdown) { nvme_start_queues(&dev->ctrl); + if (dev->ctrl.admin_q && !blk_queue_dying(dev->ctrl.admin_q)) + blk_mq_unquiesce_queue(dev->ctrl.admin_q); + } mutex_unlock(&dev->shutdown_lock); } |