diff options
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_hw.h')
-rw-r--r-- | drivers/scsi/lpfc/lpfc_hw.h | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/drivers/scsi/lpfc/lpfc_hw.h b/drivers/scsi/lpfc/lpfc_hw.h index f5dbf2be3eab..897caa05e94d 100644 --- a/drivers/scsi/lpfc/lpfc_hw.h +++ b/drivers/scsi/lpfc/lpfc_hw.h | |||
@@ -2806,11 +2806,15 @@ typedef struct { | |||
2806 | uint32_t rsvd6; /* Reserved */ | 2806 | uint32_t rsvd6; /* Reserved */ |
2807 | 2807 | ||
2808 | #ifdef __BIG_ENDIAN_BITFIELD | 2808 | #ifdef __BIG_ENDIAN_BITFIELD |
2809 | uint32_t rsvd7 : 16; /* Reserved */ | 2809 | uint32_t fips_rev : 3; /* FIPS Spec Revision */ |
2810 | uint32_t fips_level : 4; /* FIPS Level */ | ||
2811 | uint32_t sec_err : 9; /* security crypto error */ | ||
2810 | uint32_t max_vpi : 16; /* Max number of virt N-Ports */ | 2812 | uint32_t max_vpi : 16; /* Max number of virt N-Ports */ |
2811 | #else /* __LITTLE_ENDIAN */ | 2813 | #else /* __LITTLE_ENDIAN */ |
2812 | uint32_t max_vpi : 16; /* Max number of virt N-Ports */ | 2814 | uint32_t max_vpi : 16; /* Max number of virt N-Ports */ |
2813 | uint32_t rsvd7 : 16; /* Reserved */ | 2815 | uint32_t sec_err : 9; /* security crypto error */ |
2816 | uint32_t fips_level : 4; /* FIPS Level */ | ||
2817 | uint32_t fips_rev : 3; /* FIPS Spec Revision */ | ||
2814 | #endif | 2818 | #endif |
2815 | 2819 | ||
2816 | } CONFIG_PORT_VAR; | 2820 | } CONFIG_PORT_VAR; |
@@ -3441,63 +3445,63 @@ struct sli3_bg_fields { | |||
3441 | static inline uint32_t | 3445 | static inline uint32_t |
3442 | lpfc_bgs_get_bidir_bg_prof(uint32_t bgstat) | 3446 | lpfc_bgs_get_bidir_bg_prof(uint32_t bgstat) |
3443 | { | 3447 | { |
3444 | return (le32_to_cpu(bgstat) & BGS_BIDIR_BG_PROF_MASK) >> | 3448 | return (bgstat & BGS_BIDIR_BG_PROF_MASK) >> |
3445 | BGS_BIDIR_BG_PROF_SHIFT; | 3449 | BGS_BIDIR_BG_PROF_SHIFT; |
3446 | } | 3450 | } |
3447 | 3451 | ||
3448 | static inline uint32_t | 3452 | static inline uint32_t |
3449 | lpfc_bgs_get_bidir_err_cond(uint32_t bgstat) | 3453 | lpfc_bgs_get_bidir_err_cond(uint32_t bgstat) |
3450 | { | 3454 | { |
3451 | return (le32_to_cpu(bgstat) & BGS_BIDIR_ERR_COND_FLAGS_MASK) >> | 3455 | return (bgstat & BGS_BIDIR_ERR_COND_FLAGS_MASK) >> |
3452 | BGS_BIDIR_ERR_COND_SHIFT; | 3456 | BGS_BIDIR_ERR_COND_SHIFT; |
3453 | } | 3457 | } |
3454 | 3458 | ||
3455 | static inline uint32_t | 3459 | static inline uint32_t |
3456 | lpfc_bgs_get_bg_prof(uint32_t bgstat) | 3460 | lpfc_bgs_get_bg_prof(uint32_t bgstat) |
3457 | { | 3461 | { |
3458 | return (le32_to_cpu(bgstat) & BGS_BG_PROFILE_MASK) >> | 3462 | return (bgstat & BGS_BG_PROFILE_MASK) >> |
3459 | BGS_BG_PROFILE_SHIFT; | 3463 | BGS_BG_PROFILE_SHIFT; |
3460 | } | 3464 | } |
3461 | 3465 | ||
3462 | static inline uint32_t | 3466 | static inline uint32_t |
3463 | lpfc_bgs_get_invalid_prof(uint32_t bgstat) | 3467 | lpfc_bgs_get_invalid_prof(uint32_t bgstat) |
3464 | { | 3468 | { |
3465 | return (le32_to_cpu(bgstat) & BGS_INVALID_PROF_MASK) >> | 3469 | return (bgstat & BGS_INVALID_PROF_MASK) >> |
3466 | BGS_INVALID_PROF_SHIFT; | 3470 | BGS_INVALID_PROF_SHIFT; |
3467 | } | 3471 | } |
3468 | 3472 | ||
3469 | static inline uint32_t | 3473 | static inline uint32_t |
3470 | lpfc_bgs_get_uninit_dif_block(uint32_t bgstat) | 3474 | lpfc_bgs_get_uninit_dif_block(uint32_t bgstat) |
3471 | { | 3475 | { |
3472 | return (le32_to_cpu(bgstat) & BGS_UNINIT_DIF_BLOCK_MASK) >> | 3476 | return (bgstat & BGS_UNINIT_DIF_BLOCK_MASK) >> |
3473 | BGS_UNINIT_DIF_BLOCK_SHIFT; | 3477 | BGS_UNINIT_DIF_BLOCK_SHIFT; |
3474 | } | 3478 | } |
3475 | 3479 | ||
3476 | static inline uint32_t | 3480 | static inline uint32_t |
3477 | lpfc_bgs_get_hi_water_mark_present(uint32_t bgstat) | 3481 | lpfc_bgs_get_hi_water_mark_present(uint32_t bgstat) |
3478 | { | 3482 | { |
3479 | return (le32_to_cpu(bgstat) & BGS_HI_WATER_MARK_PRESENT_MASK) >> | 3483 | return (bgstat & BGS_HI_WATER_MARK_PRESENT_MASK) >> |
3480 | BGS_HI_WATER_MARK_PRESENT_SHIFT; | 3484 | BGS_HI_WATER_MARK_PRESENT_SHIFT; |
3481 | } | 3485 | } |
3482 | 3486 | ||
3483 | static inline uint32_t | 3487 | static inline uint32_t |
3484 | lpfc_bgs_get_reftag_err(uint32_t bgstat) | 3488 | lpfc_bgs_get_reftag_err(uint32_t bgstat) |
3485 | { | 3489 | { |
3486 | return (le32_to_cpu(bgstat) & BGS_REFTAG_ERR_MASK) >> | 3490 | return (bgstat & BGS_REFTAG_ERR_MASK) >> |
3487 | BGS_REFTAG_ERR_SHIFT; | 3491 | BGS_REFTAG_ERR_SHIFT; |
3488 | } | 3492 | } |
3489 | 3493 | ||
3490 | static inline uint32_t | 3494 | static inline uint32_t |
3491 | lpfc_bgs_get_apptag_err(uint32_t bgstat) | 3495 | lpfc_bgs_get_apptag_err(uint32_t bgstat) |
3492 | { | 3496 | { |
3493 | return (le32_to_cpu(bgstat) & BGS_APPTAG_ERR_MASK) >> | 3497 | return (bgstat & BGS_APPTAG_ERR_MASK) >> |
3494 | BGS_APPTAG_ERR_SHIFT; | 3498 | BGS_APPTAG_ERR_SHIFT; |
3495 | } | 3499 | } |
3496 | 3500 | ||
3497 | static inline uint32_t | 3501 | static inline uint32_t |
3498 | lpfc_bgs_get_guard_err(uint32_t bgstat) | 3502 | lpfc_bgs_get_guard_err(uint32_t bgstat) |
3499 | { | 3503 | { |
3500 | return (le32_to_cpu(bgstat) & BGS_GUARD_ERR_MASK) >> | 3504 | return (bgstat & BGS_GUARD_ERR_MASK) >> |
3501 | BGS_GUARD_ERR_SHIFT; | 3505 | BGS_GUARD_ERR_SHIFT; |
3502 | } | 3506 | } |
3503 | 3507 | ||