All of lore.kernel.org
 help / color / mirror / Atom feed
From: Hannes Reinecke <hare@suse.de>
To: Christoph Hellwig <hch@lst.de>
Cc: Sagi Grimberg <sagi@grimberg.me>,
	Keith Busch <keith.busch@wdc.com>,
	linux-nvme@lists.infradead.org, Hannes Reinecke <hare@suse.de>
Subject: [PATCH 2/6] nvme: add CNTRLTYPE definitions for 'identify controller'
Date: Tue, 21 Sep 2021 17:15:25 +0200	[thread overview]
Message-ID: <20210921151529.29419-3-hare@suse.de> (raw)
In-Reply-To: <20210921151529.29419-1-hare@suse.de>

Update the 'identify controller' structure to define the missing
CNTRLTYPE field.

Signed-off-by: Hannes Reinecke <hare@suse.de>
---
 include/linux/nvme.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/include/linux/nvme.h b/include/linux/nvme.h
index b7c4c4130b65..ed2428918bca 100644
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
@@ -31,6 +31,12 @@ enum nvme_subsys_type {
 	NVME_NQN_NVME	= 2,		/* NVME type target subsystem */
 };
 
+enum nvme_ctrl_type {
+	NVME_CTRL_IO	= 1,		/* I/O controller */
+	NVME_CTRL_DISC	= 2,		/* Discovery controller */
+	NVME_CTRL_ADMIN	= 3,		/* Administrative controller */
+};
+
 /* Address Family codes for Discovery Log Page entry ADRFAM field */
 enum {
 	NVMF_ADDR_FAMILY_PCI	= 0,	/* PCIe */
@@ -244,7 +250,9 @@ struct nvme_id_ctrl {
 	__le32			rtd3e;
 	__le32			oaes;
 	__le32			ctratt;
-	__u8			rsvd100[28];
+	__u8			rsvd100[11];
+	__u8			cntrltype;
+	__u8			fguid[16];
 	__le16			crdt1;
 	__le16			crdt2;
 	__le16			crdt3;
-- 
2.29.2


_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme

  parent reply	other threads:[~2021-09-21 15:16 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-21 15:15 [PATCHv2 0/6] nvme: support unique discovery controller Hannes Reinecke
2021-09-21 15:15 ` [PATCH 1/6] nvmet: make discovery NQN configurable Hannes Reinecke
2021-09-22  1:15   ` Chaitanya Kulkarni
2021-09-22 13:32   ` Himanshu Madhani
2021-09-21 15:15 ` Hannes Reinecke [this message]
2021-09-22  1:17   ` [PATCH 2/6] nvme: add CNTRLTYPE definitions for 'identify controller' Chaitanya Kulkarni
2021-09-22 13:33   ` Himanshu Madhani
2021-09-21 15:15 ` [PATCH 3/6] nvmet: set 'CNTRLTYPE' in the identify controller data Hannes Reinecke
2021-09-22  1:23   ` Chaitanya Kulkarni
2021-09-22  5:00     ` Christoph Hellwig
2021-09-22  6:01     ` Hannes Reinecke
2021-09-21 15:15 ` [PATCH 4/6] nvme: expose subsystem type in sysfs attribute 'subtype' Hannes Reinecke
2021-09-22  1:25   ` Chaitanya Kulkarni
2021-09-22 13:34   ` Himanshu Madhani
2021-09-21 15:15 ` [PATCH 5/6] nvme: Add connect option 'discovery' Hannes Reinecke
2021-09-22  1:31   ` Chaitanya Kulkarni
2021-09-22 13:34   ` Himanshu Madhani
2021-09-21 15:15 ` [PATCH 6/6] nvme: display correct subsystem NQN Hannes Reinecke
2021-09-22  1:32   ` Chaitanya Kulkarni
2021-09-22 13:34   ` Himanshu Madhani
  -- strict thread matches above, loose matches on Subject: below --
2021-08-27 12:09 [PATCH 0/6] nvme: support unique discovery controller Hannes Reinecke
2021-08-27 12:09 ` [PATCH 2/6] nvme: add CNTRLTYPE definitions for 'identify controller' Hannes Reinecke

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210921151529.29419-3-hare@suse.de \
    --to=hare@suse.de \
    --cc=hch@lst.de \
    --cc=keith.busch@wdc.com \
    --cc=linux-nvme@lists.infradead.org \
    --cc=sagi@grimberg.me \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.