Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Thumshirn <jthumshirn@suse.de>2018-07-03 14:04:36 +0200
committerJohannes Thumshirn <jthumshirn@suse.de>2018-07-03 14:04:36 +0200
commite2980d3f6de4ea2be07ad89eba7dc4b5ad753a56 (patch)
tree0e4920fb1cb29ccf05b1a54f18bab30818e37fae
parent2d504b9e930b49d5da319672af70afc8f2b13721 (diff)
Revert "scsi: lpfc: Fix 16gb hbas failing cq create (bsc#1089525)."
-rw-r--r--patches.drivers/scsi-lpfc-Fix-16gb-hbas-failing-cq-create.patch91
-rw-r--r--series.conf1
2 files changed, 0 insertions, 92 deletions
diff --git a/patches.drivers/scsi-lpfc-Fix-16gb-hbas-failing-cq-create.patch b/patches.drivers/scsi-lpfc-Fix-16gb-hbas-failing-cq-create.patch
deleted file mode 100644
index 2f9e32009f..0000000000
--- a/patches.drivers/scsi-lpfc-Fix-16gb-hbas-failing-cq-create.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From: James Smart <jsmart2021@gmail.com>
-Date: Thu, 24 May 2018 21:09:00 -0700
-Subject: [PATCH] scsi: lpfc: Fix 16gb hbas failing cq create.
-References: bsc#1089525
-Git-commit: c221768bd49a7423be57c00a56985c0e9c4122cd
-Patch-mainline: v4.18-rc1
-
-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>
-Signed-off-by: Hannes Reinecke <hare@suse.de>
----
- 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 b345e111c448..8e576d7cfe87 100644
---- a/drivers/scsi/lpfc/lpfc_hw4.h
-+++ b/drivers/scsi/lpfc/lpfc_hw4.h
-@@ -103,17 +103,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 6036202076ce..beb54b8cf754 100644
---- a/drivers/scsi/lpfc/lpfc_init.c
-+++ b/drivers/scsi/lpfc/lpfc_init.c
-@@ -9450,11 +9450,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) {
-@@ -10887,9 +10882,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 0d10f814a205..f66db2ff9560 100644
---- a/drivers/scsi/lpfc/lpfc_sli4.h
-+++ b/drivers/scsi/lpfc/lpfc_sli4.h
-@@ -578,7 +578,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 msix_entry *msix_entries;
---
-2.12.3
-
diff --git a/series.conf b/series.conf
index d463a00e40..719887875c 100644
--- a/series.conf
+++ b/series.conf
@@ -18757,7 +18757,6 @@
patches.drivers/scsi-lpfc-fix-up-log-messages-and-stats-counters-in-io-submit-code-path.patch
patches.drivers/scsi-lpfc-handle-new-link-fault-code-returned-by-adapter-firmware.patch
patches.suse/scsi-lpfc-update-driver-version-to-11-4-0-7-3.patch
- patches.drivers/scsi-lpfc-Fix-16gb-hbas-failing-cq-create.patch
# bsc#1095453
patches.drivers/scsi-lpfc-correct-oversubscription-of-nvme-io-requests-for-an-adapter.patch