Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

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

diff --git a/include/linux/nvme.h b/include/linux/nvme.h
index bfed36e..b08787c 100644 (file)
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
@@ -697,7 +697,11 @@ enum nvme_opcode {
                nvme_opcode_name(nvme_cmd_resv_register),       \
                nvme_opcode_name(nvme_cmd_resv_report),         \
                nvme_opcode_name(nvme_cmd_resv_acquire),        \
-               nvme_opcode_name(nvme_cmd_resv_release))
+               nvme_opcode_name(nvme_cmd_resv_release),        \
+               nvme_opcode_name(nvme_cmd_zone_mgmt_send),      \
+               nvme_opcode_name(nvme_cmd_zone_mgmt_recv),      \
+               nvme_opcode_name(nvme_cmd_zone_append))
+
 
 
 /*
@@ -1473,20 +1477,29 @@ enum {
        NVME_SC_SGL_INVALID_DATA        = 0xf,
        NVME_SC_SGL_INVALID_METADATA    = 0x10,
        NVME_SC_SGL_INVALID_TYPE        = 0x11,
-
+       NVME_SC_CMB_INVALID_USE         = 0x12,
+       NVME_SC_PRP_INVALID_OFFSET      = 0x13,
+       NVME_SC_ATOMIC_WU_EXCEEDED      = 0x14,
+       NVME_SC_OP_DENIED               = 0x15,
        NVME_SC_SGL_INVALID_OFFSET      = 0x16,
-       NVME_SC_SGL_INVALID_SUBTYPE     = 0x17,
-
+       NVME_SC_RESERVED                = 0x17,
+       NVME_SC_HOST_ID_INCONSIST       = 0x18,
+       NVME_SC_KA_TIMEOUT_EXPIRED      = 0x19,
+       NVME_SC_KA_TIMEOUT_INVALID      = 0x1A,
+       NVME_SC_ABORTED_PREEMPT_ABORT   = 0x1B,
        NVME_SC_SANITIZE_FAILED         = 0x1C,
        NVME_SC_SANITIZE_IN_PROGRESS    = 0x1D,
-
+       NVME_SC_SGL_INVALID_GRANULARITY = 0x1E,
+       NVME_SC_CMD_NOT_SUP_CMB_QUEUE   = 0x1F,
        NVME_SC_NS_WRITE_PROTECTED      = 0x20,
        NVME_SC_CMD_INTERRUPTED         = 0x21,
+       NVME_SC_TRANSIENT_TR_ERR        = 0x22,
 
        NVME_SC_LBA_RANGE               = 0x80,
        NVME_SC_CAP_EXCEEDED            = 0x81,
        NVME_SC_NS_NOT_READY            = 0x82,
        NVME_SC_RESERVATION_CONFLICT    = 0x83,
+       NVME_SC_FORMAT_IN_PROGRESS      = 0x84,
 
        /*
         * Command Specific Status:
@@ -1519,8 +1532,15 @@ enum {
        NVME_SC_NS_NOT_ATTACHED         = 0x11a,
        NVME_SC_THIN_PROV_NOT_SUPP      = 0x11b,
        NVME_SC_CTRL_LIST_INVALID       = 0x11c,
+       NVME_SC_SELT_TEST_IN_PROGRESS   = 0x11d,
        NVME_SC_BP_WRITE_PROHIBITED     = 0x11e,
+       NVME_SC_CTRL_ID_INVALID         = 0x11f,
+       NVME_SC_SEC_CTRL_STATE_INVALID  = 0x120,
+       NVME_SC_CTRL_RES_NUM_INVALID    = 0x121,
+       NVME_SC_RES_ID_INVALID          = 0x122,
        NVME_SC_PMR_SAN_PROHIBITED      = 0x123,
+       NVME_SC_ANA_GROUP_ID_INVALID    = 0x124,
+       NVME_SC_ANA_ATTACH_FAILED       = 0x125,
 
        /*
         * I/O Command Set Specific - NVM commands: