[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20250702005830.889217-4-kamaljit.singh1@wdc.com>
Date: Tue,  1 Jul 2025 17:58:29 -0700
From: Kamaljit Singh <kamaljit.singh1@....com>
To: kbusch@...nel.org,
	axboe@...nel.dk,
	hch@....de,
	sagi@...mberg.me,
	linux-nvme@...ts.infradead.org,
	linux-kernel@...r.kernel.org
Cc: cassel@...nel.org,
	dlemoal@...nel.org,
	kamaljit.singh1@....com
Subject: [PATCH v2 3/3] nvme: prevent ioq creation for discovery controllers
Prevent ioq creation for discovery-controllers as the spec prohibits
them, similarly to the administrative controllers.
Reference: NVMe Base rev 2.2, sec 3.1.3.4, fig 28.
Signed-off-by: Kamaljit Singh <kamaljit.singh1@....com>
---
 drivers/nvme/host/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index c310634e75f3..3ad3b1da8b34 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -3155,12 +3155,12 @@ static inline bool nvme_admin_ctrl(struct nvme_ctrl *ctrl)
 }
 
 /*
- * An admin controller has one admin queue, but no I/O queues.
+ * An admin or discovery controller has one admin queue, but no I/O queues.
  * Override queue_count so it only creates an admin queue.
  */
 void nvme_override_prohibited_io_queues(struct nvme_ctrl *ctrl)
 {
-	if (nvme_admin_ctrl(ctrl))
+	if (nvme_admin_ctrl(ctrl) || nvme_discovery_ctrl(ctrl))
 		ctrl->queue_count = 1;
 }
 EXPORT_SYMBOL_GPL(nvme_override_prohibited_io_queues);
-- 
2.43.0
Powered by blists - more mailing lists