fabrics: add NCC to nvmf_disc_eflags

TP8010 defines an additional EFLAG: No CDC Connectivity (NCC)

Signed-off-by: Martin Belanger <martin.belanger@dell.com>

diff --git a/src/nvme/fabrics.c b/src/nvme/fabrics.c
index 581b04a8ed503ae179774bd16dc6565f0b5a925d..ee20da2ff7130df1651a636f34b5bdcf8773e2a5 100644 (file)
--- a/src/nvme/fabrics.c
+++ b/src/nvme/fabrics.c
@@ -118,8 +118,21 @@ static const char * const eflags_strings[] = {
        [NVMF_DISC_EFLAGS_NONE]         = "not specified",
        [NVMF_DISC_EFLAGS_EPCSD]        = "explicit discovery connections",
        [NVMF_DISC_EFLAGS_DUPRETINFO]   = "duplicate discovery information",
-       [NVMF_DISC_EFLAGS_BOTH]         = "explicit discovery connections, "
+       [NVMF_DISC_EFLAGS_EPCSD |
+        NVMF_DISC_EFLAGS_DUPRETINFO]   = "explicit discovery connections, "
                                          "duplicate discovery information",
+       [NVMF_DISC_EFLAGS_NCC]          = "no cdc connectivity",
+       [NVMF_DISC_EFLAGS_EPCSD |
+        NVMF_DISC_EFLAGS_NCC]          = "explicit discovery connections, "
+                                         "no cdc connectivity",
+       [NVMF_DISC_EFLAGS_DUPRETINFO |
+        NVMF_DISC_EFLAGS_NCC]          = "duplicate discovery information, "
+                                         "no cdc connectivity",
+       [NVMF_DISC_EFLAGS_EPCSD |
+        NVMF_DISC_EFLAGS_DUPRETINFO |
+        NVMF_DISC_EFLAGS_NCC]          = "explicit discovery connections, "
+                                         "duplicate discovery information, "
+                                         "no cdc connectivity",
 };
 
 const char *nvmf_eflags_str(__u16 eflags)

diff --git a/src/nvme/types.h b/src/nvme/types.h
index 301751f75527a5c270a776f88e4b05cebe2bbc61..3d67bc8eb4a3a8387f7c60e9344723e469ca8d4a 100644 (file)
--- a/src/nvme/types.h
+++ b/src/nvme/types.h
@@ -4635,17 +4635,27 @@ enum nvme_subsys_type {
  *                              this flag set.
  * @NVMF_DISC_EFLAGS_EPCSD:     Explicit Persistent Connection Support for Discovery (EPCSD):
  *                              Indicates that Explicit Persistent Connections are
- *                              supported for the Discovery controller.
- * @NVMF_DISC_EFLAGS_BOTH:      Indicates that both the DUPRETINFO and EPCSD
- *                              features are supported.
+ *                              supported for the Discovery controller.
+ * @NVMF_DISC_EFLAGS_NCC:       No CDC Connectivity (NCC): If set to
+ *                              '1', then no DDC that describes this entry
+ *                              is currently connected to the CDC. If
+ *                              cleared to '0', then at least one DDC that
+ *                              describes this entry is currently
+ *                              connected to the CDC. If the Discovery
+ *                              controller returning this log page is not
+ *                              a CDC, then this bit shall be cleared to
+ *                              '0' and should be ignored by the host.
  */
 enum nvmf_disc_eflags {
        NVMF_DISC_EFLAGS_NONE           = 0,
-       NVMF_DISC_EFLAGS_DUPRETINFO     = 1,
-       NVMF_DISC_EFLAGS_EPCSD          = 2,
-       NVMF_DISC_EFLAGS_BOTH           = 3,
+       NVMF_DISC_EFLAGS_DUPRETINFO     = 1 << 0,
+       NVMF_DISC_EFLAGS_EPCSD          = 1 << 1,
+       NVMF_DISC_EFLAGS_NCC            = 1 << 2,
 };
 
+/* Backwards compatibility. Will be removed with next major release */
+#define NVMF_DISC_EFLAGS_BOTH (NVMF_DISC_EFLAGS_DUPRETINFO | NVMF_DISC_EFLAGS_EPCSD)
+
 /**
  * union nvmf_tsas - Transport Specific Address Subtype
  * @common:  Common transport specific attributes