Commit e43269e6 authored by Keith Busch's avatar Keith Busch
Browse files

nvme-pci: Fix controller freeze wait disabling 



If a controller disabling didn't start a freeze, don't wait for the
operation to complete.

Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
parent a6a4b66b

drivers/nvme/host/pci.c

+6 −6
Original line number Diff line number Diff line
@@ -2376,7 +2376,7 @@ static void nvme_pci_disable(struct nvme_dev *dev) 


static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown)

{

	bool dead = true;

	bool dead = true, freeze = false;

	struct pci_dev *pdev = to_pci_dev(dev->dev);



	mutex_lock(&dev->shutdown_lock);
@@ -2384,8 +2384,10 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown) 
		u32 csts = readl(dev->bar + NVME_REG_CSTS);



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

		    dev->ctrl.state == NVME_CTRL_RESETTING)

		    dev->ctrl.state == NVME_CTRL_RESETTING) {

			freeze = true;

			nvme_start_freeze(&dev->ctrl);

		}

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

			pdev->error_state  != pci_channel_io_normal);

	}
@@ -2394,10 +2396,8 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown) 
	 * Give the controller a chance to complete all entered requests if

	 * doing a safe shutdown.

	 */

	if (!dead) {

		if (shutdown)

	if (!dead && shutdown && freeze)

		nvme_wait_freeze_timeout(&dev->ctrl, NVME_IO_TIMEOUT);

	}



	nvme_stop_queues(&dev->ctrl);