aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeith Busch <keith.busch@intel.com>2018-06-06 10:13:07 -0400
committerJens Axboe <axboe@kernel.dk>2018-06-08 14:51:11 -0400
commitfe76fcfb91a97eccf20cec17ff05a27b8d5b0801 (patch)
tree49943f1778fb52a0944c6056dca56b2192277876
parentded45505dbfdcaf1e49ae0349e5dafb59c9efbe5 (diff)
nvme-pci: remove HMB teardown on reset
The controller is required to disable its host memory buffer use on controller reset. We don't need to submit an admin command to delete it, so this patch skips sending that command so we don't need to worry about handling a timeout. Signed-off-by: Keith Busch <keith.busch@intel.com> Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de> Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--drivers/nvme/host/pci.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 7a42ccad3864..7f8b1bd03db4 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2224,14 +2224,6 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown)
2224 nvme_stop_queues(&dev->ctrl); 2224 nvme_stop_queues(&dev->ctrl);
2225 2225
2226 if (!dead && dev->ctrl.queue_count > 0) { 2226 if (!dead && dev->ctrl.queue_count > 0) {
2227 /*
2228 * If the controller is still alive tell it to stop using the
2229 * host memory buffer. In theory the shutdown / reset should
2230 * make sure that it doesn't access the host memoery anymore,
2231 * but I'd rather be safe than sorry..
2232 */
2233 if (dev->host_mem_descs)
2234 nvme_set_host_mem(dev, 0);
2235 nvme_disable_io_queues(dev); 2227 nvme_disable_io_queues(dev);
2236 nvme_disable_admin_queue(dev, shutdown); 2228 nvme_disable_admin_queue(dev, shutdown);
2237 } 2229 }