nvme: move the workaround for I/O queue-less controllers from PCIe to core

We want to apply this to Fabrics drivers as well, so move it to common
code.

Reviewed-by: Jay Freyensee <james.p.freyensee@intel.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Tested-by: Ming Lin <ming.l@ssi.samsung.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 45fd6cca4a27eb611dffdf247b4a58d30a409adb..9d7cee463fd6d16b460e37722e37f37b0cf1054a 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -574,11 +574,22 @@ int nvme_set_queue_count(struct nvme_ctrl *ctrl, int *count)
 
        status = nvme_set_features(ctrl, NVME_FEAT_NUM_QUEUES, q_count, 0,
                        &result);
-       if (status)
+       if (status < 0)
                return status;
 
-       nr_io_queues = min(result & 0xffff, result >> 16) + 1;
-       *count = min(*count, nr_io_queues);
+       /*
+        * Degraded controllers might return an error when setting the queue
+        * count.  We still want to be able to bring them online and offer
+        * access to the admin queue, as that might be only way to fix them up.
+        */
+       if (status > 0) {
+               dev_err(ctrl->dev, "Could not set queue count (%d)\n", status);
+               *count = 0;
+       } else {
+               nr_io_queues = min(result & 0xffff, result >> 16) + 1;
+               *count = min(*count, nr_io_queues);
+       }
+
        return 0;
 }
 EXPORT_SYMBOL_GPL(nvme_set_queue_count);

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 37aa25046eb85b78c824d8b6d8dbab17de975203..dc39924362a315e66dc5c94f966cd1e6d05524e0 100644 (file)
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1383,16 +1383,8 @@ static int nvme_setup_io_queues(struct nvme_dev *dev)
        if (result < 0)
                return result;
 
-       /*
-        * Degraded controllers might return an error when setting the queue
-        * count.  We still want to be able to bring them online and offer
-        * access to the admin queue, as that might be only way to fix them up.
-        */
-       if (result > 0) {
-               dev_err(dev->ctrl.device,
-                       "Could not set queue count (%d)\n", result);
+       if (nr_io_queues == 0)
                return 0;
-       }
 
        if (dev->cmb && NVME_CMB_SQS(dev->cmbsz)) {
                result = nvme_cmb_qdepth(dev, nr_io_queues,