Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Kirjanov <dkirjanov@suse.com>2019-10-18 16:11:40 +0300
committerDenis Kirjanov <dkirjanov@suse.com>2019-10-18 16:11:40 +0300
commit05b72cb22b0bc12412db5017426639f4602437a3 (patch)
tree509f693fee8abbd9a50f6a9b061fc0a5ef10e82f
parent683ed116e34005c97b302990b5e977417d3df2c4 (diff)
scsi: lpfc: remove left-over BUILD_NVME defines (bsc#1154268).
-rw-r--r--patches.suse/0001-lpfc-remove-left-over-BUILD_NVME-defines.patch66
-rw-r--r--series.conf3
2 files changed, 69 insertions, 0 deletions
diff --git a/patches.suse/0001-lpfc-remove-left-over-BUILD_NVME-defines.patch b/patches.suse/0001-lpfc-remove-left-over-BUILD_NVME-defines.patch
new file mode 100644
index 0000000000..3b49be0b17
--- /dev/null
+++ b/patches.suse/0001-lpfc-remove-left-over-BUILD_NVME-defines.patch
@@ -0,0 +1,66 @@
+From: Hannes Reinecke <hare@suse.com>
+Date: Thu, 17 Oct 2019 17:00:19 +0200
+Subject: [PATCH] scsi: lpfc: remove left-over BUILD_NVME defines
+Git-commit: 1052b41b25cbadcb85ff04c3b46663e21168dd3e
+Patch-mainline: Queued in subsystem maintainer repository
+Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
+References: bsc#1154268
+
+The BUILD_NVME define never got defined anywhere, causing NVMe commands to
+be treated as SCSI commands when freeing the buffers. This was causing a
+stuck discovery and a horrible crash in lpfc_set_rrq_active() later on.
+
+Link: https://lore.kernel.org/r/20191017150019.75769-1-hare@suse.de
+Fixes: c00f62e6c546 ("scsi: lpfc: Merge per-protocol WQ/CQ pairs into single per-cpu pair")
+Signed-off-by: Hannes Reinecke <hare@suse.com>
+Reviewed-by: James Smart <james.smart@broadcom.com>
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Acked-by: Denis Kirjanov <denis.kirjanov@suse.com>
+---
+ drivers/scsi/lpfc/lpfc_init.c | 2 --
+ drivers/scsi/lpfc/lpfc_scsi.c | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
+index de64880c6c60..2c1e085bd3ce 100644
+--- a/drivers/scsi/lpfc/lpfc_init.c
++++ b/drivers/scsi/lpfc/lpfc_init.c
+@@ -9053,7 +9053,6 @@ lpfc_sli4_queue_create(struct lpfc_hba *phba)
+ }
+ }
+
+-#if defined(BUILD_NVME)
+ /* Clear NVME stats */
+ if (phba->cfg_enable_fc4_type & LPFC_ENABLE_NVME) {
+ for (idx = 0; idx < phba->cfg_hdw_queue; idx++) {
+@@ -9061,7 +9060,6 @@ lpfc_sli4_queue_create(struct lpfc_hba *phba)
+ sizeof(phba->sli4_hba.hdwq[idx].nvme_cstat));
+ }
+ }
+-#endif
+
+ /* Clear SCSI stats */
+ if (phba->cfg_enable_fc4_type & LPFC_ENABLE_FCP) {
+diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
+index fe1097666de4..6822cd9ff8f1 100644
+--- a/drivers/scsi/lpfc/lpfc_scsi.c
++++ b/drivers/scsi/lpfc/lpfc_scsi.c
+@@ -528,7 +528,6 @@ lpfc_sli4_io_xri_aborted(struct lpfc_hba *phba,
+ list_del_init(&psb->list);
+ psb->exch_busy = 0;
+ psb->status = IOSTAT_SUCCESS;
+-#ifdef BUILD_NVME
+ if (psb->cur_iocbq.iocb_flag == LPFC_IO_NVME) {
+ qp->abts_nvme_io_bufs--;
+ spin_unlock(&qp->abts_io_buf_list_lock);
+@@ -536,7 +535,6 @@ lpfc_sli4_io_xri_aborted(struct lpfc_hba *phba,
+ lpfc_sli4_nvme_xri_aborted(phba, axri, psb);
+ return;
+ }
+-#endif
+ qp->abts_scsi_io_bufs--;
+ spin_unlock(&qp->abts_io_buf_list_lock);
+
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index ebc04bae86..5072598746 100644
--- a/series.conf
+++ b/series.conf
@@ -49874,6 +49874,9 @@
patches.suse/0005-MODSIGN-Allow-the-db-UEFI-variable-to-be-suppressed.patch
patches.suse/0006-modsign-Use-secondary-trust-keyring-for-module-signi.patch
+ # mkp/scsi fixes
+ patches.suse/0001-lpfc-remove-left-over-BUILD_NVME-defines.patch
+
# out-of-tree patches
patches.suse/firmware-arm_sdei-fix-wrong-of_node_put-in-init-function.patch
patches.suse/net-mvpp2-fix-condition-for-setting-up-link-interrup.patch