leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scsi: lpfc: Fix WQ/CQ creation for older asic's.

Browse Source 
The patch to enlarge WQ/CQ creation keys off of an adapter response that
indicates support for the larger values. Older adapters return an
incorrect response and are limited in size.  Thus the adapters fail the
WQ creation steps.

Augment the WQ sizing checks with a check on the older adapter types and
limit them to the restricted sizes.

Fixes: c176ffa084 ("scsi: lpfc: Increase CQ and WQ sizes for SCSI")
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>
This commit is contained in:
James Smart 2018-04-09 14:24:28 -07:00 committed by Martin K. Petersen
parent 01466024d2
commit bf316c7851
3 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/scsi/lpfc/lpfc_hw4.h
View File

@ -104,6 +104,17 @@ struct lpfc_sli_intf {
#define LPFC_SLI_INTF_IF_TYPE_VIRT 1 #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_EMBED true
#define LPFC_SLI4_MBX_NEMBED false #define LPFC_SLI4_MBX_NEMBED false
@ -566,6 +577,7 @@ struct lpfc_register {
/* The following BAR0 register sets are defined for if_type 0 and 2 UCNAs. */ /* The following BAR0 register sets are defined for if_type 0 and 2 UCNAs. */
#define LPFC_SLI_INTF 0x0058 #define LPFC_SLI_INTF 0x0058
#define LPFC_SLI_ASIC_VER 0x009C
#define LPFC_CTL_PORT_SEM_OFFSET 0x400 #define LPFC_CTL_PORT_SEM_OFFSET 0x400
#define lpfc_port_smphr_perr_SHIFT 31 #define lpfc_port_smphr_perr_SHIFT 31

15
drivers/scsi/lpfc/lpfc_init.c
View File

@ -9514,6 +9514,11 @@ lpfc_sli4_pci_mem_setup(struct lpfc_hba *phba)
return error; 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. */ /* There is no SLI3 failback for SLI4 devices. */
if (bf_get(lpfc_sli_intf_valid, &phba->sli4_hba.sli_intf) != if (bf_get(lpfc_sli_intf_valid, &phba->sli4_hba.sli_intf) !=
LPFC_SLI_INTF_VALID) { LPFC_SLI_INTF_VALID) {
@ -10545,6 +10550,7 @@ lpfc_get_sli4_parameters(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)
struct lpfc_pc_sli4_params *sli4_params; struct lpfc_pc_sli4_params *sli4_params;
uint32_t mbox_tmo; uint32_t mbox_tmo;
int length; int length;
bool exp_wqcq_pages = true;
struct lpfc_sli4_parameters *mbx_sli4_parameters; struct lpfc_sli4_parameters *mbx_sli4_parameters;
/* /*
@ -10671,8 +10677,17 @@ lpfc_get_sli4_parameters(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)
phba->nvme_support, phba->nvme_embed_pbde, phba->nvme_support, phba->nvme_embed_pbde,
phba->cfg_nvme_embed_cmd, phba->cfg_suppress_rsp); phba->cfg_nvme_embed_cmd, phba->cfg_suppress_rsp);
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))
exp_wqcq_pages = false;
if ((bf_get(cfg_cqpsize, mbx_sli4_parameters) & LPFC_CQ_16K_PAGE_SZ) && if ((bf_get(cfg_cqpsize, mbx_sli4_parameters) & LPFC_CQ_16K_PAGE_SZ) &&
(bf_get(cfg_wqpsize, mbx_sli4_parameters) & LPFC_WQ_16K_PAGE_SZ) && (bf_get(cfg_wqpsize, mbx_sli4_parameters) & LPFC_WQ_16K_PAGE_SZ) &&
exp_wqcq_pages &&
(sli4_params->wqsize & LPFC_WQ_SZ128_SUPPORT)) (sli4_params->wqsize & LPFC_WQ_SZ128_SUPPORT))
phba->enab_exp_wqcq_pages = 1; phba->enab_exp_wqcq_pages = 1;
else else

1
drivers/scsi/lpfc/lpfc_sli4.h
View File

@ -592,6 +592,7 @@ struct lpfc_sli4_hba {
uint32_t ue_to_sr; uint32_t ue_to_sr;
uint32_t ue_to_rp; uint32_t ue_to_rp;
struct lpfc_register sli_intf; struct lpfc_register sli_intf;
struct lpfc_register sli_asic_ver;
struct lpfc_pc_sli4_params pc_sli4_params; struct lpfc_pc_sli4_params pc_sli4_params;
struct lpfc_bbscn_params bbscn_params; struct lpfc_bbscn_params bbscn_params;
struct lpfc_hba_eq_hdl *hba_eq_hdl; /* HBA per-WQ handle */ struct lpfc_hba_eq_hdl *hba_eq_hdl; /* HBA per-WQ handle */