1 files changed, 881 insertions, 704 deletions

diff --git a/include/linux/qed/iscsi_common.h b/include/linux/qed/iscsi_common.h
index 85e086cba639..4cc9b37b8d95 100644
--- a/include/linux/qed/iscsi_common.h
+++ b/include/linux/qed/iscsi_common.h
@@ -32,47 +32,48 @@
 
 #ifndef __ISCSI_COMMON__
 #define __ISCSI_COMMON__
+
 /**********************/
 /* ISCSI FW CONSTANTS */
 /**********************/
 
 /* iSCSI HSI constants */
-#define ISCSI_DEFAULT_MTU       (1500)
+#define ISCSI_DEFAULT_MTU       (1500)
 
 /* KWQ (kernel work queue) layer codes */
-#define ISCSI_SLOW_PATH_LAYER_CODE   (6)
+#define ISCSI_SLOW_PATH_LAYER_CODE      (6)
 
 /* iSCSI parameter defaults */
-#define ISCSI_DEFAULT_HEADER_DIGEST         (0)
-#define ISCSI_DEFAULT_DATA_DIGEST           (0)
-#define ISCSI_DEFAULT_INITIAL_R2T           (1)
-#define ISCSI_DEFAULT_IMMEDIATE_DATA        (1)
-#define ISCSI_DEFAULT_MAX_PDU_LENGTH        (0x2000)
-#define ISCSI_DEFAULT_FIRST_BURST_LENGTH    (0x10000)
-#define ISCSI_DEFAULT_MAX_BURST_LENGTH      (0x40000)
-#define ISCSI_DEFAULT_MAX_OUTSTANDING_R2T   (1)
+#define ISCSI_DEFAULT_HEADER_DIGEST             (0)
+#define ISCSI_DEFAULT_DATA_DIGEST               (0)
+#define ISCSI_DEFAULT_INITIAL_R2T               (1)
+#define ISCSI_DEFAULT_IMMEDIATE_DATA            (1)
+#define ISCSI_DEFAULT_MAX_PDU_LENGTH            (0x2000)
+#define ISCSI_DEFAULT_FIRST_BURST_LENGTH        (0x10000)
+#define ISCSI_DEFAULT_MAX_BURST_LENGTH          (0x40000)
+#define ISCSI_DEFAULT_MAX_OUTSTANDING_R2T       (1)
 
 /* iSCSI parameter limits */
-#define ISCSI_MIN_VAL_MAX_PDU_LENGTH        (0x200)
-#define ISCSI_MAX_VAL_MAX_PDU_LENGTH        (0xffffff)
-#define ISCSI_MIN_VAL_BURST_LENGTH          (0x200)
-#define ISCSI_MAX_VAL_BURST_LENGTH          (0xffffff)
-#define ISCSI_MIN_VAL_MAX_OUTSTANDING_R2T   (1)
-#define ISCSI_MAX_VAL_MAX_OUTSTANDING_R2T   (0xff)
+#define ISCSI_MIN_VAL_MAX_PDU_LENGTH            (0x200)
+#define ISCSI_MAX_VAL_MAX_PDU_LENGTH            (0xffffff)
+#define ISCSI_MIN_VAL_BURST_LENGTH              (0x200)
+#define ISCSI_MAX_VAL_BURST_LENGTH              (0xffffff)
+#define ISCSI_MIN_VAL_MAX_OUTSTANDING_R2T       (1)
+#define ISCSI_MAX_VAL_MAX_OUTSTANDING_R2T       (0xff)
 
-#define ISCSI_AHS_CNTL_SIZE 4
+#define ISCSI_AHS_CNTL_SIZE     4
 
-#define ISCSI_WQE_NUM_SGES_SLOWIO           (0xf)
+#define ISCSI_WQE_NUM_SGES_SLOWIO       (0xf)
 
 /* iSCSI reserved params */
 #define ISCSI_ITT_ALL_ONES      (0xffffffff)
 #define ISCSI_TTT_ALL_ONES      (0xffffffff)
 
-#define ISCSI_OPTION_1_OFF_CHIP_TCP 1
-#define ISCSI_OPTION_2_ON_CHIP_TCP 2
+#define ISCSI_OPTION_1_OFF_CHIP_TCP     1
+#define ISCSI_OPTION_2_ON_CHIP_TCP      2
 
-#define ISCSI_INITIATOR_MODE 0
-#define ISCSI_TARGET_MODE 1
+#define ISCSI_INITIATOR_MODE    0
+#define ISCSI_TARGET_MODE       1
 
 /* iSCSI request op codes */
 #define ISCSI_OPCODE_NOP_OUT            (0)
@@ -84,41 +85,48 @@
 #define ISCSI_OPCODE_LOGOUT_REQUEST     (6)
 
 /* iSCSI response/messages op codes */
-#define ISCSI_OPCODE_NOP_IN             (0x20)
-#define ISCSI_OPCODE_SCSI_RESPONSE      (0x21)
-#define ISCSI_OPCODE_TMF_RESPONSE       (0x22)
-#define ISCSI_OPCODE_LOGIN_RESPONSE     (0x23)
-#define ISCSI_OPCODE_TEXT_RESPONSE      (0x24)
-#define ISCSI_OPCODE_DATA_IN            (0x25)
-#define ISCSI_OPCODE_LOGOUT_RESPONSE    (0x26)
-#define ISCSI_OPCODE_R2T                (0x31)
-#define ISCSI_OPCODE_ASYNC_MSG          (0x32)
-#define ISCSI_OPCODE_REJECT             (0x3f)
+#define ISCSI_OPCODE_NOP_IN             (0x20)
+#define ISCSI_OPCODE_SCSI_RESPONSE      (0x21)
+#define ISCSI_OPCODE_TMF_RESPONSE       (0x22)
+#define ISCSI_OPCODE_LOGIN_RESPONSE     (0x23)
+#define ISCSI_OPCODE_TEXT_RESPONSE      (0x24)
+#define ISCSI_OPCODE_DATA_IN            (0x25)
+#define ISCSI_OPCODE_LOGOUT_RESPONSE    (0x26)
+#define ISCSI_OPCODE_R2T                (0x31)
+#define ISCSI_OPCODE_ASYNC_MSG          (0x32)
+#define ISCSI_OPCODE_REJECT             (0x3f)
 
 /* iSCSI stages */
-#define ISCSI_STAGE_SECURITY_NEGOTIATION            (0)
-#define ISCSI_STAGE_LOGIN_OPERATIONAL_NEGOTIATION   (1)
-#define ISCSI_STAGE_FULL_FEATURE_PHASE              (3)
+#define ISCSI_STAGE_SECURITY_NEGOTIATION                (0)
+#define ISCSI_STAGE_LOGIN_OPERATIONAL_NEGOTIATION       (1)
+#define ISCSI_STAGE_FULL_FEATURE_PHASE                  (3)
 
 /* iSCSI CQE errors */
-#define CQE_ERROR_BITMAP_DATA_DIGEST          (0x08)
-#define CQE_ERROR_BITMAP_RCV_ON_INVALID_CONN  (0x10)
-#define CQE_ERROR_BITMAP_DATA_TRUNCATED       (0x20)
+#define CQE_ERROR_BITMAP_DATA_DIGEST            (0x08)
+#define CQE_ERROR_BITMAP_RCV_ON_INVALID_CONN    (0x10)
+#define CQE_ERROR_BITMAP_DATA_TRUNCATED         (0x20)
+
+/* Union of data bd_opaque/ tq_tid */
+union bd_opaque_tq_union {
+        __le16 bd_opaque;
+        __le16 tq_tid;
+};
 
