summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/lpfc/lpfc_init.c
diff options
context:
space:
mode:
authorJames Smart2018-05-25 06:09:00 +0200
committerMartin K. Petersen2018-05-29 04:40:33 +0200
commitc221768bd49a7423be57c00a56985c0e9c4122cd (patch)
tree95b132c07e187ecd69665ececbdd7ec12a08772c /drivers/scsi/lpfc/lpfc_init.c
parentscsi: lpfc: Fix crash in blk_mq layer when executing modprobe -r lpfc (diff)
downloadkernel-qcow2-linux-c221768bd49a7423be57c00a56985c0e9c4122cd.tar.gz
kernel-qcow2-linux-c221768bd49a7423be57c00a56985c0e9c4122cd.tar.xz
kernel-qcow2-linux-c221768bd49a7423be57c00a56985c0e9c4122cd.zip
scsi: lpfc: Fix 16gb hbas failing cq create.
The lancer G5 chip family fails the CQ create with 16k page size. The hardware incorrectly reports it supports large page sizes when it is actually limited to 4k pages. A prior patch resolved this for the A0 chip revision only. This patch excludes all revisions of the G5 asic from using large page sizes. As knowing the actual chip revision is unnecessary, the now unused definitions are removed Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com> Signed-off-by: James Smart <james.smart@broadcom.com> Reviewed-by: Hannes Reinecke <hare@suse.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_init.c')
-rw-r--r--drivers/scsi/lpfc/lpfc_init.c9
1 files changed, 1 insertions, 8 deletions
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) &&