Merge tag 'audit-pr-20220321' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoor...

[linux-2.6-microblaze.git] / include / linux / nvme.h

diff --git a/include/linux/nvme.h b/include/linux/nvme.h
index 855dd9b..9dbc3ef 100644 (file)
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
@@ -43,6 +43,12 @@ enum nvme_ctrl_type {
        NVME_CTRL_ADMIN = 3,            /* Administrative controller */
 };
 
+enum nvme_dctype {
+       NVME_DCTYPE_NOT_REPORTED        = 0,
+       NVME_DCTYPE_DDC                 = 1, /* Direct Discovery Controller */
+       NVME_DCTYPE_CDC                 = 2, /* Central Discovery Controller */
+};
+
 /* Address Family codes for Discovery Log Page entry ADRFAM field */
 enum {
        NVMF_ADDR_FAMILY_PCI    = 0,    /* PCIe */
@@ -320,7 +326,9 @@ struct nvme_id_ctrl {
        __le16                  icdoff;
        __u8                    ctrattr;
        __u8                    msdbd;
-       __u8                    rsvd1804[244];
+       __u8                    rsvd1804[2];
+       __u8                    dctype;
+       __u8                    rsvd1807[241];
        struct nvme_id_power_state      psd[32];
        __u8                    vs[1024];
 };
@@ -1636,6 +1644,7 @@ enum {
        NVME_SC_HOST_ABORTED_CMD        = 0x371,
 
        NVME_SC_CRD                     = 0x1800,
+       NVME_SC_MORE                    = 0x2000,
        NVME_SC_DNR                     = 0x4000,
 };