Commit ebef7368 authored by Keith Busch's avatar Keith Busch Committed by Jens Axboe
Browse files

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: 82b057ca ("nvme-pci: fix multiple ctrl removal scheduling")
Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 3c2bfbaa

drivers/nvme/host/pci.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -1805,7 +1805,8 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown) 
	if (pci_is_enabled(pdev)) {

	if (pci_is_enabled(pdev)) {

		u32 csts = readl(dev->bar + NVME_REG_CSTS);

		u32 csts = readl(dev->bar + NVME_REG_CSTS);





		if (dev->ctrl.state == NVME_CTRL_LIVE)

		if (dev->ctrl.state == NVME_CTRL_LIVE ||

		    dev->ctrl.state == NVME_CTRL_RESETTING)

			nvme_start_freeze(&dev->ctrl);

			nvme_start_freeze(&dev->ctrl);

		dead = !!((csts & NVME_CSTS_CFS) || !(csts & NVME_CSTS_RDY) ||

		dead = !!((csts & NVME_CSTS_CFS) || !(csts & NVME_CSTS_RDY) ||

			pdev->error_state  != pci_channel_io_normal);

			pdev->error_state  != pci_channel_io_normal);

CRA Git | Maintained and supported by SUSTech CRA and CCSE