Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a915a5b authored by Jianchao Wang's avatar Jianchao Wang Committed by Jens Axboe
Browse files

nvme-pci: quiesce IO queues prior to disabling device HMB accesses 



Quiesce IO queues prior to disabling device HMB accesses. A controller
using HMB may relay on it to efficiently complete IO commands.

Reviewed-by: default avatarKeith Busch <keith.busch@intel.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarJianchao Wang <jianchao.w.wang@oracle.com>
Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent cf4182f3

drivers/nvme/host/pci.c

+4 −5
Original line number Diff line number Diff line
@@ -2196,7 +2196,11 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown) 
	if (!dead) {

		if (shutdown)

			nvme_wait_freeze_timeout(&dev->ctrl, NVME_IO_TIMEOUT);

	}



	nvme_stop_queues(&dev->ctrl);



	if (!dead) {

		/*

		 * If the controller is still alive tell it to stop using the

		 * host memory buffer.  In theory the shutdown / reset should
@@ -2205,11 +2209,6 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown) 
		 */

		if (dev->host_mem_descs)

			nvme_set_host_mem(dev, 0);



	}

	nvme_stop_queues(&dev->ctrl);



	if (!dead) {

		nvme_disable_io_queues(dev);

		nvme_disable_admin_queue(dev, shutdown);

	}