NVMe: Remove queue freezing on resets

[karo-tx-linux.git] / drivers / nvme / host / pci.c

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index ac6c7afb2a6ed03ab1ccd27d3f3964f0a751fbf1..953fe485a258cf8b67a296e6e566d98d9afd5782 100644 (file)
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1064,7 +1064,7 @@ static int nvme_suspend_queue(struct nvme_queue *nvmeq)
        spin_unlock_irq(&nvmeq->q_lock);
 
        if (!nvmeq->qid && nvmeq->dev->ctrl.admin_q)
-               blk_mq_freeze_queue_start(nvmeq->dev->ctrl.admin_q);
+               blk_mq_stop_hw_queues(nvmeq->dev->ctrl.admin_q);
 
        irq_set_affinity_hint(vector, NULL);
        free_irq(vector, nvmeq);
@@ -1296,7 +1296,7 @@ static int nvme_alloc_admin_tags(struct nvme_dev *dev)
                        return -ENODEV;
                }
        } else
-               blk_mq_unfreeze_queue(dev->ctrl.admin_q);
+               blk_mq_start_stopped_hw_queues(dev->ctrl.admin_q, true);
 
        return 0;
 }
@@ -1917,7 +1917,7 @@ static void nvme_dev_shutdown(struct nvme_dev *dev)
 
        mutex_lock(&dev->shutdown_lock);
        if (dev->bar) {
-               nvme_freeze_queues(&dev->ctrl);
+               nvme_stop_queues(&dev->ctrl);
                csts = readl(dev->bar + NVME_REG_CSTS);
        }
        if (csts & NVME_CSTS_CFS || !(csts & NVME_CSTS_RDY)) {
@@ -2026,7 +2026,7 @@ static void nvme_reset_work(struct work_struct *work)
                dev_warn(dev->dev, "IO queues not created\n");
                nvme_remove_namespaces(&dev->ctrl);
        } else {
-               nvme_unfreeze_queues(&dev->ctrl);
+               nvme_start_queues(&dev->ctrl);
                nvme_dev_add(dev);
        }