Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[karo-tx-linux.git] / drivers / net / ethernet / brocade / bna / bfi.h

diff --git a/drivers/net/ethernet/brocade/bna/bfi.h b/drivers/net/ethernet/brocade/bna/bfi.h
index 1f24c23dc7862ba46c88e17a11952dc33dc0ef18..8c563a77cdf6a237c02bb599f27eada95bb61dde 100644 (file)
--- a/drivers/net/ethernet/brocade/bna/bfi.h
+++ b/drivers/net/ethernet/brocade/bna/bfi.h
@@ -25,6 +25,7 @@
 /* BFI FW image type */
 #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 */
 struct bfi_mhdr {
@@ -233,7 +234,29 @@ struct bfi_ioc_getattr_reply {
 #define BFI_IOC_TRC_HDR_SZ     32
 
 #define BFI_IOC_FW_SIGNATURE   (0xbfadbfad)
+#define BFI_IOC_FW_INV_SIGN    (0xdeaddead)
 #define BFI_IOC_MD5SUM_SZ      4
+
+struct bfi_ioc_fwver {
+#ifdef __BIG_ENDIAN
+       u8 patch;
+       u8 maint;
+       u8 minor;
+       u8 major;
+       u8 rsvd[2];
+       u8 build;
+       u8 phase;
+#else
+       u8 major;
+       u8 minor;
+       u8 maint;
+       u8 patch;
+       u8 phase;
+       u8 build;
+       u8 rsvd[2];
+#endif
+};
+
 struct bfi_ioc_image_hdr {
        u32     signature;      /*!< constant signature */
        u8      asic_gen;       /*!< asic generation */
@@ -242,10 +265,18 @@ struct bfi_ioc_image_hdr {
        u8      port1_mode;     /*!< device mode for port 1 */
        u32     exec;           /*!< exec vector        */
        u32     bootenv;        /*!< firmware boot env */
-       u32     rsvd_b[4];
+       u32     rsvd_b[2];
+       struct bfi_ioc_fwver fwver;
        u32     md5sum[BFI_IOC_MD5SUM_SZ];
 };
 
+enum bfi_ioc_img_ver_cmp {
+       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