Commit f7e9a615 authored by Kamaljit Singh's avatar Kamaljit Singh Committed by Keith Busch
Browse files

nvme-core: do ioccsz/iorcsz validation only for I/O controllers 



An administrative controller does not support I/O queues, hence it
should ignore existing checks for IOCCSZ/IORCSZ. Currently, these checks
only exclude a discovery controller but need to also exclude an
administrative controller.

Signed-off-by: default avatarKamaljit Singh <kamaljit.singh@opensource.wdc.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent a5b85279

drivers/nvme/host/core.c

+2 −2
Original line number Diff line number Diff line
@@ -3492,14 +3492,14 @@ static int nvme_check_ctrl_fabric_info(struct nvme_ctrl *ctrl, struct nvme_id_ct 
		return -EINVAL;

	}



	if (!nvme_discovery_ctrl(ctrl) && ctrl->ioccsz < 4) {

	if (nvme_is_io_ctrl(ctrl) && ctrl->ioccsz < 4) {

		dev_err(ctrl->device,

			"I/O queue command capsule supported size %d < 4\n",

			ctrl->ioccsz);

		return -EINVAL;

	}



	if (!nvme_discovery_ctrl(ctrl) && ctrl->iorcsz < 1) {

	if (nvme_is_io_ctrl(ctrl) && ctrl->iorcsz < 1) {

		dev_err(ctrl->device,

			"I/O queue response capsule supported size %d < 1\n",

			ctrl->iorcsz);