1 files changed, 81 insertions, 25 deletions

diff --git a/drivers/scsi/bfa/bfa_defs.h b/drivers/scsi/bfa/bfa_defs.h
index 715d9f9fe33..97ad07c4aee 100644
--- a/drivers/scsi/bfa/bfa_defs.h
+++ b/drivers/scsi/bfa/bfa_defs.h
@@ -133,6 +133,7 @@ enum bfa_status {
         BFA_STATUS_SFP_UNSUPP   = 10,   /*  Unsupported SFP - Replace SFP */
         BFA_STATUS_UNKNOWN_VFID = 11,   /*  VF_ID not found */
         BFA_STATUS_DEVBUSY      = 13,   /*  Device busy - Retry operation */
+        BFA_STATUS_FLASH_BAD_LEN = 17,  /*  Flash bad length */
         BFA_STATUS_UNKNOWN_LWWN = 18,   /*  LPORT PWWN not found */
         BFA_STATUS_UNKNOWN_RWWN = 19,   /*  RPORT PWWN not found */
         BFA_STATUS_VPORT_EXISTS = 21,   /*  VPORT already exists */
@@ -384,31 +385,39 @@ struct bfa_ioc_attr_s {
  * All numerical fields are in big-endian format.
  */
 struct bfa_mfg_block_s {
-        u8              version;        /*  manufacturing block version */
-        u8              mfg_sig[3];     /*  characters 'M', 'F', 'G' */
-        u16     mfgsize;        /*  mfg block size */
-        u16     u16_chksum;     /*  old u16 checksum */
-        char            brcd_serialnum[STRSZ(BFA_MFG_SERIALNUM_SIZE)];
-        char            brcd_partnum[STRSZ(BFA_MFG_PARTNUM_SIZE)];
-        u8              mfg_day;        /*  manufacturing day */
-        u8              mfg_month;      /*  manufacturing month */
-        u16     mfg_year;       /*  manufacturing year */
-        wwn_t           mfg_wwn;        /*  wwn base for this adapter */
-        u8              num_wwn;        /*  number of wwns assigned */
-        u8              mfg_speeds;     /*  speeds allowed for this adapter */
-        u8              rsv[2];
-        char            supplier_id[STRSZ(BFA_MFG_SUPPLIER_ID_SIZE)];
-        char            supplier_partnum[STRSZ(BFA_MFG_SUPPLIER_PARTNUM_SIZE)];
-        char
-                supplier_serialnum[STRSZ(BFA_MFG_SUPPLIER_SERIALNUM_SIZE)];
-        char
-                supplier_revision[STRSZ(BFA_MFG_SUPPLIER_REVISION_SIZE)];
-        mac_t           mfg_mac;        /*  mac address */
-        u8              num_mac;        /*  number of mac addresses */
-        u8              rsv2;
-        u32     mfg_type;       /*  card type */
-        u8              rsv3[108];
-        u8              md5_chksum[BFA_MFG_CHKSUM_SIZE]; /*  md5 checksum */
+        u8      version;    /*!< manufacturing block version */
+        u8     mfg_sig[3]; /*!< characters 'M', 'F', 'G' */
+        u16    mfgsize;    /*!< mfg block size */
+        u16    u16_chksum; /*!< old u16 checksum */
+        char        brcd_serialnum[STRSZ(BFA_MFG_SERIALNUM_SIZE)];
+        char        brcd_partnum[STRSZ(BFA_MFG_PARTNUM_SIZE)];
+        u8     mfg_day;    /*!< manufacturing day */
+        u8     mfg_month;  /*!< manufacturing month */
+        u16    mfg_year;   /*!< manufacturing year */
+        wwn_t       mfg_wwn;    /*!< wwn base for this adapter */
+        u8     num_wwn;    /*!< number of wwns assigned */
+        u8     mfg_speeds; /*!< speeds allowed for this adapter */
+        u8     rsv[2];
+        char    supplier_id[STRSZ(BFA_MFG_SUPPLIER_ID_SIZE)];
+        char    supplier_partnum[STRSZ(BFA_MFG_SUPPLIER_PARTNUM_SIZE)];
+        char    supplier_serialnum[STRSZ(BFA_MFG_SUPPLIER_SERIALNUM_SIZE)];
+        char    supplier_revision[STRSZ(BFA_MFG_SUPPLIER_REVISION_SIZE)];
+        mac_t       mfg_mac;    /*!< base mac address */
+        u8     num_mac;    /*!< number of mac addresses */
+        u8     rsv2;
+        u32    card_type;  /*!< card type          */
+        char        cap_nic;    /*!< capability nic     */
+        char        cap_cna;    /*!< capability cna     */
+        char        cap_hba;    /*!< capability hba     */
+        char        cap_fc16g;  /*!< capability fc 16g      */
+        char        cap_sriov;  /*!< capability sriov       */
+        char        cap_mezz;   /*!< capability mezz        */
+        u8     rsv3;
+        u8     mfg_nports; /*!< number of ports        */
+        char        media[8];   /*!< xfi/xaui           */
+        char        initial_mode[8]; /*!< initial mode: hba/cna/nic */
+        u8     rsv4[84];
+        u8     md5_chksum[BFA_MFG_CHKSUM_SIZE]; /*!< md5 checksum */
 };
 
 #pragma pack()
@@ -825,6 +834,53 @@ struct sfp_xcvr_s {
         union sfp_xcvr_fc3_code_u       fc3;
 };
 
+/*
+ *      Flash module specific
+ */
+#define BFA_FLASH_PART_ENTRY_SIZE       32      /* partition entry size */
+#define BFA_FLASH_PART_MAX              32      /* maximal # of partitions */
+
+enum bfa_flash_part_type {
+        BFA_FLASH_PART_OPTROM   = 1,    /* option rom partition */
+        BFA_FLASH_PART_FWIMG    = 2,    /* firmware image partition */
+        BFA_FLASH_PART_FWCFG    = 3,    /* firmware tuneable config */
+        BFA_FLASH_PART_DRV      = 4,    /* IOC driver config */
+        BFA_FLASH_PART_BOOT     = 5,    /* boot config */
+        BFA_FLASH_PART_ASIC     = 6,    /* asic bootstrap configuration */
+        BFA_FLASH_PART_MFG      = 7,    /* manufacturing block partition */
+        BFA_FLASH_PART_OPTROM2  = 8,    /* 2nd option rom partition */
+        BFA_FLASH_PART_VPD      = 9,    /* vpd data of OEM info */
+        BFA_FLASH_PART_PBC      = 10,   /* pre-boot config */
+        BFA_FLASH_PART_BOOTOVL  = 11,   /* boot overlay partition */
+        BFA_FLASH_PART_LOG      = 12,   /* firmware log partition */
+        BFA_FLASH_PART_PXECFG   = 13,   /* pxe boot config partition */
+        BFA_FLASH_PART_PXEOVL   = 14,   /* pxe boot overlay partition */
+        BFA_FLASH_PART_PORTCFG  = 15,   /* port cfg partition */
+        BFA_FLASH_PART_ASICBK   = 16,   /* asic backup partition */
+};
+
+/*
+ * flash partition attributes
+ */
+struct bfa_flash_part_attr_s {
+        u32     part_type;      /* partition type */
+        u32     part_instance;  /* partition instance */
+        u32     part_off;       /* partition offset */
+        u32     part_size;      /* partition size */
+        u32     part_len;       /* partition content length */
+        u32     part_status;    /* partition status */
+        char    rsv[BFA_FLASH_PART_ENTRY_SIZE - 24];
+};
+
+/*
+ * flash attributes
+ */
+struct bfa_flash_attr_s {
+        u32     status; /* flash overall status */
+        u32     npart;  /* num of partitions */
+        struct bfa_flash_part_attr_s part[BFA_FLASH_PART_MAX];
+};
+
 #pragma pack()
 
 #endif /* __BFA_DEFS_H__ */