1 files changed, 40 insertions, 2 deletions

diff --git a/drivers/scsi/bfa/bfi.h b/drivers/scsi/bfa/bfi.h
index 37bd2564e83b..9ef91f907dec 100644
--- a/drivers/scsi/bfa/bfi.h
+++ b/drivers/scsi/bfa/bfi.h
@@ -46,6 +46,7 @@
  */
 #define BFI_FLASH_CHUNK_SZ                      256     /*  Flash chunk size */
 #define BFI_FLASH_CHUNK_SZ_WORDS        (BFI_FLASH_CHUNK_SZ/sizeof(u32))
+#define BFI_FLASH_IMAGE_SZ              0x100000
 
 /*
  * Msg header common to all msgs
@@ -324,7 +325,29 @@ struct bfi_ioc_getattr_reply_s {
 #define BFI_IOC_TRC_ENTS        256
 
 #define BFI_IOC_FW_SIGNATURE    (0xbfadbfad)
+#define BFA_IOC_FW_INV_SIGN     (0xdeaddead)
 #define BFI_IOC_MD5SUM_SZ       4
+
+struct bfi_ioc_fwver_s {
+#ifdef __BIG_ENDIAN
+        uint8_t patch;
+        uint8_t maint;
+        uint8_t minor;
+        uint8_t major;
+        uint8_t rsvd[2];
+        uint8_t build;
+        uint8_t phase;
+#else
+        uint8_t major;
+        uint8_t minor;
+        uint8_t maint;
+        uint8_t patch;
+        uint8_t phase;
+        uint8_t build;
+        uint8_t rsvd[2];
+#endif
+};
+
 struct bfi_ioc_image_hdr_s {
         u32     signature;      /* constant signature           */
         u8      asic_gen;       /* asic generation              */
@@ -333,10 +356,18 @@ struct bfi_ioc_image_hdr_s {
         u8      port1_mode;     /* device mode for port 1       */
         u32     exec;           /* exec vector                  */
         u32     bootenv;        /* fimware boot env             */
-        u32     rsvd_b[4];
+        u32     rsvd_b[2];
+        struct bfi_ioc_fwver_s  fwver;
         u32     md5sum[BFI_IOC_MD5SUM_SZ];
 };
 
+enum bfi_ioc_img_ver_cmp_e {
+        BFI_IOC_IMG_VER_INCOMP,
+        BFI_IOC_IMG_VER_OLD,
+        BFI_IOC_IMG_VER_SAME,
+        BFI_IOC_IMG_VER_BETTER
+};
+
 #define BFI_FWBOOT_DEVMODE_OFF          4
 #define BFI_FWBOOT_TYPE_OFF             8
 #define BFI_FWBOOT_ENV_OFF              12
@@ -346,6 +377,12 @@ struct bfi_ioc_image_hdr_s {
          ((u32)(__p0_mode)) << 8 |              \
          ((u32)(__p1_mode)))
 
+enum bfi_fwboot_type {
+        BFI_FWBOOT_TYPE_NORMAL  = 0,
+        BFI_FWBOOT_TYPE_FLASH   = 1,
+        BFI_FWBOOT_TYPE_MEMTEST = 2,
+};
+
 #define BFI_FWBOOT_TYPE_NORMAL  0
 #define BFI_FWBOOT_TYPE_MEMTEST 2
 #define BFI_FWBOOT_ENV_OS       0
@@ -1107,7 +1144,8 @@ 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];
+        u8      mode;   /* bfa_diag_dport_test_opmode */
+        u8      rsvd[2];
         u32     numfrm; /* from switch uint in 1M */
 };