1 files changed, 63 insertions, 5 deletions

diff --git a/drivers/scsi/bfa/bfi.h b/drivers/scsi/bfa/bfi.h
index 57b146bca18c..e70e0832eafd 100644
--- a/drivers/scsi/bfa/bfi.h
+++ b/drivers/scsi/bfa/bfi.h
@@ -973,6 +973,7 @@ enum bfi_diag_i2h {
         BFI_DIAG_I2H_LEDTEST = BFA_I2HM(BFI_DIAG_H2I_LEDTEST),
         BFI_DIAG_I2H_QTEST      = BFA_I2HM(BFI_DIAG_H2I_QTEST),
         BFI_DIAG_I2H_DPORT      = BFA_I2HM(BFI_DIAG_H2I_DPORT),
+        BFI_DIAG_I2H_DPORT_SCN  = BFA_I2HM(8),
 };
 
 #define BFI_DIAG_MAX_SGES       2
@@ -1064,16 +1065,73 @@ struct bfi_diag_qtest_req_s {
 enum bfi_dport_req {
         BFI_DPORT_DISABLE       = 0,    /* disable dport request        */
         BFI_DPORT_ENABLE        = 1,    /* enable dport request         */
+        BFI_DPORT_START         = 2,    /* start dport request  */
+        BFI_DPORT_SHOW          = 3,    /* show dport request   */
+        BFI_DPORT_DYN_DISABLE   = 4,    /* disable dynamic dport request */
+};
+
+enum bfi_dport_scn {
+        BFI_DPORT_SCN_TESTSTART         = 1,
+        BFI_DPORT_SCN_TESTCOMP          = 2,
+        BFI_DPORT_SCN_SFP_REMOVED       = 3,
+        BFI_DPORT_SCN_DDPORT_ENABLE     = 4,
+        BFI_DPORT_SCN_DDPORT_DISABLE    = 5,
+        BFI_DPORT_SCN_FCPORT_DISABLE    = 6,
+        BFI_DPORT_SCN_SUBTESTSTART      = 7,
+        BFI_DPORT_SCN_TESTSKIP          = 8,
+        BFI_DPORT_SCN_DDPORT_DISABLED   = 9,
 };
 
 struct bfi_diag_dport_req_s {
         struct bfi_mhdr_s       mh;     /* 4 bytes                      */
-        u8                      req;    /* request 1: enable 0: disable */
-        u8                      status; /* reply status                 */
-        u8                      rsvd[2];
-        u32                     msgtag; /* msgtag for reply             */
+        u8                      req;    /* request 1: enable 0: disable */
+        u8                      rsvd[3];
+        u32                     lpcnt;
+        u32                     payload;
+};
+
+struct bfi_diag_dport_rsp_s {
+        struct bfi_mhdr_s       mh;     /* header 4 bytes               */
+        bfa_status_t            status; /* reply status                 */
+        wwn_t                   pwwn;   /* switch port wwn. 8 bytes     */
+        wwn_t                   nwwn;   /* switch node wwn. 8 bytes     */
+};
+
+struct bfi_diag_dport_scn_teststart_s {
+        wwn_t   pwwn;   /* switch port wwn. 8 bytes */
+        wwn_t   nwwn;   /* switch node wwn. 8 bytes */
+        u8      type;   /* bfa_diag_dport_test_type_e */
+        u8      rsvd[3];
+        u32     numfrm; /* from switch uint in 1M */
+};
+
+struct bfi_diag_dport_scn_testcomp_s {
+        u8      status; /* bfa_diag_dport_test_status_e */
+        u8      speed;  /* bfa_port_speed_t  */
+        u16     numbuffer; /* from switch  */
+        u8      subtest_status[DPORT_TEST_MAX];  /* 4 bytes */
+        u32     latency;   /* from switch  */
+        u32     distance;  /* from swtich unit in meters  */
+                        /* Buffers required to saturate the link */
+        u16     frm_sz; /* from switch for buf_reqd */
+        u8      rsvd[2];
+};
+
+struct bfi_diag_dport_scn_s {           /* max size == RDS_RMESZ        */
+        struct bfi_mhdr_s       mh;     /* header 4 bytes               */
+        u8                      state;  /* new state                    */
+        u8                      rsvd[3];
+        union {
+                struct bfi_diag_dport_scn_teststart_s teststart;
+                struct bfi_diag_dport_scn_testcomp_s testcomp;
+        } info;
+};
+
+union bfi_diag_dport_msg_u {
+        struct bfi_diag_dport_req_s     req;
+        struct bfi_diag_dport_rsp_s     rsp;
+        struct bfi_diag_dport_scn_s     scn;
 };
-#define bfi_diag_dport_rsp_t struct bfi_diag_dport_req_s
 
 /*
  *      PHY module specific