diff options
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_hw4.h | 11 | ||||
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_init.c | 9 | ||||
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_sli4.h | 1 |
3 files changed, 1 insertions, 20 deletions
diff --git a/drivers/scsi/lpfc/lpfc_hw4.h b/drivers/scsi/lpfc/lpfc_hw4.h index 807901af9bbe..f43f0bacb77a 100644 --- a/drivers/scsi/lpfc/lpfc_hw4.h +++ b/drivers/scsi/lpfc/lpfc_hw4.h @@ -104,17 +104,6 @@ struct lpfc_sli_intf { #define LPFC_SLI_INTF_IF_TYPE_VIRT 1 }; -struct lpfc_sli_asic_rev { - u32 word0; -#define LPFC_SLI_ASIC_VER_A 0x0 -#define LPFC_SLI_ASIC_VER_B 0x1 -#define LPFC_SLI_ASIC_VER_C 0x2 -#define LPFC_SLI_ASIC_VER_D 0x3 -#define lpfc_sli_asic_ver_SHIFT 4 -#define lpfc_sli_asic_ver_MASK 0x0000000F -#define lpfc_sli_asic_ver_WORD word0 -}; - #define LPFC_SLI4_MBX_EMBED true #define LPFC_SLI4_MBX_NEMBED false diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index 83bc8d849a0d..48a5f067cec6 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c @@ -9545,11 +9545,6 @@ lpfc_sli4_pci_mem_setup(struct lpfc_hba *phba) return error; } - if (pci_read_config_dword(pdev, LPFC_SLI_ASIC_VER, - &phba->sli4_hba.sli_asic_ver.word0)) { - return error; - } - /* There is no SLI3 failback for SLI4 devices. */ if (bf_get(lpfc_sli_intf_valid, &phba->sli4_hba.sli_intf) != LPFC_SLI_INTF_VALID) { @@ -10711,9 +10706,7 @@ lpfc_get_sli4_parameters(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq) if ((bf_get(lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf) == LPFC_SLI_INTF_IF_TYPE_2) && (bf_get(lpfc_sli_intf_sli_family, &phba->sli4_hba.sli_intf) == - LPFC_SLI_INTF_FAMILY_LNCR_A0) && - (bf_get(lpfc_sli_asic_ver, &phba->sli4_hba.sli_asic_ver) == - LPFC_SLI_ASIC_VER_A)) + LPFC_SLI_INTF_FAMILY_LNCR_A0)) exp_wqcq_pages = false; if ((bf_get(cfg_cqpsize, mbx_sli4_parameters) & LPFC_CQ_16K_PAGE_SZ) && diff --git a/drivers/scsi/lpfc/lpfc_sli4.h b/drivers/scsi/lpfc/lpfc_sli4.h index 179e870a00b4..cf64aca82bd0 100644 --- a/drivers/scsi/lpfc/lpfc_sli4.h +++ b/drivers/scsi/lpfc/lpfc_sli4.h @@ -592,7 +592,6 @@ struct lpfc_sli4_hba { uint32_t ue_to_sr; uint32_t ue_to_rp; struct lpfc_register sli_intf; - struct lpfc_register sli_asic_ver; struct lpfc_pc_sli4_params pc_sli4_params; struct lpfc_bbscn_params bbscn_params; struct lpfc_hba_eq_hdl *hba_eq_hdl; /* HBA per-WQ handle */ |