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

Commit f5fa90dc authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

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: default avatarJay Freyensee <james.p.freyensee@intel.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Tested-by: default avatarMing Lin <ming.l@ssi.samsung.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 7a5abb4b

drivers/nvme/host/core.c

+14 −3
Original line number Diff line number Diff line
@@ -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;



	/*

	 * 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);

drivers/nvme/host/pci.c

+1 −9
Original line number Diff line number Diff line
@@ -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,