Merge branch 'for-arm' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal...

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / lpfc / lpfc_hw4.h

diff --git a/drivers/scsi/lpfc/lpfc_hw4.h b/drivers/scsi/lpfc/lpfc_hw4.h
index 91f09761bd328136142fd3a37bd737789c6cee47..f1946dfda5b4ebbd80f8762ba5102ddc482a3d3d 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_hw4.h
+++ b/drivers/scsi/lpfc/lpfc_hw4.h
@@ -228,19 +228,15 @@ struct lpfc_sli4_flags {
 #define lpfc_idx_rsrc_rdy_MASK         0x00000001
 #define lpfc_idx_rsrc_rdy_WORD         word0
 #define LPFC_IDX_RSRC_RDY              1
-#define lpfc_xri_rsrc_rdy_SHIFT                1
-#define lpfc_xri_rsrc_rdy_MASK         0x00000001
-#define lpfc_xri_rsrc_rdy_WORD         word0
-#define LPFC_XRI_RSRC_RDY              1
-#define lpfc_rpi_rsrc_rdy_SHIFT                2
+#define lpfc_rpi_rsrc_rdy_SHIFT                1
 #define lpfc_rpi_rsrc_rdy_MASK         0x00000001
 #define lpfc_rpi_rsrc_rdy_WORD         word0
 #define LPFC_RPI_RSRC_RDY              1
-#define lpfc_vpi_rsrc_rdy_SHIFT                3
+#define lpfc_vpi_rsrc_rdy_SHIFT                2
 #define lpfc_vpi_rsrc_rdy_MASK         0x00000001
 #define lpfc_vpi_rsrc_rdy_WORD         word0
 #define LPFC_VPI_RSRC_RDY              1
-#define lpfc_vfi_rsrc_rdy_SHIFT                4
+#define lpfc_vfi_rsrc_rdy_SHIFT                3
 #define lpfc_vfi_rsrc_rdy_MASK         0x00000001
 #define lpfc_vfi_rsrc_rdy_WORD         word0
 #define LPFC_VFI_RSRC_RDY              1
@@ -3299,7 +3295,13 @@ struct els_request64_wqe {
 struct xmit_els_rsp64_wqe {
        struct ulp_bde64 bde;
        uint32_t response_payload_len;
-       uint32_t rsvd4;
+       uint32_t word4;
+#define els_rsp64_sid_SHIFT         0
+#define els_rsp64_sid_MASK          0x00FFFFFF
+#define els_rsp64_sid_WORD          word4
+#define els_rsp64_sp_SHIFT          24
+#define els_rsp64_sp_MASK           0x00000001
+#define els_rsp64_sp_WORD           word4
        struct wqe_did wqe_dest;
        struct wqe_common wqe_com; /* words 6-11 */
        uint32_t word12;