1 files changed, 19 insertions, 13 deletions

diff --git a/drivers/scsi/lpfc/lpfc_hw.h b/drivers/scsi/lpfc/lpfc_hw.h
index f5dbf2be3eab..1676f61291e7 100644
--- a/drivers/scsi/lpfc/lpfc_hw.h
+++ b/drivers/scsi/lpfc/lpfc_hw.h
@@ -2291,7 +2291,8 @@ typedef struct {
 typedef struct {
 #ifdef __BIG_ENDIAN_BITFIELD
         uint32_t rsvd1;
-        uint32_t rsvd2:8;
+        uint32_t rsvd2:7;
+        uint32_t upd:1;
         uint32_t sid:24;
         uint32_t wwn[2];
         uint32_t rsvd5;
@@ -2300,7 +2301,8 @@ typedef struct {
 #else   /*  __LITTLE_ENDIAN */
         uint32_t rsvd1;
         uint32_t sid:24;
-        uint32_t rsvd2:8;
+        uint32_t upd:1;
+        uint32_t rsvd2:7;
         uint32_t wwn[2];
         uint32_t rsvd5;
         uint16_t vpi;
@@ -2806,11 +2808,15 @@ typedef struct {
         uint32_t rsvd6;           /* Reserved                             */
 
 #ifdef __BIG_ENDIAN_BITFIELD
-        uint32_t rsvd7      : 16;  /* Reserved                             */
+        uint32_t fips_rev   : 3;   /* FIPS Spec Revision                   */
+        uint32_t fips_level : 4;   /* FIPS Level                           */
+        uint32_t sec_err    : 9;   /* security crypto error                */
         uint32_t max_vpi    : 16;  /* Max number of virt N-Ports           */
 #else   /*  __LITTLE_ENDIAN */
         uint32_t max_vpi    : 16;  /* Max number of virt N-Ports           */
-        uint32_t rsvd7      : 16;  /* Reserved                             */
+        uint32_t sec_err    : 9;   /* security crypto error                */
+        uint32_t fips_level : 4;   /* FIPS Level                           */
+        uint32_t fips_rev   : 3;   /* FIPS Spec Revision                   */
 #endif
 
 } CONFIG_PORT_VAR;
@@ -3441,63 +3447,63 @@ struct sli3_bg_fields {
 static inline uint32_t
 lpfc_bgs_get_bidir_bg_prof(uint32_t bgstat)
 {
-        return (le32_to_cpu(bgstat) & BGS_BIDIR_BG_PROF_MASK) >>
+        return (bgstat & BGS_BIDIR_BG_PROF_MASK) >>
                                 BGS_BIDIR_BG_PROF_SHIFT;
 }
 
 static inline uint32_t
 lpfc_bgs_get_bidir_err_cond(uint32_t bgstat)
 {
-        return (le32_to_cpu(bgstat) & BGS_BIDIR_ERR_COND_FLAGS_MASK) >>
+        return (bgstat & BGS_BIDIR_ERR_COND_FLAGS_MASK) >>
                                 BGS_BIDIR_ERR_COND_SHIFT;
 }
 
 static inline uint32_t
 lpfc_bgs_get_bg_prof(uint32_t bgstat)
 {
-        return (le32_to_cpu(bgstat) & BGS_BG_PROFILE_MASK) >>
+        return (bgstat & BGS_BG_PROFILE_MASK) >>
                                 BGS_BG_PROFILE_SHIFT;
 }
 
 static inline uint32_t
 lpfc_bgs_get_invalid_prof(uint32_t bgstat)
 {
-        return (le32_to_cpu(bgstat) & BGS_INVALID_PROF_MASK) >>
+        return (bgstat & BGS_INVALID_PROF_MASK) >>
                                 BGS_INVALID_PROF_SHIFT;
 }
 
 static inline uint32_t
 lpfc_bgs_get_uninit_dif_block(uint32_t bgstat)
 {
-        return (le32_to_cpu(bgstat) & BGS_UNINIT_DIF_BLOCK_MASK) >>
+        return (bgstat & BGS_UNINIT_DIF_BLOCK_MASK) >>
                                 BGS_UNINIT_DIF_BLOCK_SHIFT;
 }
 
 static inline uint32_t
 lpfc_bgs_get_hi_water_mark_present(uint32_t bgstat)
 {
-        return (le32_to_cpu(bgstat) & BGS_HI_WATER_MARK_PRESENT_MASK) >>
+        return (bgstat & BGS_HI_WATER_MARK_PRESENT_MASK) >>
                                 BGS_HI_WATER_MARK_PRESENT_SHIFT;
 }
 
 static inline uint32_t
 lpfc_bgs_get_reftag_err(uint32_t bgstat)
 {
-        return (le32_to_cpu(bgstat) & BGS_REFTAG_ERR_MASK) >>
+        return (bgstat & BGS_REFTAG_ERR_MASK) >>
                                 BGS_REFTAG_ERR_SHIFT;
 }
 
 static inline uint32_t
 lpfc_bgs_get_apptag_err(uint32_t bgstat)
 {
-        return (le32_to_cpu(bgstat) & BGS_APPTAG_ERR_MASK) >>
+        return (bgstat & BGS_APPTAG_ERR_MASK) >>
                                 BGS_APPTAG_ERR_SHIFT;
 }
 
 static inline uint32_t
 lpfc_bgs_get_guard_err(uint32_t bgstat)
 {
-        return (le32_to_cpu(bgstat) & BGS_GUARD_ERR_MASK) >>
+        return (bgstat & BGS_GUARD_ERR_MASK) >>
                                 BGS_GUARD_ERR_SHIFT;
 }