diff options
| author | Christoph Hellwig <hch@lst.de> | 2016-06-06 23:20:50 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-06-12 07:29:43 -0600 |
| commit | f5fa90dc0a5b0bcfa3fa851dbee9e3ab6381076b (patch) | |
| tree | 07a5c62291b435396d29792bb5361d5d4e488177 /drivers/nvme/host/pci.c | |
| parent | 7a5abb4b48570c3552e33ff4c72ae1e8dac3ba15 (diff) | |
| download | op-kernel-dev-f5fa90dc0a5b0bcfa3fa851dbee9e3ab6381076b.zip op-kernel-dev-f5fa90dc0a5b0bcfa3fa851dbee9e3ab6381076b.tar.gz | |
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>
Diffstat (limited to 'drivers/nvme/host/pci.c')
| -rw-r--r-- | drivers/nvme/host/pci.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 37aa250..dc39924 100644 --- 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, |