+/* ISCSI SGL entry */
 struct cqe_error_bitmap {
         u8 cqe_error_status_bits;
-#define CQE_ERROR_BITMAP_DIF_ERR_BITS_MASK         0x7
-#define CQE_ERROR_BITMAP_DIF_ERR_BITS_SHIFT        0
-#define CQE_ERROR_BITMAP_DATA_DIGEST_ERR_MASK      0x1
-#define CQE_ERROR_BITMAP_DATA_DIGEST_ERR_SHIFT     3
-#define CQE_ERROR_BITMAP_RCV_ON_INVALID_CONN_MASK  0x1
-#define CQE_ERROR_BITMAP_RCV_ON_INVALID_CONN_SHIFT 4
-#define CQE_ERROR_BITMAP_DATA_TRUNCATED_ERR_MASK   0x1
-#define CQE_ERROR_BITMAP_DATA_TRUNCATED_ERR_SHIFT  5
-#define CQE_ERROR_BITMAP_UNDER_RUN_ERR_MASK        0x1
-#define CQE_ERROR_BITMAP_UNDER_RUN_ERR_SHIFT       6
-#define CQE_ERROR_BITMAP_RESERVED2_MASK            0x1
-#define CQE_ERROR_BITMAP_RESERVED2_SHIFT           7
+#define CQE_ERROR_BITMAP_DIF_ERR_BITS_MASK              0x7
+#define CQE_ERROR_BITMAP_DIF_ERR_BITS_SHIFT             0
+#define CQE_ERROR_BITMAP_DATA_DIGEST_ERR_MASK           0x1
+#define CQE_ERROR_BITMAP_DATA_DIGEST_ERR_SHIFT          3
+#define CQE_ERROR_BITMAP_RCV_ON_INVALID_CONN_MASK       0x1
+#define CQE_ERROR_BITMAP_RCV_ON_INVALID_CONN_SHIFT      4
+#define CQE_ERROR_BITMAP_DATA_TRUNCATED_ERR_MASK        0x1
+#define CQE_ERROR_BITMAP_DATA_TRUNCATED_ERR_SHIFT       5
+#define CQE_ERROR_BITMAP_UNDER_RUN_ERR_MASK             0x1
+#define CQE_ERROR_BITMAP_UNDER_RUN_ERR_SHIFT            6
+#define CQE_ERROR_BITMAP_RESERVED2_MASK                 0x1
+#define CQE_ERROR_BITMAP_RESERVED2_SHIFT                7
 };
 
 union cqe_error_status {
@@ -126,86 +134,133 @@ union cqe_error_status {
         struct cqe_error_bitmap error_bits;
 };
 
+/* iSCSI Login Response PDU header */
 struct data_hdr {
         __le32 data[12];
 };
 
-struct iscsi_async_msg_hdr {
-        __le16 reserved0;
-        u8 flags_attr;
-#define ISCSI_ASYNC_MSG_HDR_RSRV_MASK           0x7F
-#define ISCSI_ASYNC_MSG_HDR_RSRV_SHIFT          0
-#define ISCSI_ASYNC_MSG_HDR_CONST1_MASK         0x1
-#define ISCSI_ASYNC_MSG_HDR_CONST1_SHIFT        7
-        u8 opcode;
-        __le32 hdr_second_dword;
-#define ISCSI_ASYNC_MSG_HDR_DATA_SEG_LEN_MASK   0xFFFFFF
-#define ISCSI_ASYNC_MSG_HDR_DATA_SEG_LEN_SHIFT  0
-#define ISCSI_ASYNC_MSG_HDR_TOTAL_AHS_LEN_MASK  0xFF
-#define ISCSI_ASYNC_MSG_HDR_TOTAL_AHS_LEN_SHIFT 24
-        struct regpair lun;
-        __le32 all_ones;
-        __le32 reserved1;
-        __le32 stat_sn;
-        __le32 exp_cmd_sn;
-        __le32 max_cmd_sn;
-        __le16 param1_rsrv;
-        u8 async_vcode;
-        u8 async_event;
-        __le16 param3_rsrv;
-        __le16 param2_rsrv;
-        __le32 reserved7;
+struct lun_mapper_addr_reserved {
+        struct regpair lun_mapper_addr;
+        u8 reserved0[8];
+};
+
+/* rdif conetxt for dif on immediate */
+struct dif_on_immediate_params {
+        __le32 initial_ref_tag;
+        __le16 application_tag;
+        __le16 application_tag_mask;
+        __le16 flags1;
+#define DIF_ON_IMMEDIATE_PARAMS_VALIDATE_GUARD_MASK             0x1
+#define DIF_ON_IMMEDIATE_PARAMS_VALIDATE_GUARD_SHIFT            0
+#define DIF_ON_IMMEDIATE_PARAMS_VALIDATE_APP_TAG_MASK           0x1
+#define DIF_ON_IMMEDIATE_PARAMS_VALIDATE_APP_TAG_SHIFT          1
+#define DIF_ON_IMMEDIATE_PARAMS_VALIDATE_REF_TAG_MASK           0x1
+#define DIF_ON_IMMEDIATE_PARAMS_VALIDATE_REF_TAG_SHIFT          2
+#define DIF_ON_IMMEDIATE_PARAMS_FORWARD_GUARD_MASK              0x1
+#define DIF_ON_IMMEDIATE_PARAMS_FORWARD_GUARD_SHIFT             3
+#define DIF_ON_IMMEDIATE_PARAMS_FORWARD_APP_TAG_MASK            0x1
+#define DIF_ON_IMMEDIATE_PARAMS_FORWARD_APP_TAG_SHIFT           4
+#define DIF_ON_IMMEDIATE_PARAMS_FORWARD_REF_TAG_MASK            0x1
+#define DIF_ON_IMMEDIATE_PARAMS_FORWARD_REF_TAG_SHIFT           5
+#define DIF_ON_IMMEDIATE_PARAMS_INTERVAL_SIZE_MASK              0x1
+#define DIF_ON_IMMEDIATE_PARAMS_INTERVAL_SIZE_SHIFT             6
+#define DIF_ON_IMMEDIATE_PARAMS_NETWORK_INTERFACE_MASK          0x1
+#define DIF_ON_IMMEDIATE_PARAMS_NETWORK_INTERFACE_SHIFT         7
+#define DIF_ON_IMMEDIATE_PARAMS_HOST_INTERFACE_MASK             0x3
+#define DIF_ON_IMMEDIATE_PARAMS_HOST_INTERFACE_SHIFT            8
+#define DIF_ON_IMMEDIATE_PARAMS_REF_TAG_MASK_MASK               0xF
+#define DIF_ON_IMMEDIATE_PARAMS_REF_TAG_MASK_SHIFT              10
+#define DIF_ON_IMMEDIATE_PARAMS_FORWARD_APP_TAG_WITH_MASK_MASK  0x1
+#define DIF_ON_IMMEDIATE_PARAMS_FORWARD_APP_TAG_WITH_MASK_SHIFT 14
+#define DIF_ON_IMMEDIATE_PARAMS_FORWARD_REF_TAG_WITH_MASK_MASK  0x1
+#define DIF_ON_IMMEDIATE_PARAMS_FORWARD_REF_TAG_WITH_MASK_SHIFT 15
+        u8 flags0;
+#define DIF_ON_IMMEDIATE_PARAMS_RESERVED_MASK                   0x1
+#define DIF_ON_IMMEDIATE_PARAMS_RESERVED_SHIFT                  0
+#define DIF_ON_IMMEDIATE_PARAMS_IGNORE_APP_TAG_MASK             0x1
+#define DIF_ON_IMMEDIATE_PARAMS_IGNORE_APP_TAG_SHIFT            1
+#define DIF_ON_IMMEDIATE_PARAMS_INITIAL_REF_TAG_IS_VALID_MASK   0x1
+#define DIF_ON_IMMEDIATE_PARAMS_INITIAL_REF_TAG_IS_VALID_SHIFT  2
+#define DIF_ON_IMMEDIATE_PARAMS_HOST_GUARD_TYPE_MASK            0x1
+#define DIF_ON_IMMEDIATE_PARAMS_HOST_GUARD_TYPE_SHIFT           3
+#define DIF_ON_IMMEDIATE_PARAMS_PROTECTION_TYPE_MASK            0x3
+#define DIF_ON_IMMEDIATE_PARAMS_PROTECTION_TYPE_SHIFT           4
+#define DIF_ON_IMMEDIATE_PARAMS_CRC_SEED_MASK                   0x1
+#define DIF_ON_IMMEDIATE_PARAMS_CRC_SEED_SHIFT                  6
+#define DIF_ON_IMMEDIATE_PARAMS_KEEP_REF_TAG_CONST_MASK         0x1
+#define DIF_ON_IMMEDIATE_PARAMS_KEEP_REF_TAG_CONST_SHIFT        7
+        u8 reserved_zero[5];
+};
+
+/* iSCSI dif on immediate mode attributes union */
+union dif_configuration_params {
+        struct lun_mapper_addr_reserved lun_mapper_address;
+        struct dif_on_immediate_params def_dif_conf;
+};
+
+/* Union of data/r2t sequence number */
+union iscsi_seq_num {
+        __le16 data_sn;
+        __le16 r2t_sn;
 };
 
-struct iscsi_cmd_hdr {
-        __le16 reserved1;
-        u8 flags_attr;
-#define ISCSI_CMD_HDR_ATTR_MASK         0x7
-#define ISCSI_CMD_HDR_ATTR_SHIFT        0
-#define ISCSI_CMD_HDR_RSRV_MASK         0x3
-#define ISCSI_CMD_HDR_RSRV_SHIFT        3
-#define ISCSI_CMD_HDR_WRITE_MASK        0x1
-#define ISCSI_CMD_HDR_WRITE_SHIFT       5
-#define ISCSI_CMD_HDR_READ_MASK         0x1
-#define ISCSI_CMD_HDR_READ_SHIFT        6
-#define ISCSI_CMD_HDR_FINAL_MASK        0x1
-#define ISCSI_CMD_HDR_FINAL_SHIFT       7
-        u8 hdr_first_byte;
-#define ISCSI_CMD_HDR_OPCODE_MASK       0x3F
-#define ISCSI_CMD_HDR_OPCODE_SHIFT      0
-#define ISCSI_CMD_HDR_IMM_MASK          0x1
-#define ISCSI_CMD_HDR_IMM_SHIFT         6
-#define ISCSI_CMD_HDR_RSRV1_MASK        0x1
-#define ISCSI_CMD_HDR_RSRV1_SHIFT       7
-        __le32 hdr_second_dword;
-#define ISCSI_CMD_HDR_DATA_SEG_LEN_MASK   0xFFFFFF
-#define ISCSI_CMD_HDR_DATA_SEG_LEN_SHIFT  0
-#define ISCSI_CMD_HDR_TOTAL_AHS_LEN_MASK  0xFF
-#define ISCSI_CMD_HDR_TOTAL_AHS_LEN_SHIFT 24
-        struct regpair lun;
-        __le32 itt;
-        __le32 expected_transfer_length;
-        __le32 cmd_sn;
-        __le32 exp_stat_sn;
-        __le32 cdb[4];
+/* iSCSI DIF flags */
+struct iscsi_dif_flags {
+        u8 flags;
+#define ISCSI_DIF_FLAGS_PROT_INTERVAL_SIZE_LOG_MASK     0xF
+#define ISCSI_DIF_FLAGS_PROT_INTERVAL_SIZE_LOG_SHIFT    0
+#define ISCSI_DIF_FLAGS_DIF_TO_PEER_MASK                0x1
+#define ISCSI_DIF_FLAGS_DIF_TO_PEER_SHIFT               4
+#define ISCSI_DIF_FLAGS_HOST_INTERFACE_MASK             0x7
+#define ISCSI_DIF_FLAGS_HOST_INTERFACE_SHIFT            5
 };
 
+/* The iscsi storm task context of Ystorm */
+struct ystorm_iscsi_task_state {
+        struct scsi_cached_sges data_desc;
+        struct scsi_sgl_params sgl_params;
+        __le32 exp_r2t_sn;
+        __le32 buffer_offset;
+        union iscsi_seq_num seq_num;
+        struct iscsi_dif_flags dif_flags;
+        u8 flags;
+#define YSTORM_ISCSI_TASK_STATE_LOCAL_COMP_MASK         0x1
+#define YSTORM_ISCSI_TASK_STATE_LOCAL_COMP_SHIFT        0
+#define YSTORM_ISCSI_TASK_STATE_SLOW_IO_MASK            0x1
+#define YSTORM_ISCSI_TASK_STATE_SLOW_IO_SHIFT           1
+#define YSTORM_ISCSI_TASK_STATE_SET_DIF_OFFSET_MASK     0x1
+#define YSTORM_ISCSI_TASK_STATE_SET_DIF_OFFSET_SHIFT    2
+#define YSTORM_ISCSI_TASK_STATE_RESERVED0_MASK          0x1F
+#define YSTORM_ISCSI_TASK_STATE_RESERVED0_SHIFT         3
+};
+
+/* The iscsi storm task context of Ystorm */
+struct ystorm_iscsi_task_rxmit_opt {
+        __le32 fast_rxmit_sge_offset;
+        __le32 scan_start_buffer_offset;
+        __le32 fast_rxmit_buffer_offset;
+        u8 scan_start_sgl_index;
+        u8 fast_rxmit_sgl_index;
+        __le16 reserved;
+};
+
+/* iSCSI Common PDU header */
 struct iscsi_common_hdr {
         u8 hdr_status;
         u8 hdr_response;
         u8 hdr_flags;
         u8 hdr_first_byte;
-#define ISCSI_COMMON_HDR_OPCODE_MASK         0x3F
-#define ISCSI_COMMON_HDR_OPCODE_SHIFT        0
-#define ISCSI_COMMON_HDR_IMM_MASK            0x1
-#define ISCSI_COMMON_HDR_IMM_SHIFT           6
-#define ISCSI_COMMON_HDR_RSRV_MASK           0x1
-#define ISCSI_COMMON_HDR_RSRV_SHIFT          7
+#define ISCSI_COMMON_HDR_OPCODE_MASK            0x3F
+#define ISCSI_COMMON_HDR_OPCODE_SHIFT           0
+#define ISCSI_COMMON_HDR_IMM_MASK               0x1
+#define ISCSI_COMMON_HDR_IMM_SHIFT              6
+#define ISCSI_COMMON_HDR_RSRV_MASK              0x1
+#define ISCSI_COMMON_HDR_RSRV_SHIFT             7
         __le32 hdr_second_dword;
-#define ISCSI_COMMON_HDR_DATA_SEG_LEN_MASK   0xFFFFFF
-#define ISCSI_COMMON_HDR_DATA_SEG_LEN_SHIFT  0
-#define ISCSI_COMMON_HDR_TOTAL_AHS_LEN_MASK  0xFF
-#define ISCSI_COMMON_HDR_TOTAL_AHS_LEN_SHIFT 24
+#define ISCSI_COMMON_HDR_DATA_SEG_LEN_MASK      0xFFFFFF
+#define ISCSI_COMMON_HDR_DATA_SEG_LEN_SHIFT     0
+#define ISCSI_COMMON_HDR_TOTAL_AHS_LEN_MASK     0xFF
+#define ISCSI_COMMON_HDR_TOTAL_AHS_LEN_SHIFT    24
         struct regpair lun_reserved;
         __le32 itt;
         __le32 ttt;
@@ -215,86 +270,60 @@ struct iscsi_common_hdr {
         __le32 data[3];
 };
 
-struct iscsi_conn_offload_params {
-        struct regpair sq_pbl_addr;
-        struct regpair r2tq_pbl_addr;
-        struct regpair xhq_pbl_addr;
-        struct regpair uhq_pbl_addr;
-        __le32 initial_ack;
-        __le16 physical_q0;
-        __le16 physical_q1;
-        u8 flags;
-#define ISCSI_CONN_OFFLOAD_PARAMS_TCP_ON_CHIP_1B_MASK  0x1
-#define ISCSI_CONN_OFFLOAD_PARAMS_TCP_ON_CHIP_1B_SHIFT 0
-#define ISCSI_CONN_OFFLOAD_PARAMS_TARGET_MODE_MASK     0x1
-#define ISCSI_CONN_OFFLOAD_PARAMS_TARGET_MODE_SHIFT    1
-#define ISCSI_CONN_OFFLOAD_PARAMS_RESTRICTED_MODE_MASK  0x1
-#define ISCSI_CONN_OFFLOAD_PARAMS_RESTRICTED_MODE_SHIFT 2
-#define ISCSI_CONN_OFFLOAD_PARAMS_RESERVED1_MASK        0x1F
-#define ISCSI_CONN_OFFLOAD_PARAMS_RESERVED1_SHIFT       3
-        u8 pbl_page_size_log;
-        u8 pbe_page_size_log;
-        u8 default_cq;
-        __le32 stat_sn;
-};
-
-struct iscsi_slow_path_hdr {
-        u8 op_code;
-        u8 flags;
-#define ISCSI_SLOW_PATH_HDR_RESERVED0_MASK   0xF
-#define ISCSI_SLOW_PATH_HDR_RESERVED0_SHIFT  0
-#define ISCSI_SLOW_PATH_HDR_LAYER_CODE_MASK  0x7
-#define ISCSI_SLOW_PATH_HDR_LAYER_CODE_SHIFT 4
-#define ISCSI_SLOW_PATH_HDR_RESERVED1_MASK   0x1
-#define ISCSI_SLOW_PATH_HDR_RESERVED1_SHIFT  7
-};
-
-struct iscsi_conn_update_ramrod_params {
-        struct iscsi_slow_path_hdr hdr;
-        __le16 conn_id;
-        __le32 fw_cid;
-        u8 flags;
-#define ISCSI_CONN_UPDATE_RAMROD_PARAMS_HD_EN_MASK           0x1
-#define ISCSI_CONN_UPDATE_RAMROD_PARAMS_HD_EN_SHIFT          0
-#define ISCSI_CONN_UPDATE_RAMROD_PARAMS_DD_EN_MASK           0x1
-#define ISCSI_CONN_UPDATE_RAMROD_PARAMS_DD_EN_SHIFT          1
-#define ISCSI_CONN_UPDATE_RAMROD_PARAMS_INITIAL_R2T_MASK     0x1
-#define ISCSI_CONN_UPDATE_RAMROD_PARAMS_INITIAL_R2T_SHIFT    2
-#define ISCSI_CONN_UPDATE_RAMROD_PARAMS_IMMEDIATE_DATA_MASK  0x1
-#define ISCSI_CONN_UPDATE_RAMROD_PARAMS_IMMEDIATE_DATA_SHIFT 3
-#define ISCSI_CONN_UPDATE_RAMROD_PARAMS_DIF_BLOCK_SIZE_MASK  0x1
-#define ISCSI_CONN_UPDATE_RAMROD_PARAMS_DIF_BLOCK_SIZE_SHIFT 4
-#define ISCSI_CONN_UPDATE_RAMROD_PARAMS_DIF_ON_HOST_EN_MASK  0x1
-#define ISCSI_CONN_UPDATE_RAMROD_PARAMS_DIF_ON_HOST_EN_SHIFT 5
-#define ISCSI_CONN_UPDATE_RAMROD_PARAMS_RESERVED1_MASK       0x3
-#define ISCSI_CONN_UPDATE_RAMROD_PARAMS_RESERVED1_SHIFT      6
-        u8 reserved0[3];
-        __le32 max_seq_size;
-        __le32 max_send_pdu_length;
-        __le32 max_recv_pdu_length;
-        __le32 first_seq_length;
+/* iSCSI Command PDU header */
+struct iscsi_cmd_hdr {
+        __le16 reserved1;
+        u8 flags_attr;
+#define ISCSI_CMD_HDR_ATTR_MASK                 0x7
+#define ISCSI_CMD_HDR_ATTR_SHIFT                0
+#define ISCSI_CMD_HDR_RSRV_MASK                 0x3
+#define ISCSI_CMD_HDR_RSRV_SHIFT                3
+#define ISCSI_CMD_HDR_WRITE_MASK                0x1
+#define ISCSI_CMD_HDR_WRITE_SHIFT               5
+#define ISCSI_CMD_HDR_READ_MASK                 0x1
+#define ISCSI_CMD_HDR_READ_SHIFT                6
+#define ISCSI_CMD_HDR_FINAL_MASK                0x1
+#define ISCSI_CMD_HDR_FINAL_SHIFT               7
+        u8 hdr_first_byte;
+#define ISCSI_CMD_HDR_OPCODE_MASK               0x3F
+#define ISCSI_CMD_HDR_OPCODE_SHIFT              0
+#define ISCSI_CMD_HDR_IMM_MASK                  0x1
+#define ISCSI_CMD_HDR_IMM_SHIFT                 6
+#define ISCSI_CMD_HDR_RSRV1_MASK                0x1
+#define ISCSI_CMD_HDR_RSRV1_SHIFT               7
+        __le32 hdr_second_dword;
+#define ISCSI_CMD_HDR_DATA_SEG_LEN_MASK         0xFFFFFF
+#define ISCSI_CMD_HDR_DATA_SEG_LEN_SHIFT        0
+#define ISCSI_CMD_HDR_TOTAL_AHS_LEN_MASK        0xFF
+#define ISCSI_CMD_HDR_TOTAL_AHS_LEN_SHIFT       24
+        struct regpair lun;
+        __le32 itt;
+        __le32 expected_transfer_length;
+        __le32 cmd_sn;
         __le32 exp_stat_sn;
+        __le32 cdb[4];
 };
 
+/* iSCSI Command PDU header with Extended CDB (Initiator Mode) */
 struct iscsi_ext_cdb_cmd_hdr {
         __le16 reserved1;
         u8 flags_attr;
-#define ISCSI_EXT_CDB_CMD_HDR_ATTR_MASK          0x7
-#define ISCSI_EXT_CDB_CMD_HDR_ATTR_SHIFT         0
-#define ISCSI_EXT_CDB_CMD_HDR_RSRV_MASK          0x3
-#define ISCSI_EXT_CDB_CMD_HDR_RSRV_SHIFT         3
-#define ISCSI_EXT_CDB_CMD_HDR_WRITE_MASK         0x1
-#define ISCSI_EXT_CDB_CMD_HDR_WRITE_SHIFT        5
-#define ISCSI_EXT_CDB_CMD_HDR_READ_MASK          0x1
-#define ISCSI_EXT_CDB_CMD_HDR_READ_SHIFT         6
-#define ISCSI_EXT_CDB_CMD_HDR_FINAL_MASK         0x1
-#define ISCSI_EXT_CDB_CMD_HDR_FINAL_SHIFT        7
+#define ISCSI_EXT_CDB_CMD_HDR_ATTR_MASK         0x7
+#define ISCSI_EXT_CDB_CMD_HDR_ATTR_SHIFT        0
+#define ISCSI_EXT_CDB_CMD_HDR_RSRV_MASK         0x3
+#define ISCSI_EXT_CDB_CMD_HDR_RSRV_SHIFT        3
+#define ISCSI_EXT_CDB_CMD_HDR_WRITE_MASK        0x1
+#define ISCSI_EXT_CDB_CMD_HDR_WRITE_SHIFT       5
+#define ISCSI_EXT_CDB_CMD_HDR_READ_MASK         0x1
+#define ISCSI_EXT_CDB_CMD_HDR_READ_SHIFT        6
+#define ISCSI_EXT_CDB_CMD_HDR_FINAL_MASK        0x1
+#define ISCSI_EXT_CDB_CMD_HDR_FINAL_SHIFT       7
         u8 opcode;
         __le32 hdr_second_dword;
-#define ISCSI_EXT_CDB_CMD_HDR_DATA_SEG_LEN_MASK  0xFFFFFF
-#define ISCSI_EXT_CDB_CMD_HDR_DATA_SEG_LEN_SHIFT 0
-#define ISCSI_EXT_CDB_CMD_HDR_CDB_SIZE_MASK      0xFF
-#define ISCSI_EXT_CDB_CMD_HDR_CDB_SIZE_SHIFT     24
+#define ISCSI_EXT_CDB_CMD_HDR_DATA_SEG_LEN_MASK         0xFFFFFF
+#define ISCSI_EXT_CDB_CMD_HDR_DATA_SEG_LEN_SHIFT        0
+#define ISCSI_EXT_CDB_CMD_HDR_CDB_SIZE_MASK             0xFF
+#define ISCSI_EXT_CDB_CMD_HDR_CDB_SIZE_SHIFT            24
         struct regpair lun;
         __le32 itt;
         __le32 expected_transfer_length;
@@ -303,26 +332,27 @@ struct iscsi_ext_cdb_cmd_hdr {
         struct scsi_sge cdb_sge;
 };
 
+/* iSCSI login request PDU header */
 struct iscsi_login_req_hdr {
         u8 version_min;
         u8 version_max;
         u8 flags_attr;
-#define ISCSI_LOGIN_REQ_HDR_NSG_MASK            0x3
-#define ISCSI_LOGIN_REQ_HDR_NSG_SHIFT           0
-#define ISCSI_LOGIN_REQ_HDR_CSG_MASK            0x3
-#define ISCSI_LOGIN_REQ_HDR_CSG_SHIFT           2
-#define ISCSI_LOGIN_REQ_HDR_RSRV_MASK           0x3
-#define ISCSI_LOGIN_REQ_HDR_RSRV_SHIFT          4
-#define ISCSI_LOGIN_REQ_HDR_C_MASK              0x1
-#define ISCSI_LOGIN_REQ_HDR_C_SHIFT             6
-#define ISCSI_LOGIN_REQ_HDR_T_MASK              0x1
-#define ISCSI_LOGIN_REQ_HDR_T_SHIFT             7
+#define ISCSI_LOGIN_REQ_HDR_NSG_MASK    0x3
+#define ISCSI_LOGIN_REQ_HDR_NSG_SHIFT   0
+#define ISCSI_LOGIN_REQ_HDR_CSG_MASK    0x3
+#define ISCSI_LOGIN_REQ_HDR_CSG_SHIFT   2
+#define ISCSI_LOGIN_REQ_HDR_RSRV_MASK   0x3
+#define ISCSI_LOGIN_REQ_HDR_RSRV_SHIFT  4
+#define ISCSI_LOGIN_REQ_HDR_C_MASK      0x1
+#define ISCSI_LOGIN_REQ_HDR_C_SHIFT     6
+#define ISCSI_LOGIN_REQ_HDR_T_MASK      0x1
+#define ISCSI_LOGIN_REQ_HDR_T_SHIFT     7
         u8 opcode;
         __le32 hdr_second_dword;
-#define ISCSI_LOGIN_REQ_HDR_DATA_SEG_LEN_MASK   0xFFFFFF
-#define ISCSI_LOGIN_REQ_HDR_DATA_SEG_LEN_SHIFT  0
-#define ISCSI_LOGIN_REQ_HDR_TOTAL_AHS_LEN_MASK  0xFF
-#define ISCSI_LOGIN_REQ_HDR_TOTAL_AHS_LEN_SHIFT 24
+#define ISCSI_LOGIN_REQ_HDR_DATA_SEG_LEN_MASK   0xFFFFFF
+#define ISCSI_LOGIN_REQ_HDR_DATA_SEG_LEN_SHIFT  0
+#define ISCSI_LOGIN_REQ_HDR_TOTAL_AHS_LEN_MASK  0xFF
+#define ISCSI_LOGIN_REQ_HDR_TOTAL_AHS_LEN_SHIFT 24
         __le32 isid_tabc;
         __le16 tsih;
         __le16 isid_d;
@@ -334,6 +364,7 @@ struct iscsi_login_req_hdr {
         __le32 reserved2[4];
 };
 
+/* iSCSI logout request PDU header */
 struct iscsi_logout_req_hdr {
         __le16 reserved0;
         u8 reason_code;
@@ -348,13 +379,14 @@ struct iscsi_logout_req_hdr {
         __le32 reserved4[4];
 };
 
+/* iSCSI Data-out PDU header */
 struct iscsi_data_out_hdr {
         __le16 reserved1;
         u8 flags_attr;
-#define ISCSI_DATA_OUT_HDR_RSRV_MASK   0x7F
-#define ISCSI_DATA_OUT_HDR_RSRV_SHIFT  0
-#define ISCSI_DATA_OUT_HDR_FINAL_MASK  0x1
-#define ISCSI_DATA_OUT_HDR_FINAL_SHIFT 7
+#define ISCSI_DATA_OUT_HDR_RSRV_MASK    0x7F
+#define ISCSI_DATA_OUT_HDR_RSRV_SHIFT   0
+#define ISCSI_DATA_OUT_HDR_FINAL_MASK   0x1
+#define ISCSI_DATA_OUT_HDR_FINAL_SHIFT  7
         u8 opcode;
         __le32 reserved2;
         struct regpair lun;
@@ -368,22 +400,23 @@ struct iscsi_data_out_hdr {
         __le32 reserved5;
 };
 
+/* iSCSI Data-in PDU header */
 struct iscsi_data_in_hdr {
         u8 status_rsvd;
         u8 reserved1;
         u8 flags;
-#define ISCSI_DATA_IN_HDR_STATUS_MASK     0x1
-#define ISCSI_DATA_IN_HDR_STATUS_SHIFT    0
-#define ISCSI_DATA_IN_HDR_UNDERFLOW_MASK  0x1
-#define ISCSI_DATA_IN_HDR_UNDERFLOW_SHIFT 1
-#define ISCSI_DATA_IN_HDR_OVERFLOW_MASK   0x1
-#define ISCSI_DATA_IN_HDR_OVERFLOW_SHIFT  2
-#define ISCSI_DATA_IN_HDR_RSRV_MASK       0x7
-#define ISCSI_DATA_IN_HDR_RSRV_SHIFT      3
-#define ISCSI_DATA_IN_HDR_ACK_MASK        0x1
-#define ISCSI_DATA_IN_HDR_ACK_SHIFT       6
-#define ISCSI_DATA_IN_HDR_FINAL_MASK      0x1
-#define ISCSI_DATA_IN_HDR_FINAL_SHIFT     7
+#define ISCSI_DATA_IN_HDR_STATUS_MASK           0x1
+#define ISCSI_DATA_IN_HDR_STATUS_SHIFT          0
+#define ISCSI_DATA_IN_HDR_UNDERFLOW_MASK        0x1
+#define ISCSI_DATA_IN_HDR_UNDERFLOW_SHIFT       1
+#define ISCSI_DATA_IN_HDR_OVERFLOW_MASK         0x1
+#define ISCSI_DATA_IN_HDR_OVERFLOW_SHIFT        2
+#define ISCSI_DATA_IN_HDR_RSRV_MASK             0x7
+#define ISCSI_DATA_IN_HDR_RSRV_SHIFT            3
+#define ISCSI_DATA_IN_HDR_ACK_MASK              0x1
+#define ISCSI_DATA_IN_HDR_ACK_SHIFT             6
+#define ISCSI_DATA_IN_HDR_FINAL_MASK            0x1
+#define ISCSI_DATA_IN_HDR_FINAL_SHIFT           7
         u8 opcode;
         __le32 reserved2;
         struct regpair lun;
@@ -397,6 +430,7 @@ struct iscsi_data_in_hdr {
         __le32 residual_count;
 };
 
+/* iSCSI R2T PDU header */
 struct iscsi_r2t_hdr {
         u8 reserved0[3];
         u8 opcode;
@@ -412,13 +446,14 @@ struct iscsi_r2t_hdr {
         __le32 desired_data_trns_len;
 };
 
+/* iSCSI NOP-out PDU header */
 struct iscsi_nop_out_hdr {
         __le16 reserved1;
         u8 flags_attr;
-#define ISCSI_NOP_OUT_HDR_RSRV_MASK    0x7F
-#define ISCSI_NOP_OUT_HDR_RSRV_SHIFT   0
-#define ISCSI_NOP_OUT_HDR_CONST1_MASK  0x1
-#define ISCSI_NOP_OUT_HDR_CONST1_SHIFT 7
+#define ISCSI_NOP_OUT_HDR_RSRV_MASK     0x7F
+#define ISCSI_NOP_OUT_HDR_RSRV_SHIFT    0
+#define ISCSI_NOP_OUT_HDR_CONST1_MASK   0x1
+#define ISCSI_NOP_OUT_HDR_CONST1_SHIFT  7
         u8 opcode;
         __le32 reserved2;
         struct regpair lun;
@@ -432,19 +467,20 @@ struct iscsi_nop_out_hdr {
         __le32 reserved6;
 };
 
+/* iSCSI NOP-in PDU header */
 struct iscsi_nop_in_hdr {
         __le16 reserved0;
         u8 flags_attr;
-#define ISCSI_NOP_IN_HDR_RSRV_MASK           0x7F
-#define ISCSI_NOP_IN_HDR_RSRV_SHIFT          0
-#define ISCSI_NOP_IN_HDR_CONST1_MASK         0x1
-#define ISCSI_NOP_IN_HDR_CONST1_SHIFT        7
+#define ISCSI_NOP_IN_HDR_RSRV_MASK      0x7F
+#define ISCSI_NOP_IN_HDR_RSRV_SHIFT     0
+#define ISCSI_NOP_IN_HDR_CONST1_MASK    0x1
+#define ISCSI_NOP_IN_HDR_CONST1_SHIFT   7
         u8 opcode;
         __le32 hdr_second_dword;
-#define ISCSI_NOP_IN_HDR_DATA_SEG_LEN_MASK   0xFFFFFF
-#define ISCSI_NOP_IN_HDR_DATA_SEG_LEN_SHIFT  0
-#define ISCSI_NOP_IN_HDR_TOTAL_AHS_LEN_MASK  0xFF
-#define ISCSI_NOP_IN_HDR_TOTAL_AHS_LEN_SHIFT 24
+#define ISCSI_NOP_IN_HDR_DATA_SEG_LEN_MASK      0xFFFFFF
+#define ISCSI_NOP_IN_HDR_DATA_SEG_LEN_SHIFT     0
+#define ISCSI_NOP_IN_HDR_TOTAL_AHS_LEN_MASK     0xFF
+#define ISCSI_NOP_IN_HDR_TOTAL_AHS_LEN_SHIFT    24
         struct regpair lun;
         __le32 itt;
         __le32 ttt;
@@ -456,26 +492,27 @@ struct iscsi_nop_in_hdr {
         __le32 reserved7;
 };
 
+/* iSCSI Login Response PDU header */
 struct iscsi_login_response_hdr {
         u8 version_active;
         u8 version_max;
         u8 flags_attr;
-#define ISCSI_LOGIN_RESPONSE_HDR_NSG_MASK            0x3
-#define ISCSI_LOGIN_RESPONSE_HDR_NSG_SHIFT           0
-#define ISCSI_LOGIN_RESPONSE_HDR_CSG_MASK            0x3
-#define ISCSI_LOGIN_RESPONSE_HDR_CSG_SHIFT           2
-#define ISCSI_LOGIN_RESPONSE_HDR_RSRV_MASK           0x3
-#define ISCSI_LOGIN_RESPONSE_HDR_RSRV_SHIFT          4
-#define ISCSI_LOGIN_RESPONSE_HDR_C_MASK              0x1
-#define ISCSI_LOGIN_RESPONSE_HDR_C_SHIFT             6
-#define ISCSI_LOGIN_RESPONSE_HDR_T_MASK              0x1
-#define ISCSI_LOGIN_RESPONSE_HDR_T_SHIFT             7
+#define ISCSI_LOGIN_RESPONSE_HDR_NSG_MASK       0x3
+#define ISCSI_LOGIN_RESPONSE_HDR_NSG_SHIFT      0
+#define ISCSI_LOGIN_RESPONSE_HDR_CSG_MASK       0x3
+#define ISCSI_LOGIN_RESPONSE_HDR_CSG_SHIFT      2
+#define ISCSI_LOGIN_RESPONSE_HDR_RSRV_MASK      0x3
+#define ISCSI_LOGIN_RESPONSE_HDR_RSRV_SHIFT     4
+#define ISCSI_LOGIN_RESPONSE_HDR_C_MASK         0x1
+#define ISCSI_LOGIN_RESPONSE_HDR_C_SHIFT        6
+#define ISCSI_LOGIN_RESPONSE_HDR_T_MASK         0x1
+#define ISCSI_LOGIN_RESPONSE_HDR_T_SHIFT        7
         u8 opcode;
         __le32 hdr_second_dword;
-#define ISCSI_LOGIN_RESPONSE_HDR_DATA_SEG_LEN_MASK   0xFFFFFF
-#define ISCSI_LOGIN_RESPONSE_HDR_DATA_SEG_LEN_SHIFT  0
-#define ISCSI_LOGIN_RESPONSE_HDR_TOTAL_AHS_LEN_MASK  0xFF
-#define ISCSI_LOGIN_RESPONSE_HDR_TOTAL_AHS_LEN_SHIFT 24
+#define ISCSI_LOGIN_RESPONSE_HDR_DATA_SEG_LEN_MASK      0xFFFFFF
+#define ISCSI_LOGIN_RESPONSE_HDR_DATA_SEG_LEN_SHIFT     0
+#define ISCSI_LOGIN_RESPONSE_HDR_TOTAL_AHS_LEN_MASK     0xFF
+#define ISCSI_LOGIN_RESPONSE_HDR_TOTAL_AHS_LEN_SHIFT    24
         __le32 isid_tabc;
         __le16 tsih;
         __le16 isid_d;
@@ -490,16 +527,17 @@ struct iscsi_login_response_hdr {
         __le32 reserved4[2];
 };
 
+/* iSCSI Logout Response PDU header */
 struct iscsi_logout_response_hdr {
         u8 reserved1;
         u8 response;
         u8 flags;
         u8 opcode;
         __le32 hdr_second_dword;
-#define ISCSI_LOGOUT_RESPONSE_HDR_DATA_SEG_LEN_MASK   0xFFFFFF
-#define ISCSI_LOGOUT_RESPONSE_HDR_DATA_SEG_LEN_SHIFT  0
-#define ISCSI_LOGOUT_RESPONSE_HDR_TOTAL_AHS_LEN_MASK  0xFF
-#define ISCSI_LOGOUT_RESPONSE_HDR_TOTAL_AHS_LEN_SHIFT 24
+#define ISCSI_LOGOUT_RESPONSE_HDR_DATA_SEG_LEN_MASK     0xFFFFFF
+#define ISCSI_LOGOUT_RESPONSE_HDR_DATA_SEG_LEN_SHIFT    0
+#define ISCSI_LOGOUT_RESPONSE_HDR_TOTAL_AHS_LEN_MASK    0xFF
+#define ISCSI_LOGOUT_RESPONSE_HDR_TOTAL_AHS_LEN_SHIFT   24
         __le32 reserved2[2];
         __le32 itt;
         __le32 reserved3;
@@ -512,21 +550,22 @@ struct iscsi_logout_response_hdr {
         __le32 reserved5[1];
 };
 
+/* iSCSI Text Request PDU header */
 struct iscsi_text_request_hdr {
         __le16 reserved0;
         u8 flags_attr;
-#define ISCSI_TEXT_REQUEST_HDR_RSRV_MASK           0x3F
-#define ISCSI_TEXT_REQUEST_HDR_RSRV_SHIFT          0
-#define ISCSI_TEXT_REQUEST_HDR_C_MASK              0x1
-#define ISCSI_TEXT_REQUEST_HDR_C_SHIFT             6
-#define ISCSI_TEXT_REQUEST_HDR_F_MASK              0x1
-#define ISCSI_TEXT_REQUEST_HDR_F_SHIFT             7
+#define ISCSI_TEXT_REQUEST_HDR_RSRV_MASK        0x3F
+#define ISCSI_TEXT_REQUEST_HDR_RSRV_SHIFT       0
+#define ISCSI_TEXT_REQUEST_HDR_C_MASK           0x1
+#define ISCSI_TEXT_REQUEST_HDR_C_SHIFT          6
+#define ISCSI_TEXT_REQUEST_HDR_F_MASK           0x1
+#define ISCSI_TEXT_REQUEST_HDR_F_SHIFT          7
         u8 opcode;
         __le32 hdr_second_dword;
-#define ISCSI_TEXT_REQUEST_HDR_DATA_SEG_LEN_MASK   0xFFFFFF
-#define ISCSI_TEXT_REQUEST_HDR_DATA_SEG_LEN_SHIFT  0
-#define ISCSI_TEXT_REQUEST_HDR_TOTAL_AHS_LEN_MASK  0xFF
-#define ISCSI_TEXT_REQUEST_HDR_TOTAL_AHS_LEN_SHIFT 24
+#define ISCSI_TEXT_REQUEST_HDR_DATA_SEG_LEN_MASK        0xFFFFFF
+#define ISCSI_TEXT_REQUEST_HDR_DATA_SEG_LEN_SHIFT       0
+#define ISCSI_TEXT_REQUEST_HDR_TOTAL_AHS_LEN_MASK       0xFF
+#define ISCSI_TEXT_REQUEST_HDR_TOTAL_AHS_LEN_SHIFT      24
         struct regpair lun;
         __le32 itt;
         __le32 ttt;
@@ -535,21 +574,22 @@ struct iscsi_text_request_hdr {
         __le32 reserved4[4];
 };
 
+/* iSCSI Text Response PDU header */
 struct iscsi_text_response_hdr {
         __le16 reserved1;
         u8 flags;
-#define ISCSI_TEXT_RESPONSE_HDR_RSRV_MASK           0x3F
-#define ISCSI_TEXT_RESPONSE_HDR_RSRV_SHIFT          0
-#define ISCSI_TEXT_RESPONSE_HDR_C_MASK              0x1
-#define ISCSI_TEXT_RESPONSE_HDR_C_SHIFT             6
-#define ISCSI_TEXT_RESPONSE_HDR_F_MASK              0x1
-#define ISCSI_TEXT_RESPONSE_HDR_F_SHIFT             7
+#define ISCSI_TEXT_RESPONSE_HDR_RSRV_MASK       0x3F
+#define ISCSI_TEXT_RESPONSE_HDR_RSRV_SHIFT      0
+#define ISCSI_TEXT_RESPONSE_HDR_C_MASK          0x1
+#define ISCSI_TEXT_RESPONSE_HDR_C_SHIFT         6
+#define ISCSI_TEXT_RESPONSE_HDR_F_MASK          0x1
+#define ISCSI_TEXT_RESPONSE_HDR_F_SHIFT         7
         u8 opcode;
         __le32 hdr_second_dword;
-#define ISCSI_TEXT_RESPONSE_HDR_DATA_SEG_LEN_MASK   0xFFFFFF
-#define ISCSI_TEXT_RESPONSE_HDR_DATA_SEG_LEN_SHIFT  0
-#define ISCSI_TEXT_RESPONSE_HDR_TOTAL_AHS_LEN_MASK  0xFF
-#define ISCSI_TEXT_RESPONSE_HDR_TOTAL_AHS_LEN_SHIFT 24
+#define ISCSI_TEXT_RESPONSE_HDR_DATA_SEG_LEN_MASK       0xFFFFFF
+#define ISCSI_TEXT_RESPONSE_HDR_DATA_SEG_LEN_SHIFT      0
+#define ISCSI_TEXT_RESPONSE_HDR_TOTAL_AHS_LEN_MASK      0xFF
+#define ISCSI_TEXT_RESPONSE_HDR_TOTAL_AHS_LEN_SHIFT     24
         struct regpair lun;
         __le32 itt;
         __le32 ttt;
@@ -559,15 +599,16 @@ struct iscsi_text_response_hdr {
         __le32 reserved4[3];
 };
 
+/* iSCSI TMF Request PDU header */
 struct iscsi_tmf_request_hdr {
         __le16 reserved0;
         u8 function;
         u8 opcode;
         __le32 hdr_second_dword;
-#define ISCSI_TMF_REQUEST_HDR_DATA_SEG_LEN_MASK   0xFFFFFF
-#define ISCSI_TMF_REQUEST_HDR_DATA_SEG_LEN_SHIFT  0
-#define ISCSI_TMF_REQUEST_HDR_TOTAL_AHS_LEN_MASK  0xFF
-#define ISCSI_TMF_REQUEST_HDR_TOTAL_AHS_LEN_SHIFT 24
+#define ISCSI_TMF_REQUEST_HDR_DATA_SEG_LEN_MASK         0xFFFFFF
+#define ISCSI_TMF_REQUEST_HDR_DATA_SEG_LEN_SHIFT        0
+#define ISCSI_TMF_REQUEST_HDR_TOTAL_AHS_LEN_MASK        0xFF
+#define ISCSI_TMF_REQUEST_HDR_TOTAL_AHS_LEN_SHIFT       24
         struct regpair lun;
         __le32 itt;
         __le32 rtt;
@@ -584,10 +625,10 @@ struct iscsi_tmf_response_hdr {
         u8 hdr_flags;
         u8 opcode;
         __le32 hdr_second_dword;
-#define ISCSI_TMF_RESPONSE_HDR_DATA_SEG_LEN_MASK   0xFFFFFF
-#define ISCSI_TMF_RESPONSE_HDR_DATA_SEG_LEN_SHIFT  0
-#define ISCSI_TMF_RESPONSE_HDR_TOTAL_AHS_LEN_MASK  0xFF
-#define ISCSI_TMF_RESPONSE_HDR_TOTAL_AHS_LEN_SHIFT 24
+#define ISCSI_TMF_RESPONSE_HDR_DATA_SEG_LEN_MASK        0xFFFFFF
+#define ISCSI_TMF_RESPONSE_HDR_DATA_SEG_LEN_SHIFT       0
+#define ISCSI_TMF_RESPONSE_HDR_TOTAL_AHS_LEN_MASK       0xFF
+#define ISCSI_TMF_RESPONSE_HDR_TOTAL_AHS_LEN_SHIFT      24
         struct regpair reserved0;
         __le32 itt;
         __le32 reserved1;
@@ -597,16 +638,17 @@ struct iscsi_tmf_response_hdr {
         __le32 reserved4[3];
 };
 
+/* iSCSI Response PDU header */
 struct iscsi_response_hdr {
         u8 hdr_status;
         u8 hdr_response;
         u8 hdr_flags;
         u8 opcode;
         __le32 hdr_second_dword;
-#define ISCSI_RESPONSE_HDR_DATA_SEG_LEN_MASK   0xFFFFFF
-#define ISCSI_RESPONSE_HDR_DATA_SEG_LEN_SHIFT  0
-#define ISCSI_RESPONSE_HDR_TOTAL_AHS_LEN_MASK  0xFF
-#define ISCSI_RESPONSE_HDR_TOTAL_AHS_LEN_SHIFT 24
+#define ISCSI_RESPONSE_HDR_DATA_SEG_LEN_MASK    0xFFFFFF
+#define ISCSI_RESPONSE_HDR_DATA_SEG_LEN_SHIFT   0
+#define ISCSI_RESPONSE_HDR_TOTAL_AHS_LEN_MASK   0xFF
+#define ISCSI_RESPONSE_HDR_TOTAL_AHS_LEN_SHIFT  24
         struct regpair lun;
         __le32 itt;
         __le32 snack_tag;
@@ -618,16 +660,17 @@ struct iscsi_response_hdr {
         __le32 residual_count;
 };
 
+/* iSCSI Reject PDU header */
 struct iscsi_reject_hdr {
         u8 reserved4;
         u8 hdr_reason;
         u8 hdr_flags;
         u8 opcode;
         __le32 hdr_second_dword;
-#define ISCSI_REJECT_HDR_DATA_SEG_LEN_MASK   0xFFFFFF
-#define ISCSI_REJECT_HDR_DATA_SEG_LEN_SHIFT  0
-#define ISCSI_REJECT_HDR_TOTAL_AHS_LEN_MASK  0xFF
-#define ISCSI_REJECT_HDR_TOTAL_AHS_LEN_SHIFT 24
+#define ISCSI_REJECT_HDR_DATA_SEG_LEN_MASK      0xFFFFFF
+#define ISCSI_REJECT_HDR_DATA_SEG_LEN_SHIFT     0
+#define ISCSI_REJECT_HDR_TOTAL_AHS_LEN_MASK     0xFF
+#define ISCSI_REJECT_HDR_TOTAL_AHS_LEN_SHIFT    24
         struct regpair reserved0;
         __le32 all_ones;
         __le32 reserved2;
@@ -638,6 +681,35 @@ struct iscsi_reject_hdr {
         __le32 reserved3[2];
 };
 
+/* iSCSI Asynchronous Message PDU header */
+struct iscsi_async_msg_hdr {
+        __le16 reserved0;
+        u8 flags_attr;
+#define ISCSI_ASYNC_MSG_HDR_RSRV_MASK           0x7F
+#define ISCSI_ASYNC_MSG_HDR_RSRV_SHIFT          0
+#define ISCSI_ASYNC_MSG_HDR_CONST1_MASK         0x1
+#define ISCSI_ASYNC_MSG_HDR_CONST1_SHIFT        7
+        u8 opcode;
+        __le32 hdr_second_dword;
+#define ISCSI_ASYNC_MSG_HDR_DATA_SEG_LEN_MASK   0xFFFFFF
+#define ISCSI_ASYNC_MSG_HDR_DATA_SEG_LEN_SHIFT  0
+#define ISCSI_ASYNC_MSG_HDR_TOTAL_AHS_LEN_MASK  0xFF
+#define ISCSI_ASYNC_MSG_HDR_TOTAL_AHS_LEN_SHIFT 24
+        struct regpair lun;
+        __le32 all_ones;
+        __le32 reserved1;
+        __le32 stat_sn;
+        __le32 exp_cmd_sn;
+        __le32 max_cmd_sn;
+        __le16 param1_rsrv;
+        u8 async_vcode;
+        u8 async_event;
+        __le16 param3_rsrv;
+        __le16 param2_rsrv;
+        __le32 reserved7;
+};
+
+/* PDU header part of Ystorm task context */
 union iscsi_task_hdr {
         struct iscsi_common_hdr common;
         struct data_hdr data;
@@ -661,6 +733,348 @@ union iscsi_task_hdr {
         struct iscsi_async_msg_hdr async_msg;
 };
 
+/* The iscsi storm task context of Ystorm */
+struct ystorm_iscsi_task_st_ctx {
+        struct ystorm_iscsi_task_state state;
+        struct ystorm_iscsi_task_rxmit_opt rxmit_opt;
+        union iscsi_task_hdr pdu_hdr;
+};
+
+struct e4_ystorm_iscsi_task_ag_ctx {
+        u8 reserved;
+        u8 byte1;
+        __le16 word0;
+        u8 flags0;
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_NIBBLE0_MASK        0xF
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_NIBBLE0_SHIFT       0
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_BIT0_MASK           0x1
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_BIT0_SHIFT          4
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_BIT1_MASK           0x1
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_BIT1_SHIFT          5
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_VALID_MASK          0x1
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_VALID_SHIFT         6
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_BIT3_MASK           0x1
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_BIT3_SHIFT          7
+        u8 flags1;
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_CF0_MASK            0x3
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_CF0_SHIFT           0
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_CF1_MASK            0x3
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_CF1_SHIFT           2
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_CF2SPECIAL_MASK     0x3
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_CF2SPECIAL_SHIFT    4
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_CF0EN_MASK          0x1
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_CF0EN_SHIFT         6
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_CF1EN_MASK          0x1
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_CF1EN_SHIFT         7
+        u8 flags2;
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_BIT4_MASK           0x1
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_BIT4_SHIFT          0
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_RULE0EN_MASK        0x1
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_RULE0EN_SHIFT       1
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_RULE1EN_MASK        0x1
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_RULE1EN_SHIFT       2
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_RULE2EN_MASK        0x1
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_RULE2EN_SHIFT       3
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_RULE3EN_MASK        0x1
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_RULE3EN_SHIFT       4
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_RULE4EN_MASK        0x1
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_RULE4EN_SHIFT       5
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_RULE5EN_MASK        0x1
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_RULE5EN_SHIFT       6
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_RULE6EN_MASK        0x1
+#define E4_YSTORM_ISCSI_TASK_AG_CTX_RULE6EN_SHIFT       7
+        u8 byte2;
+        __le32 TTT;
+        u8 byte3;
+        u8 byte4;
+        __le16 word1;
+};
+
+struct e4_mstorm_iscsi_task_ag_ctx {
+        u8 cdu_validation;
+        u8 byte1;
+        __le16 task_cid;
+        u8 flags0;
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_CONNECTION_TYPE_MASK        0xF
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_CONNECTION_TYPE_SHIFT       0
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_EXIST_IN_QM0_MASK           0x1
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_EXIST_IN_QM0_SHIFT          4
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_BIT1_MASK                   0x1
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_BIT1_SHIFT                  5
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_VALID_MASK                  0x1
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_VALID_SHIFT                 6
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_TASK_CLEANUP_FLAG_MASK      0x1
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_TASK_CLEANUP_FLAG_SHIFT     7
+        u8 flags1;
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_TASK_CLEANUP_CF_MASK        0x3
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_TASK_CLEANUP_CF_SHIFT       0
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_CF1_MASK                    0x3
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_CF1_SHIFT                   2
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_CF2_MASK                    0x3
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_CF2_SHIFT                   4
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_TASK_CLEANUP_CF_EN_MASK     0x1
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_TASK_CLEANUP_CF_EN_SHIFT    6
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_CF1EN_MASK                  0x1
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_CF1EN_SHIFT                 7
+        u8 flags2;
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_CF2EN_MASK          0x1
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_CF2EN_SHIFT         0
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_RULE0EN_MASK        0x1
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_RULE0EN_SHIFT       1
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_RULE1EN_MASK        0x1
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_RULE1EN_SHIFT       2
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_RULE2EN_MASK        0x1
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_RULE2EN_SHIFT       3
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_RULE3EN_MASK        0x1
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_RULE3EN_SHIFT       4
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_RULE4EN_MASK        0x1
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_RULE4EN_SHIFT       5
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_RULE5EN_MASK        0x1
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_RULE5EN_SHIFT       6
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_RULE6EN_MASK        0x1
+#define E4_MSTORM_ISCSI_TASK_AG_CTX_RULE6EN_SHIFT       7
+        u8 byte2;
+        __le32 reg0;
+        u8 byte3;
+        u8 byte4;
+        __le16 word1;
+};
+
+struct e4_ustorm_iscsi_task_ag_ctx {
+        u8 reserved;
+        u8 state;
+        __le16 icid;
+        u8 flags0;
+#define E4_USTORM_ISCSI_TASK_AG_CTX_CONNECTION_TYPE_MASK        0xF
+#define E4_USTORM_ISCSI_TASK_AG_CTX_CONNECTION_TYPE_SHIFT       0
+#define E4_USTORM_ISCSI_TASK_AG_CTX_EXIST_IN_QM0_MASK           0x1
+#define E4_USTORM_ISCSI_TASK_AG_CTX_EXIST_IN_QM0_SHIFT          4
+#define E4_USTORM_ISCSI_TASK_AG_CTX_BIT1_MASK                   0x1
+#define E4_USTORM_ISCSI_TASK_AG_CTX_BIT1_SHIFT                  5
+#define E4_USTORM_ISCSI_TASK_AG_CTX_HQ_SCANNED_CF_MASK          0x3
+#define E4_USTORM_ISCSI_TASK_AG_CTX_HQ_SCANNED_CF_SHIFT         6
+        u8 flags1;
+#define E4_USTORM_ISCSI_TASK_AG_CTX_RESERVED1_MASK      0x3
+#define E4_USTORM_ISCSI_TASK_AG_CTX_RESERVED1_SHIFT     0
+#define E4_USTORM_ISCSI_TASK_AG_CTX_R2T2RECV_MASK       0x3
+#define E4_USTORM_ISCSI_TASK_AG_CTX_R2T2RECV_SHIFT      2
+#define E4_USTORM_ISCSI_TASK_AG_CTX_CF3_MASK            0x3
+#define E4_USTORM_ISCSI_TASK_AG_CTX_CF3_SHIFT           4
+#define E4_USTORM_ISCSI_TASK_AG_CTX_DIF_ERROR_CF_MASK   0x3
+#define E4_USTORM_ISCSI_TASK_AG_CTX_DIF_ERROR_CF_SHIFT  6
+        u8 flags2;
+#define E4_USTORM_ISCSI_TASK_AG_CTX_HQ_SCANNED_CF_EN_MASK       0x1
+#define E4_USTORM_ISCSI_TASK_AG_CTX_HQ_SCANNED_CF_EN_SHIFT      0
+#define E4_USTORM_ISCSI_TASK_AG_CTX_DISABLE_DATA_ACKED_MASK     0x1
+#define E4_USTORM_ISCSI_TASK_AG_CTX_DISABLE_DATA_ACKED_SHIFT    1
+#define E4_USTORM_ISCSI_TASK_AG_CTX_R2T2RECV_EN_MASK            0x1
+#define E4_USTORM_ISCSI_TASK_AG_CTX_R2T2RECV_EN_SHIFT           2
+#define E4_USTORM_ISCSI_TASK_AG_CTX_CF3EN_MASK                  0x1
+#define E4_USTORM_ISCSI_TASK_AG_CTX_CF3EN_SHIFT                 3
+#define E4_USTORM_ISCSI_TASK_AG_CTX_DIF_ERROR_CF_EN_MASK        0x1
+#define E4_USTORM_ISCSI_TASK_AG_CTX_DIF_ERROR_CF_EN_SHIFT       4
+#define E4_USTORM_ISCSI_TASK_AG_CTX_CMP_DATA_TOTAL_EXP_EN_MASK  0x1
+#define E4_USTORM_ISCSI_TASK_AG_CTX_CMP_DATA_TOTAL_EXP_EN_SHIFT 5
+#define E4_USTORM_ISCSI_TASK_AG_CTX_RULE1EN_MASK                0x1
+#define E4_USTORM_ISCSI_TASK_AG_CTX_RULE1EN_SHIFT               6
+#define E4_USTORM_ISCSI_TASK_AG_CTX_CMP_CONT_RCV_EXP_EN_MASK    0x1
+#define E4_USTORM_ISCSI_TASK_AG_CTX_CMP_CONT_RCV_EXP_EN_SHIFT   7
+        u8 flags3;
+#define E4_USTORM_ISCSI_TASK_AG_CTX_RULE3EN_MASK                0x1
+#define E4_USTORM_ISCSI_TASK_AG_CTX_RULE3EN_SHIFT               0
+#define E4_USTORM_ISCSI_TASK_AG_CTX_RULE4EN_MASK                0x1
+#define E4_USTORM_ISCSI_TASK_AG_CTX_RULE4EN_SHIFT               1
+#define E4_USTORM_ISCSI_TASK_AG_CTX_RULE5EN_MASK                0x1
+#define E4_USTORM_ISCSI_TASK_AG_CTX_RULE5EN_SHIFT               2
+#define E4_USTORM_ISCSI_TASK_AG_CTX_RULE6EN_MASK                0x1
+#define E4_USTORM_ISCSI_TASK_AG_CTX_RULE6EN_SHIFT               3
+#define E4_USTORM_ISCSI_TASK_AG_CTX_DIF_ERROR_TYPE_MASK         0xF
+#define E4_USTORM_ISCSI_TASK_AG_CTX_DIF_ERROR_TYPE_SHIFT        4
+        __le32 dif_err_intervals;
+        __le32 dif_error_1st_interval;
+        __le32 rcv_cont_len;
+        __le32 exp_cont_len;
+        __le32 total_data_acked;
+        __le32 exp_data_acked;
+        u8 next_tid_valid;
+        u8 byte3;
+        __le16 word1;
+        __le16 next_tid;
+        __le16 word3;
+        __le32 hdr_residual_count;
+        __le32 exp_r2t_sn;
+};
+
+/* The iscsi storm task context of Mstorm */
+struct mstorm_iscsi_task_st_ctx {
+        struct scsi_cached_sges data_desc;
+        struct scsi_sgl_params sgl_params;
+        __le32 rem_task_size;
+        __le32 data_buffer_offset;
+        u8 task_type;
+        struct iscsi_dif_flags dif_flags;
+        __le16 dif_task_icid;
+        struct regpair sense_db;
+        __le32 expected_itt;
+        __le32 reserved1;
+};
+
+struct iscsi_reg1 {
+        __le32 reg1_map;
+#define ISCSI_REG1_NUM_SGES_MASK        0xF
+#define ISCSI_REG1_NUM_SGES_SHIFT       0
+#define ISCSI_REG1_RESERVED1_MASK       0xFFFFFFF
+#define ISCSI_REG1_RESERVED1_SHIFT      4
+};
+
+struct tqe_opaque {
+        __le16 opaque[2];
+};
+
+/* The iscsi storm task context of Ustorm */
+struct ustorm_iscsi_task_st_ctx {
+        __le32 rem_rcv_len;
+        __le32 exp_data_transfer_len;
+        __le32 exp_data_sn;
+        struct regpair lun;
+        struct iscsi_reg1 reg1;
+        u8 flags2;
+#define USTORM_ISCSI_TASK_ST_CTX_AHS_EXIST_MASK         0x1
+#define USTORM_ISCSI_TASK_ST_CTX_AHS_EXIST_SHIFT        0
+#define USTORM_ISCSI_TASK_ST_CTX_RESERVED1_MASK         0x7F
+#define USTORM_ISCSI_TASK_ST_CTX_RESERVED1_SHIFT        1
+        struct iscsi_dif_flags dif_flags;
+        __le16 reserved3;
+        struct tqe_opaque tqe_opaque_list;
+        __le32 reserved5;
+        __le32 reserved6;
+        __le32 reserved7;
+        u8 task_type;
+        u8 error_flags;
+#define USTORM_ISCSI_TASK_ST_CTX_DATA_DIGEST_ERROR_MASK         0x1
+#define USTORM_ISCSI_TASK_ST_CTX_DATA_DIGEST_ERROR_SHIFT        0
+#define USTORM_ISCSI_TASK_ST_CTX_DATA_TRUNCATED_ERROR_MASK      0x1
+#define USTORM_ISCSI_TASK_ST_CTX_DATA_TRUNCATED_ERROR_SHIFT     1
+#define USTORM_ISCSI_TASK_ST_CTX_UNDER_RUN_ERROR_MASK           0x1
+#define USTORM_ISCSI_TASK_ST_CTX_UNDER_RUN_ERROR_SHIFT          2
+#define USTORM_ISCSI_TASK_ST_CTX_RESERVED8_MASK                 0x1F
+#define USTORM_ISCSI_TASK_ST_CTX_RESERVED8_SHIFT                3
+        u8 flags;
+#define USTORM_ISCSI_TASK_ST_CTX_CQE_WRITE_MASK                 0x3
+#define USTORM_ISCSI_TASK_ST_CTX_CQE_WRITE_SHIFT                0
+#define USTORM_ISCSI_TASK_ST_CTX_LOCAL_COMP_MASK                0x1
+#define USTORM_ISCSI_TASK_ST_CTX_LOCAL_COMP_SHIFT               2
+#define USTORM_ISCSI_TASK_ST_CTX_Q0_R2TQE_WRITE_MASK            0x1
+#define USTORM_ISCSI_TASK_ST_CTX_Q0_R2TQE_WRITE_SHIFT           3
+#define USTORM_ISCSI_TASK_ST_CTX_TOTAL_DATA_ACKED_DONE_MASK     0x1
+#define USTORM_ISCSI_TASK_ST_CTX_TOTAL_DATA_ACKED_DONE_SHIFT    4
+#define USTORM_ISCSI_TASK_ST_CTX_HQ_SCANNED_DONE_MASK           0x1
+#define USTORM_ISCSI_TASK_ST_CTX_HQ_SCANNED_DONE_SHIFT          5
+#define USTORM_ISCSI_TASK_ST_CTX_R2T2RECV_DONE_MASK             0x1
+#define USTORM_ISCSI_TASK_ST_CTX_R2T2RECV_DONE_SHIFT            6
+#define USTORM_ISCSI_TASK_ST_CTX_RESERVED0_MASK                 0x1
+#define USTORM_ISCSI_TASK_ST_CTX_RESERVED0_SHIFT                7
+        u8 cq_rss_number;
+};
+
+/* iscsi task context */
+struct e4_iscsi_task_context {
+        struct ystorm_iscsi_task_st_ctx ystorm_st_context;
+        struct e4_ystorm_iscsi_task_ag_ctx ystorm_ag_context;
+        struct regpair ystorm_ag_padding[2];
+        struct tdif_task_context tdif_context;
+        struct e4_mstorm_iscsi_task_ag_ctx mstorm_ag_context;
+        struct regpair mstorm_ag_padding[2];
+        struct e4_ustorm_iscsi_task_ag_ctx ustorm_ag_context;
+        struct mstorm_iscsi_task_st_ctx mstorm_st_context;
+        struct ustorm_iscsi_task_st_ctx ustorm_st_context;
+        struct rdif_task_context rdif_context;
+};
+
+/* iSCSI connection offload params passed by driver to FW in ISCSI offload
+ * ramrod.
+ */
+struct iscsi_conn_offload_params {
+        struct regpair sq_pbl_addr;
+        struct regpair r2tq_pbl_addr;
+        struct regpair xhq_pbl_addr;
+        struct regpair uhq_pbl_addr;
+        __le32 initial_ack;
+        __le16 physical_q0;
+        __le16 physical_q1;
+        u8 flags;
+#define ISCSI_CONN_OFFLOAD_PARAMS_TCP_ON_CHIP_1B_MASK   0x1
+#define ISCSI_CONN_OFFLOAD_PARAMS_TCP_ON_CHIP_1B_SHIFT  0
+#define ISCSI_CONN_OFFLOAD_PARAMS_TARGET_MODE_MASK      0x1
+#define ISCSI_CONN_OFFLOAD_PARAMS_TARGET_MODE_SHIFT     1
+#define ISCSI_CONN_OFFLOAD_PARAMS_RESTRICTED_MODE_MASK  0x1
+#define ISCSI_CONN_OFFLOAD_PARAMS_RESTRICTED_MODE_SHIFT 2
+#define ISCSI_CONN_OFFLOAD_PARAMS_RESERVED1_MASK        0x1F
+#define ISCSI_CONN_OFFLOAD_PARAMS_RESERVED1_SHIFT       3
+        u8 pbl_page_size_log;
+        u8 pbe_page_size_log;
+        u8 default_cq;
+        __le32 stat_sn;
+};
+
+/* iSCSI connection statistics */
+struct iscsi_conn_stats_params {
+        struct regpair iscsi_tcp_tx_packets_cnt;
+        struct regpair iscsi_tcp_tx_bytes_cnt;
+        struct regpair iscsi_tcp_tx_rxmit_cnt;
+        struct regpair iscsi_tcp_rx_packets_cnt;
+        struct regpair iscsi_tcp_rx_bytes_cnt;
+        struct regpair iscsi_tcp_rx_dup_ack_cnt;
+        __le32 iscsi_tcp_rx_chksum_err_cnt;
+        __le32 reserved;
+};
+
+/* spe message header */
+struct iscsi_slow_path_hdr {
+        u8 op_code;
+        u8 flags;
+#define ISCSI_SLOW_PATH_HDR_RESERVED0_MASK      0xF
+#define ISCSI_SLOW_PATH_HDR_RESERVED0_SHIFT     0
+#define ISCSI_SLOW_PATH_HDR_LAYER_CODE_MASK     0x7
+#define ISCSI_SLOW_PATH_HDR_LAYER_CODE_SHIFT    4
+#define ISCSI_SLOW_PATH_HDR_RESERVED1_MASK      0x1
+#define ISCSI_SLOW_PATH_HDR_RESERVED1_SHIFT     7
+};
+
+/* iSCSI connection update params passed by driver to FW in ISCSI update
+ *ramrod.
+ */
+struct iscsi_conn_update_ramrod_params {
+        struct iscsi_slow_path_hdr hdr;
+        __le16 conn_id;
+        __le32 fw_cid;
+        u8 flags;
+#define ISCSI_CONN_UPDATE_RAMROD_PARAMS_HD_EN_MASK              0x1
+#define ISCSI_CONN_UPDATE_RAMROD_PARAMS_HD_EN_SHIFT             0
+#define ISCSI_CONN_UPDATE_RAMROD_PARAMS_DD_EN_MASK              0x1
+#define ISCSI_CONN_UPDATE_RAMROD_PARAMS_DD_EN_SHIFT             1
+#define ISCSI_CONN_UPDATE_RAMROD_PARAMS_INITIAL_R2T_MASK        0x1
+#define ISCSI_CONN_UPDATE_RAMROD_PARAMS_INITIAL_R2T_SHIFT       2
+#define ISCSI_CONN_UPDATE_RAMROD_PARAMS_IMMEDIATE_DATA_MASK     0x1
+#define ISCSI_CONN_UPDATE_RAMROD_PARAMS_IMMEDIATE_DATA_SHIFT    3
+#define ISCSI_CONN_UPDATE_RAMROD_PARAMS_DIF_BLOCK_SIZE_MASK     0x1
+#define ISCSI_CONN_UPDATE_RAMROD_PARAMS_DIF_BLOCK_SIZE_SHIFT    4
+#define ISCSI_CONN_UPDATE_RAMROD_PARAMS_DIF_ON_HOST_EN_MASK     0x1
+#define ISCSI_CONN_UPDATE_RAMROD_PARAMS_DIF_ON_HOST_EN_SHIFT    5
+#define ISCSI_CONN_UPDATE_RAMROD_PARAMS_DIF_ON_IMM_EN_MASK      0x1
+#define ISCSI_CONN_UPDATE_RAMROD_PARAMS_DIF_ON_IMM_EN_SHIFT     6
+#define ISCSI_CONN_UPDATE_RAMROD_PARAMS_LUN_MAPPER_EN_MASK      0x1
+#define ISCSI_CONN_UPDATE_RAMROD_PARAMS_LUN_MAPPER_EN_SHIFT     7
+        u8 reserved0[3];
+        __le32 max_seq_size;
+        __le32 max_send_pdu_length;
+        __le32 max_recv_pdu_length;
+        __le32 first_seq_length;
+        __le32 exp_stat_sn;
+        union dif_configuration_params dif_on_imme_params;
+};
+
+/* iSCSI CQ element */
 struct iscsi_cqe_common {
         __le16 conn_id;
         u8 cqe_type;
@@ -669,6 +1083,7 @@ struct iscsi_cqe_common {
         union iscsi_task_hdr iscsi_hdr;
 };
 
+/* iSCSI CQ element */
 struct iscsi_cqe_solicited {
         __le16 conn_id;
         u8 cqe_type;
@@ -678,10 +1093,11 @@ struct iscsi_cqe_solicited {
         u8 fw_dbg_field;
         u8 caused_conn_err;
         u8 reserved0[3];
-        __le32 reserved1[1];
+        __le32 data_truncated_bytes;
         union iscsi_task_hdr iscsi_hdr;
 };
 
+/* iSCSI CQ element */
 struct iscsi_cqe_unsolicited {
         __le16 conn_id;
         u8 cqe_type;
@@ -689,16 +1105,19 @@ struct iscsi_cqe_unsolicited {
         __le16 reserved0;
         u8 reserved1;
         u8 unsol_cqe_type;
-        struct regpair rqe_opaque;
+        __le16 rqe_opaque;
+        __le16 reserved2[3];
         union iscsi_task_hdr iscsi_hdr;
 };
 
+/* iSCSI CQ element */
 union iscsi_cqe {
         struct iscsi_cqe_common cqe_common;
         struct iscsi_cqe_solicited cqe_solicited;
         struct iscsi_cqe_unsolicited cqe_unsolicited;
 };
 
+/* iSCSI CQE type */
 enum iscsi_cqes_type {
         ISCSI_CQE_TYPE_SOLICITED = 1,
         ISCSI_CQE_TYPE_UNSOLICITED,
@@ -708,6 +1127,7 @@ enum iscsi_cqes_type {
         MAX_ISCSI_CQES_TYPE
 };
 
+/* iSCSI CQE type */
 enum iscsi_cqe_unsolicited_type {
         ISCSI_CQE_UNSOLICITED_NONE,
         ISCSI_CQE_UNSOLICITED_SINGLE,
@@ -717,37 +1137,28 @@ enum iscsi_cqe_unsolicited_type {
         MAX_ISCSI_CQE_UNSOLICITED_TYPE
 };
 
-
+/* iscsi debug modes */
 struct iscsi_debug_modes {
         u8 flags;
-#define ISCSI_DEBUG_MODES_ASSERT_IF_RX_CONN_ERROR_MASK         0x1
-#define ISCSI_DEBUG_MODES_ASSERT_IF_RX_CONN_ERROR_SHIFT        0
-#define ISCSI_DEBUG_MODES_ASSERT_IF_RECV_RESET_MASK            0x1
-#define ISCSI_DEBUG_MODES_ASSERT_IF_RECV_RESET_SHIFT           1
-#define ISCSI_DEBUG_MODES_ASSERT_IF_RECV_FIN_MASK              0x1
-#define ISCSI_DEBUG_MODES_ASSERT_IF_RECV_FIN_SHIFT             2
-#define ISCSI_DEBUG_MODES_ASSERT_IF_RECV_CLEANUP_MASK          0x1
-#define ISCSI_DEBUG_MODES_ASSERT_IF_RECV_CLEANUP_SHIFT         3
-#define ISCSI_DEBUG_MODES_ASSERT_IF_RECV_REJECT_OR_ASYNC_MASK  0x1
-#define ISCSI_DEBUG_MODES_ASSERT_IF_RECV_REJECT_OR_ASYNC_SHIFT 4
-#define ISCSI_DEBUG_MODES_ASSERT_IF_RECV_NOP_MASK              0x1
-#define ISCSI_DEBUG_MODES_ASSERT_IF_RECV_NOP_SHIFT             5
-#define ISCSI_DEBUG_MODES_ASSERT_IF_DATA_DIGEST_ERROR_MASK     0x1
-#define ISCSI_DEBUG_MODES_ASSERT_IF_DATA_DIGEST_ERROR_SHIFT    6
-#define ISCSI_DEBUG_MODES_ASSERT_IF_DIF_ERROR_MASK             0x1
-#define ISCSI_DEBUG_MODES_ASSERT_IF_DIF_ERROR_SHIFT            7
-};
-
-struct iscsi_dif_flags {
-        u8 flags;
-#define ISCSI_DIF_FLAGS_PROT_INTERVAL_SIZE_LOG_MASK  0xF
-#define ISCSI_DIF_FLAGS_PROT_INTERVAL_SIZE_LOG_SHIFT 0
-#define ISCSI_DIF_FLAGS_DIF_TO_PEER_MASK             0x1
-#define ISCSI_DIF_FLAGS_DIF_TO_PEER_SHIFT            4
-#define ISCSI_DIF_FLAGS_HOST_INTERFACE_MASK          0x7
-#define ISCSI_DIF_FLAGS_HOST_INTERFACE_SHIFT         5
-};
-
+#define ISCSI_DEBUG_MODES_ASSERT_IF_RX_CONN_ERROR_MASK                  0x1
+#define ISCSI_DEBUG_MODES_ASSERT_IF_RX_CONN_ERROR_SHIFT                 0
+#define ISCSI_DEBUG_MODES_ASSERT_IF_RECV_RESET_MASK                     0x1
+#define ISCSI_DEBUG_MODES_ASSERT_IF_RECV_RESET_SHIFT                    1
+#define ISCSI_DEBUG_MODES_ASSERT_IF_RECV_FIN_MASK                       0x1
+#define ISCSI_DEBUG_MODES_ASSERT_IF_RECV_FIN_SHIFT                      2
+#define ISCSI_DEBUG_MODES_ASSERT_IF_RECV_CLEANUP_MASK                   0x1
+#define ISCSI_DEBUG_MODES_ASSERT_IF_RECV_CLEANUP_SHIFT                  3
+#define ISCSI_DEBUG_MODES_ASSERT_IF_RECV_REJECT_OR_ASYNC_MASK           0x1
+#define ISCSI_DEBUG_MODES_ASSERT_IF_RECV_REJECT_OR_ASYNC_SHIFT          4
+#define ISCSI_DEBUG_MODES_ASSERT_IF_RECV_NOP_MASK                       0x1
+#define ISCSI_DEBUG_MODES_ASSERT_IF_RECV_NOP_SHIFT                      5
+#define ISCSI_DEBUG_MODES_ASSERT_IF_DIF_OR_DATA_DIGEST_ERROR_MASK       0x1
+#define ISCSI_DEBUG_MODES_ASSERT_IF_DIF_OR_DATA_DIGEST_ERROR_SHIFT      6
+#define ISCSI_DEBUG_MODES_ASSERT_IF_HQ_CORRUPT_MASK                     0x1
+#define ISCSI_DEBUG_MODES_ASSERT_IF_HQ_CORRUPT_SHIFT                    7
+};
+
+/* iSCSI kernel completion queue IDs */
 enum iscsi_eqe_opcode {
         ISCSI_EVENT_TYPE_INIT_FUNC = 0,
         ISCSI_EVENT_TYPE_DESTROY_FUNC,
@@ -756,9 +1167,9 @@ enum iscsi_eqe_opcode {
         ISCSI_EVENT_TYPE_CLEAR_SQ,
         ISCSI_EVENT_TYPE_TERMINATE_CONN,
         ISCSI_EVENT_TYPE_MAC_UPDATE_CONN,
+        ISCSI_EVENT_TYPE_COLLECT_STATS_CONN,
         ISCSI_EVENT_TYPE_ASYN_CONNECT_COMPLETE,
         ISCSI_EVENT_TYPE_ASYN_TERMINATE_DONE,
-        RESERVED9,
         ISCSI_EVENT_TYPE_START_OF_ERROR_TYPES = 10,
         ISCSI_EVENT_TYPE_ASYN_ABORT_RCVD,
         ISCSI_EVENT_TYPE_ASYN_CLOSE_RCVD,
@@ -772,6 +1183,7 @@ enum iscsi_eqe_opcode {
         MAX_ISCSI_EQE_OPCODE
 };
 
+/* iSCSI EQE and CQE completion status */
 enum iscsi_error_types {
         ISCSI_STATUS_NONE = 0,
         ISCSI_CQE_ERROR_UNSOLICITED_RCV_ON_INVALID_CONN = 1,
@@ -823,7 +1235,7 @@ enum iscsi_error_types {
         MAX_ISCSI_ERROR_TYPES
 };
 
-
+/* iSCSI Ramrod Command IDs */
 enum iscsi_ramrod_cmd_id {
         ISCSI_RAMROD_CMD_ID_UNUSED = 0,
         ISCSI_RAMROD_CMD_ID_INIT_FUNC = 1,
@@ -833,22 +1245,11 @@ enum iscsi_ramrod_cmd_id {
         ISCSI_RAMROD_CMD_ID_TERMINATION_CONN = 5,
         ISCSI_RAMROD_CMD_ID_CLEAR_SQ = 6,
         ISCSI_RAMROD_CMD_ID_MAC_UPDATE = 7,
+        ISCSI_RAMROD_CMD_ID_CONN_STATS = 8,
         MAX_ISCSI_RAMROD_CMD_ID
 };
 
-struct iscsi_reg1 {
-        __le32 reg1_map;
-#define ISCSI_REG1_NUM_SGES_MASK   0xF
-#define ISCSI_REG1_NUM_SGES_SHIFT  0
-#define ISCSI_REG1_RESERVED1_MASK  0xFFFFFFF
-#define ISCSI_REG1_RESERVED1_SHIFT 4
-};
-
-union iscsi_seq_num {
-        __le16 data_sn;
-        __le16 r2t_sn;
-};
-
+/* iSCSI connection termination request */
 struct iscsi_spe_conn_mac_update {
         struct iscsi_slow_path_hdr hdr;
         __le16 conn_id;
@@ -859,6 +1260,9 @@ struct iscsi_spe_conn_mac_update {
         u8 reserved0[2];
 };
 
+/* iSCSI and TCP connection (Option 1) offload params passed by driver to FW in
+ * iSCSI offload ramrod.
+ */
 struct iscsi_spe_conn_offload {
         struct iscsi_slow_path_hdr hdr;
         __le16 conn_id;
@@ -867,6 +1271,9 @@ struct iscsi_spe_conn_offload {
         struct tcp_offload_params tcp;
 };
 
+/* iSCSI and TCP connection(Option 2) offload params passed by driver to FW in
+ * iSCSI offload ramrod.
+ */
 struct iscsi_spe_conn_offload_option2 {
         struct iscsi_slow_path_hdr hdr;
         __le16 conn_id;
@@ -875,6 +1282,17 @@ struct iscsi_spe_conn_offload_option2 {
         struct tcp_offload_params_opt2 tcp;
 };
 
+/* iSCSI collect connection statistics request */
+struct iscsi_spe_conn_statistics {
+        struct iscsi_slow_path_hdr hdr;
+        __le16 conn_id;
+        __le32 fw_cid;
+        u8 reset_stats;
+        u8 reserved0[7];
+        struct regpair stats_cnts_addr;
+};
+
+/* iSCSI connection termination request */
 struct iscsi_spe_conn_termination {
         struct iscsi_slow_path_hdr hdr;
         __le16 conn_id;
@@ -885,12 +1303,14 @@ struct iscsi_spe_conn_termination {
         struct regpair query_params_addr;
 };
 
+/* iSCSI firmware function destroy parameters */
 struct iscsi_spe_func_dstry {
         struct iscsi_slow_path_hdr hdr;
         __le16 reserved0;
         __le32 reserved1;
 };
 
+/* iSCSI firmware function init parameters */
 struct iscsi_spe_func_init {
         struct iscsi_slow_path_hdr hdr;
         __le16 half_way_close_timeout;
@@ -898,283 +1318,19 @@ struct iscsi_spe_func_init {
         u8 num_r2tq_pages_in_ring;
         u8 num_uhq_pages_in_ring;
         u8 ll2_rx_queue_id;
-        u8 ooo_enable;
+        u8 flags;
+#define ISCSI_SPE_FUNC_INIT_COUNTERS_EN_MASK    0x1
+#define ISCSI_SPE_FUNC_INIT_COUNTERS_EN_SHIFT   0
+#define ISCSI_SPE_FUNC_INIT_RESERVED0_MASK      0x7F
+#define ISCSI_SPE_FUNC_INIT_RESERVED0_SHIFT     1
         struct iscsi_debug_modes debug_mode;
         __le16 reserved1;
         __le32 reserved2;
-        __le32 reserved3;
-        __le32 reserved4;
         struct scsi_init_func_params func_params;
         struct scsi_init_func_queues q_params;
 };
 
-struct ystorm_iscsi_task_state {
-        struct scsi_cached_sges data_desc;
-        struct scsi_sgl_params sgl_params;
-        __le32 exp_r2t_sn;
-        __le32 buffer_offset;
-        union iscsi_seq_num seq_num;
-        struct iscsi_dif_flags dif_flags;
-        u8 flags;
-#define YSTORM_ISCSI_TASK_STATE_LOCAL_COMP_MASK  0x1
-#define YSTORM_ISCSI_TASK_STATE_LOCAL_COMP_SHIFT 0
-#define YSTORM_ISCSI_TASK_STATE_SLOW_IO_MASK     0x1
-#define YSTORM_ISCSI_TASK_STATE_SLOW_IO_SHIFT    1
-#define YSTORM_ISCSI_TASK_STATE_RESERVED0_MASK   0x3F
-#define YSTORM_ISCSI_TASK_STATE_RESERVED0_SHIFT  2
-};
-
-struct ystorm_iscsi_task_rxmit_opt {
-        __le32 fast_rxmit_sge_offset;
-        __le32 scan_start_buffer_offset;
-        __le32 fast_rxmit_buffer_offset;
-        u8 scan_start_sgl_index;
-        u8 fast_rxmit_sgl_index;
-        __le16 reserved;
-};
-
-struct ystorm_iscsi_task_st_ctx {
-        struct ystorm_iscsi_task_state state;
-        struct ystorm_iscsi_task_rxmit_opt rxmit_opt;
-        union iscsi_task_hdr pdu_hdr;
-};
-
-struct ystorm_iscsi_task_ag_ctx {
-        u8 reserved;
-        u8 byte1;
-        __le16 word0;
-        u8 flags0;
-#define YSTORM_ISCSI_TASK_AG_CTX_NIBBLE0_MASK     0xF
-#define YSTORM_ISCSI_TASK_AG_CTX_NIBBLE0_SHIFT    0
-#define YSTORM_ISCSI_TASK_AG_CTX_BIT0_MASK        0x1
-#define YSTORM_ISCSI_TASK_AG_CTX_BIT0_SHIFT       4
-#define YSTORM_ISCSI_TASK_AG_CTX_BIT1_MASK        0x1
-#define YSTORM_ISCSI_TASK_AG_CTX_BIT1_SHIFT       5
-#define YSTORM_ISCSI_TASK_AG_CTX_VALID_MASK       0x1
-#define YSTORM_ISCSI_TASK_AG_CTX_VALID_SHIFT      6
-#define YSTORM_ISCSI_TASK_AG_CTX_BIT3_MASK        0x1
-#define YSTORM_ISCSI_TASK_AG_CTX_BIT3_SHIFT       7
-        u8 flags1;
-#define YSTORM_ISCSI_TASK_AG_CTX_CF0_MASK         0x3
-#define YSTORM_ISCSI_TASK_AG_CTX_CF0_SHIFT        0
-#define YSTORM_ISCSI_TASK_AG_CTX_CF1_MASK         0x3
-#define YSTORM_ISCSI_TASK_AG_CTX_CF1_SHIFT        2
-#define YSTORM_ISCSI_TASK_AG_CTX_CF2SPECIAL_MASK  0x3
-#define YSTORM_ISCSI_TASK_AG_CTX_CF2SPECIAL_SHIFT 4
-#define YSTORM_ISCSI_TASK_AG_CTX_CF0EN_MASK       0x1
-#define YSTORM_ISCSI_TASK_AG_CTX_CF0EN_SHIFT      6
-#define YSTORM_ISCSI_TASK_AG_CTX_CF1EN_MASK       0x1
-#define YSTORM_ISCSI_TASK_AG_CTX_CF1EN_SHIFT      7
-        u8 flags2;
-#define YSTORM_ISCSI_TASK_AG_CTX_BIT4_MASK        0x1
-#define YSTORM_ISCSI_TASK_AG_CTX_BIT4_SHIFT       0
-#define YSTORM_ISCSI_TASK_AG_CTX_RULE0EN_MASK     0x1
-#define YSTORM_ISCSI_TASK_AG_CTX_RULE0EN_SHIFT    1
-#define YSTORM_ISCSI_TASK_AG_CTX_RULE1EN_MASK     0x1
-#define YSTORM_ISCSI_TASK_AG_CTX_RULE1EN_SHIFT    2
-#define YSTORM_ISCSI_TASK_AG_CTX_RULE2EN_MASK     0x1
-#define YSTORM_ISCSI_TASK_AG_CTX_RULE2EN_SHIFT    3
-#define YSTORM_ISCSI_TASK_AG_CTX_RULE3EN_MASK     0x1
-#define YSTORM_ISCSI_TASK_AG_CTX_RULE3EN_SHIFT    4
-#define YSTORM_ISCSI_TASK_AG_CTX_RULE4EN_MASK     0x1
-#define YSTORM_ISCSI_TASK_AG_CTX_RULE4EN_SHIFT    5
-#define YSTORM_ISCSI_TASK_AG_CTX_RULE5EN_MASK     0x1
-#define YSTORM_ISCSI_TASK_AG_CTX_RULE5EN_SHIFT    6
-#define YSTORM_ISCSI_TASK_AG_CTX_RULE6EN_MASK     0x1
-#define YSTORM_ISCSI_TASK_AG_CTX_RULE6EN_SHIFT    7
-        u8 byte2;
-        __le32 TTT;
-        u8 byte3;
-        u8 byte4;
-        __le16 word1;
-};
-
-struct mstorm_iscsi_task_ag_ctx {
-        u8 cdu_validation;
-        u8 byte1;
-        __le16 task_cid;
-        u8 flags0;
-#define MSTORM_ISCSI_TASK_AG_CTX_CONNECTION_TYPE_MASK     0xF
-#define MSTORM_ISCSI_TASK_AG_CTX_CONNECTION_TYPE_SHIFT    0
-#define MSTORM_ISCSI_TASK_AG_CTX_EXIST_IN_QM0_MASK        0x1
-#define MSTORM_ISCSI_TASK_AG_CTX_EXIST_IN_QM0_SHIFT       4
-#define MSTORM_ISCSI_TASK_AG_CTX_BIT1_MASK                0x1
-#define MSTORM_ISCSI_TASK_AG_CTX_BIT1_SHIFT               5
-#define MSTORM_ISCSI_TASK_AG_CTX_VALID_MASK               0x1
-#define MSTORM_ISCSI_TASK_AG_CTX_VALID_SHIFT              6
-#define MSTORM_ISCSI_TASK_AG_CTX_TASK_CLEANUP_FLAG_MASK   0x1
-#define MSTORM_ISCSI_TASK_AG_CTX_TASK_CLEANUP_FLAG_SHIFT  7
-        u8 flags1;
-#define MSTORM_ISCSI_TASK_AG_CTX_TASK_CLEANUP_CF_MASK     0x3
-#define MSTORM_ISCSI_TASK_AG_CTX_TASK_CLEANUP_CF_SHIFT    0
-#define MSTORM_ISCSI_TASK_AG_CTX_CF1_MASK                 0x3
-#define MSTORM_ISCSI_TASK_AG_CTX_CF1_SHIFT                2
-#define MSTORM_ISCSI_TASK_AG_CTX_CF2_MASK                 0x3
-#define MSTORM_ISCSI_TASK_AG_CTX_CF2_SHIFT                4
-#define MSTORM_ISCSI_TASK_AG_CTX_TASK_CLEANUP_CF_EN_MASK  0x1
-#define MSTORM_ISCSI_TASK_AG_CTX_TASK_CLEANUP_CF_EN_SHIFT 6
-#define MSTORM_ISCSI_TASK_AG_CTX_CF1EN_MASK               0x1
-#define MSTORM_ISCSI_TASK_AG_CTX_CF1EN_SHIFT              7
-        u8 flags2;
-#define MSTORM_ISCSI_TASK_AG_CTX_CF2EN_MASK               0x1
-#define MSTORM_ISCSI_TASK_AG_CTX_CF2EN_SHIFT              0
-#define MSTORM_ISCSI_TASK_AG_CTX_RULE0EN_MASK             0x1
-#define MSTORM_ISCSI_TASK_AG_CTX_RULE0EN_SHIFT            1
-#define MSTORM_ISCSI_TASK_AG_CTX_RULE1EN_MASK             0x1
-#define MSTORM_ISCSI_TASK_AG_CTX_RULE1EN_SHIFT            2
-#define MSTORM_ISCSI_TASK_AG_CTX_RULE2EN_MASK             0x1
-#define MSTORM_ISCSI_TASK_AG_CTX_RULE2EN_SHIFT            3
-#define MSTORM_ISCSI_TASK_AG_CTX_RULE3EN_MASK             0x1
-#define MSTORM_ISCSI_TASK_AG_CTX_RULE3EN_SHIFT            4
-#define MSTORM_ISCSI_TASK_AG_CTX_RULE4EN_MASK             0x1
-#define MSTORM_ISCSI_TASK_AG_CTX_RULE4EN_SHIFT            5
-#define MSTORM_ISCSI_TASK_AG_CTX_RULE5EN_MASK             0x1
-#define MSTORM_ISCSI_TASK_AG_CTX_RULE5EN_SHIFT            6
-#define MSTORM_ISCSI_TASK_AG_CTX_RULE6EN_MASK             0x1
-#define MSTORM_ISCSI_TASK_AG_CTX_RULE6EN_SHIFT            7
-        u8 byte2;
-        __le32 reg0;
-        u8 byte3;
-        u8 byte4;
-        __le16 word1;
-};
-
-struct ustorm_iscsi_task_ag_ctx {
-        u8 reserved;
-        u8 state;
-        __le16 icid;
-        u8 flags0;
-#define USTORM_ISCSI_TASK_AG_CTX_CONNECTION_TYPE_MASK        0xF
-#define USTORM_ISCSI_TASK_AG_CTX_CONNECTION_TYPE_SHIFT       0
-#define USTORM_ISCSI_TASK_AG_CTX_EXIST_IN_QM0_MASK           0x1
-#define USTORM_ISCSI_TASK_AG_CTX_EXIST_IN_QM0_SHIFT          4
-#define USTORM_ISCSI_TASK_AG_CTX_BIT1_MASK                   0x1
-#define USTORM_ISCSI_TASK_AG_CTX_BIT1_SHIFT                  5
-#define USTORM_ISCSI_TASK_AG_CTX_HQ_SCANNED_CF_MASK          0x3
-#define USTORM_ISCSI_TASK_AG_CTX_HQ_SCANNED_CF_SHIFT         6
-        u8 flags1;
-#define USTORM_ISCSI_TASK_AG_CTX_RESERVED1_MASK              0x3
-#define USTORM_ISCSI_TASK_AG_CTX_RESERVED1_SHIFT             0
-#define USTORM_ISCSI_TASK_AG_CTX_R2T2RECV_MASK               0x3
-#define USTORM_ISCSI_TASK_AG_CTX_R2T2RECV_SHIFT              2
-#define USTORM_ISCSI_TASK_AG_CTX_CF3_MASK                    0x3
-#define USTORM_ISCSI_TASK_AG_CTX_CF3_SHIFT                   4
-#define USTORM_ISCSI_TASK_AG_CTX_DIF_ERROR_CF_MASK           0x3
-#define USTORM_ISCSI_TASK_AG_CTX_DIF_ERROR_CF_SHIFT          6
-        u8 flags2;
-#define USTORM_ISCSI_TASK_AG_CTX_HQ_SCANNED_CF_EN_MASK       0x1
-#define USTORM_ISCSI_TASK_AG_CTX_HQ_SCANNED_CF_EN_SHIFT      0
-#define USTORM_ISCSI_TASK_AG_CTX_DISABLE_DATA_ACKED_MASK     0x1
-#define USTORM_ISCSI_TASK_AG_CTX_DISABLE_DATA_ACKED_SHIFT    1
-#define USTORM_ISCSI_TASK_AG_CTX_R2T2RECV_EN_MASK            0x1
-#define USTORM_ISCSI_TASK_AG_CTX_R2T2RECV_EN_SHIFT           2
-#define USTORM_ISCSI_TASK_AG_CTX_CF3EN_MASK                  0x1
-#define USTORM_ISCSI_TASK_AG_CTX_CF3EN_SHIFT                 3
-#define USTORM_ISCSI_TASK_AG_CTX_DIF_ERROR_CF_EN_MASK        0x1
-#define USTORM_ISCSI_TASK_AG_CTX_DIF_ERROR_CF_EN_SHIFT       4
-#define USTORM_ISCSI_TASK_AG_CTX_CMP_DATA_TOTAL_EXP_EN_MASK  0x1
-#define USTORM_ISCSI_TASK_AG_CTX_CMP_DATA_TOTAL_EXP_EN_SHIFT 5
-#define USTORM_ISCSI_TASK_AG_CTX_RULE1EN_MASK                0x1
-#define USTORM_ISCSI_TASK_AG_CTX_RULE1EN_SHIFT               6
-#define USTORM_ISCSI_TASK_AG_CTX_CMP_CONT_RCV_EXP_EN_MASK    0x1
-#define USTORM_ISCSI_TASK_AG_CTX_CMP_CONT_RCV_EXP_EN_SHIFT   7
-        u8 flags3;
-#define USTORM_ISCSI_TASK_AG_CTX_RULE3EN_MASK                0x1
-#define USTORM_ISCSI_TASK_AG_CTX_RULE3EN_SHIFT               0
-#define USTORM_ISCSI_TASK_AG_CTX_RULE4EN_MASK                0x1
-#define USTORM_ISCSI_TASK_AG_CTX_RULE4EN_SHIFT               1
-#define USTORM_ISCSI_TASK_AG_CTX_RULE5EN_MASK                0x1
-#define USTORM_ISCSI_TASK_AG_CTX_RULE5EN_SHIFT               2
-#define USTORM_ISCSI_TASK_AG_CTX_RULE6EN_MASK                0x1
-#define USTORM_ISCSI_TASK_AG_CTX_RULE6EN_SHIFT               3
-#define USTORM_ISCSI_TASK_AG_CTX_DIF_ERROR_TYPE_MASK         0xF
-#define USTORM_ISCSI_TASK_AG_CTX_DIF_ERROR_TYPE_SHIFT        4
-        __le32 dif_err_intervals;
-        __le32 dif_error_1st_interval;
-        __le32 rcv_cont_len;
-        __le32 exp_cont_len;
-        __le32 total_data_acked;
-        __le32 exp_data_acked;
-        u8 next_tid_valid;
-        u8 byte3;
-        __le16 word1;
-        __le16 next_tid;
-        __le16 word3;
-        __le32 hdr_residual_count;
-        __le32 exp_r2t_sn;
-};
-
-struct mstorm_iscsi_task_st_ctx {
-        struct scsi_cached_sges data_desc;
-        struct scsi_sgl_params sgl_params;
-        __le32 rem_task_size;
-        __le32 data_buffer_offset;
-        u8 task_type;
-        struct iscsi_dif_flags dif_flags;
-        u8 reserved0[2];
-        struct regpair sense_db;
-        __le32 expected_itt;
-        __le32 reserved1;
-};
-
-struct ustorm_iscsi_task_st_ctx {
-        __le32 rem_rcv_len;
-        __le32 exp_data_transfer_len;
-        __le32 exp_data_sn;
-        struct regpair lun;
-        struct iscsi_reg1 reg1;
-        u8 flags2;
-#define USTORM_ISCSI_TASK_ST_CTX_AHS_EXIST_MASK             0x1
-#define USTORM_ISCSI_TASK_ST_CTX_AHS_EXIST_SHIFT            0
-#define USTORM_ISCSI_TASK_ST_CTX_RESERVED1_MASK             0x7F
-#define USTORM_ISCSI_TASK_ST_CTX_RESERVED1_SHIFT            1
-        struct iscsi_dif_flags dif_flags;
-        __le16 reserved3;
-        __le32 reserved4;
-        __le32 reserved5;
-        __le32 reserved6;
-        __le32 reserved7;
-        u8 task_type;
-        u8 error_flags;
-#define USTORM_ISCSI_TASK_ST_CTX_DATA_DIGEST_ERROR_MASK     0x1
-#define USTORM_ISCSI_TASK_ST_CTX_DATA_DIGEST_ERROR_SHIFT    0
-#define USTORM_ISCSI_TASK_ST_CTX_DATA_TRUNCATED_ERROR_MASK  0x1
-#define USTORM_ISCSI_TASK_ST_CTX_DATA_TRUNCATED_ERROR_SHIFT 1
-#define USTORM_ISCSI_TASK_ST_CTX_UNDER_RUN_ERROR_MASK       0x1
-#define USTORM_ISCSI_TASK_ST_CTX_UNDER_RUN_ERROR_SHIFT      2
-#define USTORM_ISCSI_TASK_ST_CTX_RESERVED8_MASK             0x1F
-#define USTORM_ISCSI_TASK_ST_CTX_RESERVED8_SHIFT            3
-        u8 flags;
-#define USTORM_ISCSI_TASK_ST_CTX_CQE_WRITE_MASK             0x3
-#define USTORM_ISCSI_TASK_ST_CTX_CQE_WRITE_SHIFT            0
-#define USTORM_ISCSI_TASK_ST_CTX_LOCAL_COMP_MASK            0x1
-#define USTORM_ISCSI_TASK_ST_CTX_LOCAL_COMP_SHIFT           2
-#define USTORM_ISCSI_TASK_ST_CTX_Q0_R2TQE_WRITE_MASK        0x1
-#define USTORM_ISCSI_TASK_ST_CTX_Q0_R2TQE_WRITE_SHIFT       3
-#define USTORM_ISCSI_TASK_ST_CTX_TOTAL_DATA_ACKED_DONE_MASK  0x1
-#define USTORM_ISCSI_TASK_ST_CTX_TOTAL_DATA_ACKED_DONE_SHIFT 4
-#define USTORM_ISCSI_TASK_ST_CTX_HQ_SCANNED_DONE_MASK        0x1
-#define USTORM_ISCSI_TASK_ST_CTX_HQ_SCANNED_DONE_SHIFT       5
-#define USTORM_ISCSI_TASK_ST_CTX_R2T2RECV_DONE_MASK         0x1
-#define USTORM_ISCSI_TASK_ST_CTX_R2T2RECV_DONE_SHIFT        6
-#define USTORM_ISCSI_TASK_ST_CTX_RESERVED0_MASK             0x1
-#define USTORM_ISCSI_TASK_ST_CTX_RESERVED0_SHIFT            7
-        u8 cq_rss_number;
-};
-
-struct iscsi_task_context {
-        struct ystorm_iscsi_task_st_ctx ystorm_st_context;
-        struct ystorm_iscsi_task_ag_ctx ystorm_ag_context;
-        struct regpair ystorm_ag_padding[2];
-        struct tdif_task_context tdif_context;
-        struct mstorm_iscsi_task_ag_ctx mstorm_ag_context;
-        struct regpair mstorm_ag_padding[2];
-        struct ustorm_iscsi_task_ag_ctx ustorm_ag_context;
-        struct mstorm_iscsi_task_st_ctx mstorm_st_context;
-        struct ustorm_iscsi_task_st_ctx ustorm_st_context;
-        struct rdif_task_context rdif_context;
-};
-
+/* iSCSI task type */
 enum iscsi_task_type {
         ISCSI_TASK_TYPE_INITIATOR_WRITE,
         ISCSI_TASK_TYPE_INITIATOR_READ,
@@ -1186,53 +1342,57 @@ enum iscsi_task_type {
         ISCSI_TASK_TYPE_TARGET_READ,
         ISCSI_TASK_TYPE_TARGET_RESPONSE,
         ISCSI_TASK_TYPE_LOGIN_RESPONSE,
+        ISCSI_TASK_TYPE_TARGET_IMM_W_DIF,
         MAX_ISCSI_TASK_TYPE
 };
 
+/* iSCSI DesiredDataTransferLength/ttt union */
 union iscsi_ttt_txlen_union {
         __le32 desired_tx_len;
         __le32 ttt;
 };
 
+/* iSCSI uHQ element */
 struct iscsi_uhqe {
         __le32 reg1;
-#define ISCSI_UHQE_PDU_PAYLOAD_LEN_MASK     0xFFFFF
-#define ISCSI_UHQE_PDU_PAYLOAD_LEN_SHIFT    0
-#define ISCSI_UHQE_LOCAL_COMP_MASK          0x1
-#define ISCSI_UHQE_LOCAL_COMP_SHIFT         20
-#define ISCSI_UHQE_TOGGLE_BIT_MASK          0x1
-#define ISCSI_UHQE_TOGGLE_BIT_SHIFT         21
-#define ISCSI_UHQE_PURE_PAYLOAD_MASK        0x1
-#define ISCSI_UHQE_PURE_PAYLOAD_SHIFT       22
-#define ISCSI_UHQE_LOGIN_RESPONSE_PDU_MASK  0x1
-#define ISCSI_UHQE_LOGIN_RESPONSE_PDU_SHIFT 23
-#define ISCSI_UHQE_TASK_ID_HI_MASK          0xFF
-#define ISCSI_UHQE_TASK_ID_HI_SHIFT         24
+#define ISCSI_UHQE_PDU_PAYLOAD_LEN_MASK         0xFFFFF
+#define ISCSI_UHQE_PDU_PAYLOAD_LEN_SHIFT        0
+#define ISCSI_UHQE_LOCAL_COMP_MASK              0x1
+#define ISCSI_UHQE_LOCAL_COMP_SHIFT             20
+#define ISCSI_UHQE_TOGGLE_BIT_MASK              0x1
+#define ISCSI_UHQE_TOGGLE_BIT_SHIFT             21
+#define ISCSI_UHQE_PURE_PAYLOAD_MASK            0x1
+#define ISCSI_UHQE_PURE_PAYLOAD_SHIFT           22
+#define ISCSI_UHQE_LOGIN_RESPONSE_PDU_MASK      0x1
+#define ISCSI_UHQE_LOGIN_RESPONSE_PDU_SHIFT     23
+#define ISCSI_UHQE_TASK_ID_HI_MASK              0xFF
+#define ISCSI_UHQE_TASK_ID_HI_SHIFT             24
         __le32 reg2;
-#define ISCSI_UHQE_BUFFER_OFFSET_MASK       0xFFFFFF
-#define ISCSI_UHQE_BUFFER_OFFSET_SHIFT      0
-#define ISCSI_UHQE_TASK_ID_LO_MASK          0xFF
-#define ISCSI_UHQE_TASK_ID_LO_SHIFT         24
+#define ISCSI_UHQE_BUFFER_OFFSET_MASK   0xFFFFFF
+#define ISCSI_UHQE_BUFFER_OFFSET_SHIFT  0
+#define ISCSI_UHQE_TASK_ID_LO_MASK      0xFF
+#define ISCSI_UHQE_TASK_ID_LO_SHIFT     24
 };
 
-
+/* iSCSI WQ element */
 struct iscsi_wqe {
         __le16 task_id;
         u8 flags;
-#define ISCSI_WQE_WQE_TYPE_MASK        0x7
-#define ISCSI_WQE_WQE_TYPE_SHIFT       0
-#define ISCSI_WQE_NUM_SGES_MASK  0xF
-#define ISCSI_WQE_NUM_SGES_SHIFT 3
-#define ISCSI_WQE_RESPONSE_MASK        0x1
-#define ISCSI_WQE_RESPONSE_SHIFT       7
+#define ISCSI_WQE_WQE_TYPE_MASK         0x7
+#define ISCSI_WQE_WQE_TYPE_SHIFT        0
+#define ISCSI_WQE_NUM_SGES_MASK         0xF
+#define ISCSI_WQE_NUM_SGES_SHIFT        3
+#define ISCSI_WQE_RESPONSE_MASK         0x1
+#define ISCSI_WQE_RESPONSE_SHIFT        7
         struct iscsi_dif_flags prot_flags;
         __le32 contlen_cdbsize;
-#define ISCSI_WQE_CONT_LEN_MASK  0xFFFFFF
-#define ISCSI_WQE_CONT_LEN_SHIFT 0
-#define ISCSI_WQE_CDB_SIZE_MASK  0xFF
-#define ISCSI_WQE_CDB_SIZE_SHIFT 24
+#define ISCSI_WQE_CONT_LEN_MASK         0xFFFFFF
+#define ISCSI_WQE_CONT_LEN_SHIFT        0
+#define ISCSI_WQE_CDB_SIZE_MASK         0xFF
+#define ISCSI_WQE_CDB_SIZE_SHIFT        24
 };
 
+/* iSCSI wqe type */
 enum iscsi_wqe_type {
         ISCSI_WQE_TYPE_NORMAL,
         ISCSI_WQE_TYPE_TASK_CLEANUP,
@@ -1244,6 +1404,7 @@ enum iscsi_wqe_type {
         MAX_ISCSI_WQE_TYPE
 };
 
+/* iSCSI xHQ element */
 struct iscsi_xhqe {
         union iscsi_ttt_txlen_union ttt_or_txlen;
         __le32 exp_stat_sn;
@@ -1251,120 +1412,134 @@ struct iscsi_xhqe {
         u8 total_ahs_length;
         u8 opcode;
         u8 flags;
-#define ISCSI_XHQE_FINAL_MASK       0x1
-#define ISCSI_XHQE_FINAL_SHIFT      0
-#define ISCSI_XHQE_STATUS_BIT_MASK  0x1
-#define ISCSI_XHQE_STATUS_BIT_SHIFT 1
-#define ISCSI_XHQE_NUM_SGES_MASK    0xF
-#define ISCSI_XHQE_NUM_SGES_SHIFT   2
-#define ISCSI_XHQE_RESERVED0_MASK   0x3
-#define ISCSI_XHQE_RESERVED0_SHIFT  6
+#define ISCSI_XHQE_FINAL_MASK           0x1
+#define ISCSI_XHQE_FINAL_SHIFT          0
+#define ISCSI_XHQE_STATUS_BIT_MASK      0x1
+#define ISCSI_XHQE_STATUS_BIT_SHIFT     1
+#define ISCSI_XHQE_NUM_SGES_MASK        0xF
+#define ISCSI_XHQE_NUM_SGES_SHIFT       2
+#define ISCSI_XHQE_RESERVED0_MASK       0x3
+#define ISCSI_XHQE_RESERVED0_SHIFT      6
         union iscsi_seq_num seq_num;
         __le16 reserved1;
 };
 
+/* Per PF iSCSI receive path statistics - mStorm RAM structure */
 struct mstorm_iscsi_stats_drv {
         struct regpair iscsi_rx_dropped_pdus_task_not_valid;
+        struct regpair iscsi_rx_dup_ack_cnt;
 };
 
+/* Per PF iSCSI transmit path statistics - pStorm RAM structure */
 struct pstorm_iscsi_stats_drv {
         struct regpair iscsi_tx_bytes_cnt;
         struct regpair iscsi_tx_packet_cnt;
 };
 
+/* Per PF iSCSI receive path statistics - tStorm RAM structure */
 struct tstorm_iscsi_stats_drv {
         struct regpair iscsi_rx_bytes_cnt;
         struct regpair iscsi_rx_packet_cnt;
         struct regpair iscsi_rx_new_ooo_isle_events_cnt;
+        struct regpair iscsi_rx_tcp_payload_bytes_cnt;
+        struct regpair iscsi_rx_tcp_pkt_cnt;
+        struct regpair iscsi_rx_pure_ack_cnt;
         __le32 iscsi_cmdq_threshold_cnt;
         __le32 iscsi_rq_threshold_cnt;
         __le32 iscsi_immq_threshold_cnt;
 };
 
+/* Per PF iSCSI receive path statistics - uStorm RAM structure */
 struct ustorm_iscsi_stats_drv {
         struct regpair iscsi_rx_data_pdu_cnt;
         struct regpair iscsi_rx_r2t_pdu_cnt;
         struct regpair iscsi_rx_total_pdu_cnt;
 };
 
+/* Per PF iSCSI transmit path statistics - xStorm RAM structure */
 struct xstorm_iscsi_stats_drv {
         struct regpair iscsi_tx_go_to_slow_start_event_cnt;
         struct regpair iscsi_tx_fast_retransmit_event_cnt;
+        struct regpair iscsi_tx_pure_ack_cnt;
+        struct regpair iscsi_tx_delayed_ack_cnt;
 };
 
+/* Per PF iSCSI transmit path statistics - yStorm RAM structure */
 struct ystorm_iscsi_stats_drv {
         struct regpair iscsi_tx_data_pdu_cnt;
         struct regpair iscsi_tx_r2t_pdu_cnt;
         struct regpair iscsi_tx_total_pdu_cnt;
+        struct regpair iscsi_tx_tcp_payload_bytes_cnt;
+        struct regpair iscsi_tx_tcp_pkt_cnt;
 };
 
-struct tstorm_iscsi_task_ag_ctx {
+struct e4_tstorm_iscsi_task_ag_ctx {
         u8 byte0;
         u8 byte1;
         __le16 word0;
         u8 flags0;
-#define TSTORM_ISCSI_TASK_AG_CTX_NIBBLE0_MASK  0xF
-#define TSTORM_ISCSI_TASK_AG_CTX_NIBBLE0_SHIFT 0
-#define TSTORM_ISCSI_TASK_AG_CTX_BIT0_MASK     0x1
-#define TSTORM_ISCSI_TASK_AG_CTX_BIT0_SHIFT    4
-#define TSTORM_ISCSI_TASK_AG_CTX_BIT1_MASK     0x1
-#define TSTORM_ISCSI_TASK_AG_CTX_BIT1_SHIFT    5
-#define TSTORM_ISCSI_TASK_AG_CTX_BIT2_MASK     0x1
-#define TSTORM_ISCSI_TASK_AG_CTX_BIT2_SHIFT    6
-#define TSTORM_ISCSI_TASK_AG_CTX_BIT3_MASK     0x1
-#define TSTORM_ISCSI_TASK_AG_CTX_BIT3_SHIFT    7
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_NIBBLE0_MASK        0xF
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_NIBBLE0_SHIFT       0
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_BIT0_MASK           0x1
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_BIT0_SHIFT          4
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_BIT1_MASK           0x1
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_BIT1_SHIFT          5
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_BIT2_MASK           0x1
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_BIT2_SHIFT          6
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_BIT3_MASK           0x1
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_BIT3_SHIFT          7
         u8 flags1;
-#define TSTORM_ISCSI_TASK_AG_CTX_BIT4_MASK     0x1
-#define TSTORM_ISCSI_TASK_AG_CTX_BIT4_SHIFT    0
-#define TSTORM_ISCSI_TASK_AG_CTX_BIT5_MASK     0x1
-#define TSTORM_ISCSI_TASK_AG_CTX_BIT5_SHIFT    1
-#define TSTORM_ISCSI_TASK_AG_CTX_CF0_MASK      0x3
-#define TSTORM_ISCSI_TASK_AG_CTX_CF0_SHIFT     2
-#define TSTORM_ISCSI_TASK_AG_CTX_CF1_MASK      0x3
-#define TSTORM_ISCSI_TASK_AG_CTX_CF1_SHIFT     4
-#define TSTORM_ISCSI_TASK_AG_CTX_CF2_MASK      0x3
-#define TSTORM_ISCSI_TASK_AG_CTX_CF2_SHIFT     6
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_BIT4_MASK   0x1
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_BIT4_SHIFT  0
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_BIT5_MASK   0x1
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_BIT5_SHIFT  1
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_CF0_MASK    0x3
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_CF0_SHIFT   2
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_CF1_MASK    0x3
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_CF1_SHIFT   4
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_CF2_MASK    0x3
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_CF2_SHIFT   6
         u8 flags2;
-#define TSTORM_ISCSI_TASK_AG_CTX_CF3_MASK      0x3
-#define TSTORM_ISCSI_TASK_AG_CTX_CF3_SHIFT     0
-#define TSTORM_ISCSI_TASK_AG_CTX_CF4_MASK      0x3
-#define TSTORM_ISCSI_TASK_AG_CTX_CF4_SHIFT     2
-#define TSTORM_ISCSI_TASK_AG_CTX_CF5_MASK      0x3
-#define TSTORM_ISCSI_TASK_AG_CTX_CF5_SHIFT     4
-#define TSTORM_ISCSI_TASK_AG_CTX_CF6_MASK      0x3
-#define TSTORM_ISCSI_TASK_AG_CTX_CF6_SHIFT     6
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_CF3_MASK    0x3
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_CF3_SHIFT   0
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_CF4_MASK    0x3
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_CF4_SHIFT   2
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_CF5_MASK    0x3
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_CF5_SHIFT   4
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_CF6_MASK    0x3
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_CF6_SHIFT   6
         u8 flags3;
-#define TSTORM_ISCSI_TASK_AG_CTX_CF7_MASK      0x3
-#define TSTORM_ISCSI_TASK_AG_CTX_CF7_SHIFT     0
-#define TSTORM_ISCSI_TASK_AG_CTX_CF0EN_MASK    0x1
-#define TSTORM_ISCSI_TASK_AG_CTX_CF0EN_SHIFT   2
-#define TSTORM_ISCSI_TASK_AG_CTX_CF1EN_MASK    0x1
-#define TSTORM_ISCSI_TASK_AG_CTX_CF1EN_SHIFT   3
-#define TSTORM_ISCSI_TASK_AG_CTX_CF2EN_MASK    0x1
-#define TSTORM_ISCSI_TASK_AG_CTX_CF2EN_SHIFT   4
-#define TSTORM_ISCSI_TASK_AG_CTX_CF3EN_MASK    0x1
-#define TSTORM_ISCSI_TASK_AG_CTX_CF3EN_SHIFT   5
-#define TSTORM_ISCSI_TASK_AG_CTX_CF4EN_MASK    0x1
-#define TSTORM_ISCSI_TASK_AG_CTX_CF4EN_SHIFT   6
-#define TSTORM_ISCSI_TASK_AG_CTX_CF5EN_MASK    0x1
-#define TSTORM_ISCSI_TASK_AG_CTX_CF5EN_SHIFT   7
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_CF7_MASK    0x3
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_CF7_SHIFT   0
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_CF0EN_MASK  0x1
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_CF0EN_SHIFT 2
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_CF1EN_MASK  0x1
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_CF1EN_SHIFT 3
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_CF2EN_MASK  0x1
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_CF2EN_SHIFT 4
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_CF3EN_MASK  0x1
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_CF3EN_SHIFT 5
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_CF4EN_MASK  0x1
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_CF4EN_SHIFT 6
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_CF5EN_MASK  0x1
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_CF5EN_SHIFT 7
         u8 flags4;
-#define TSTORM_ISCSI_TASK_AG_CTX_CF6EN_MASK    0x1
-#define TSTORM_ISCSI_TASK_AG_CTX_CF6EN_SHIFT   0
-#define TSTORM_ISCSI_TASK_AG_CTX_CF7EN_MASK    0x1
-#define TSTORM_ISCSI_TASK_AG_CTX_CF7EN_SHIFT   1
-#define TSTORM_ISCSI_TASK_AG_CTX_RULE0EN_MASK  0x1
-#define TSTORM_ISCSI_TASK_AG_CTX_RULE0EN_SHIFT 2
-#define TSTORM_ISCSI_TASK_AG_CTX_RULE1EN_MASK  0x1
-#define TSTORM_ISCSI_TASK_AG_CTX_RULE1EN_SHIFT 3
-#define TSTORM_ISCSI_TASK_AG_CTX_RULE2EN_MASK  0x1
-#define TSTORM_ISCSI_TASK_AG_CTX_RULE2EN_SHIFT 4
-#define TSTORM_ISCSI_TASK_AG_CTX_RULE3EN_MASK  0x1
-#define TSTORM_ISCSI_TASK_AG_CTX_RULE3EN_SHIFT 5
-#define TSTORM_ISCSI_TASK_AG_CTX_RULE4EN_MASK  0x1
-#define TSTORM_ISCSI_TASK_AG_CTX_RULE4EN_SHIFT 6
-#define TSTORM_ISCSI_TASK_AG_CTX_RULE5EN_MASK  0x1
-#define TSTORM_ISCSI_TASK_AG_CTX_RULE5EN_SHIFT 7
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_CF6EN_MASK          0x1
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_CF6EN_SHIFT         0
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_CF7EN_MASK          0x1
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_CF7EN_SHIFT         1
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_RULE0EN_MASK        0x1
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_RULE0EN_SHIFT       2
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_RULE1EN_MASK        0x1
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_RULE1EN_SHIFT       3
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_RULE2EN_MASK        0x1
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_RULE2EN_SHIFT       4
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_RULE3EN_MASK        0x1
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_RULE3EN_SHIFT       5
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_RULE4EN_MASK        0x1
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_RULE4EN_SHIFT       6
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_RULE5EN_MASK        0x1
+#define E4_TSTORM_ISCSI_TASK_AG_CTX_RULE5EN_SHIFT       7
         u8 byte2;
         __le16 word1;
         __le32 reg0;
@@ -1376,18 +1551,20 @@ struct tstorm_iscsi_task_ag_ctx {
         __le32 reg1;
         __le32 reg2;
 };
+
+/* iSCSI doorbell data */
 struct iscsi_db_data {
         u8 params;
-#define ISCSI_DB_DATA_DEST_MASK         0x3
-#define ISCSI_DB_DATA_DEST_SHIFT        0
-#define ISCSI_DB_DATA_AGG_CMD_MASK      0x3
-#define ISCSI_DB_DATA_AGG_CMD_SHIFT     2
-#define ISCSI_DB_DATA_BYPASS_EN_MASK    0x1
-#define ISCSI_DB_DATA_BYPASS_EN_SHIFT   4
-#define ISCSI_DB_DATA_RESERVED_MASK     0x1
-#define ISCSI_DB_DATA_RESERVED_SHIFT    5
-#define ISCSI_DB_DATA_AGG_VAL_SEL_MASK  0x3
-#define ISCSI_DB_DATA_AGG_VAL_SEL_SHIFT 6
+#define ISCSI_DB_DATA_DEST_MASK         0x3
+#define ISCSI_DB_DATA_DEST_SHIFT        0
+#define ISCSI_DB_DATA_AGG_CMD_MASK      0x3
+#define ISCSI_DB_DATA_AGG_CMD_SHIFT     2
+#define ISCSI_DB_DATA_BYPASS_EN_MASK    0x1
+#define ISCSI_DB_DATA_BYPASS_EN_SHIFT   4
+#define ISCSI_DB_DATA_RESERVED_MASK     0x1
+#define ISCSI_DB_DATA_RESERVED_SHIFT    5
+#define ISCSI_DB_DATA_AGG_VAL_SEL_MASK  0x3
+#define ISCSI_DB_DATA_AGG_VAL_SEL_SHIFT 6
         u8 agg_flags;
         __le16 sq_prod;
 };