Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannes Reinecke <hare@suse.de>2018-05-25 10:41:21 +0200
committerHannes Reinecke <hare@suse.de>2018-05-25 10:41:29 +0200
commitaaa8ddb101cb9c9066049d7cdc92915a488e06ab (patch)
treee760edcc17ccd3dcb4fbcbae1edcee5348fe43b0
parente63bf1ea2cba510db340aca73dbfe9ad457ec0ed (diff)
lpfc: Fix 16gb hbas failing cq create (bsc#1093290).
-rw-r--r--patches.drivers/lpfc-Fix-16gb-hbas-failing-cq-create.patch88
-rw-r--r--series.conf1
2 files changed, 89 insertions, 0 deletions
diff --git a/patches.drivers/lpfc-Fix-16gb-hbas-failing-cq-create.patch b/patches.drivers/lpfc-Fix-16gb-hbas-failing-cq-create.patch
new file mode 100644
index 0000000000..d10196a02d
--- /dev/null
+++ b/patches.drivers/lpfc-Fix-16gb-hbas-failing-cq-create.patch
@@ -0,0 +1,88 @@
+From: James Smart <jsmart2021@gmail.com>
+Date: Thu, 24 May 2018 21:09:00 -0700
+Subject: [PATCH] lpfc: Fix 16gb hbas failing cq create
+References: bsc#1093290
+Patch-Mainline: submitted linux-scsi 2018/05/25
+
+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>
+Acked-by: Hannes Reinecke <hare@suse.com>
+---
+ drivers/scsi/lpfc/lpfc_hw4.h | 11 -----------
+ drivers/scsi/lpfc/lpfc_init.c | 9 +--------
+ drivers/scsi/lpfc/lpfc_sli4.h | 1 -
+ 3 files changed, 1 insertion(+), 20 deletions(-)
+
+diff --git a/drivers/scsi/lpfc/lpfc_hw4.h b/drivers/scsi/lpfc/lpfc_hw4.h
+index 9df1c8da6f52..4c5b02a55289 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 87b45d36b5ca..856ad25c71dc 100644
+--- a/drivers/scsi/lpfc/lpfc_init.c
++++ b/drivers/scsi/lpfc/lpfc_init.c
+@@ -9509,11 +9509,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) {
+@@ -10675,9 +10670,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 */
+--
+2.12.3
+
diff --git a/series.conf b/series.conf
index e3ee534457..538edff8f0 100644
--- a/series.conf
+++ b/series.conf
@@ -11841,6 +11841,7 @@
patches.suse/fw_cfg-write-vmcoreinfo-details.patch
patches.drivers/qla2xxx-Enable-T10-DIF-with-FC-NVMe-enabled.patch
patches.fixes/ext4-Fix-hole-length-detection-in-ext4_ind_map_block.patch
+ patches.drivers/lpfc-Fix-16gb-hbas-failing-cq-create.patch
########################################################
# end of sorted patches