Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannes Reinecke <hare@suse.de>2018-10-12 12:14:58 +0200
committerHannes Reinecke <hare@suse.de>2018-10-12 12:40:40 +0200
commit839e1218c8de28ec97c4ae006b6eb78c437b5064 (patch)
treeea8dfc8927f75a41cb1478f1b1de7a501a41f9d1
parent576e8c79645af9c72fad8e995a5f8ae6c11e9d16 (diff)
scsi: qla2xxx: Fix NVMe session hang on unload (bsc#1108870).
-rw-r--r--patches.fixes/scsi-qla2xxx-Fix-NVMe-session-hang-on-unload.patch37
-rw-r--r--series.conf1
2 files changed, 38 insertions, 0 deletions
diff --git a/patches.fixes/scsi-qla2xxx-Fix-NVMe-session-hang-on-unload.patch b/patches.fixes/scsi-qla2xxx-Fix-NVMe-session-hang-on-unload.patch
new file mode 100644
index 0000000000..c54d5ea8ea
--- /dev/null
+++ b/patches.fixes/scsi-qla2xxx-Fix-NVMe-session-hang-on-unload.patch
@@ -0,0 +1,37 @@
+From: Quinn Tran <quinn.tran@cavium.com>
+Date: Wed, 26 Sep 2018 22:05:11 -0700
+Subject: [PATCH] scsi: qla2xxx: Fix NVMe session hang on unload
+Git-commit: f7d61c995df74d6bb57bbff6a2b7b1874c4a2baa
+Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
+Patch-mainline: Queued in subsystem maintainer repository
+References: bsc#1108870
+
+Send aborts only when chip is active.
+
+Fixes: 623ee824e579 ("scsi: qla2xxx: Fix FC-NVMe IO abort during driver reset")
+Cc: <stable@vger.kernel.org> # 4.14
+Signed-off-by: Quinn Tran <quinn.tran@cavium.com>
+Reviewed-by: Ewan D. Milne <emilne@redhat.com>
+Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Acked-by: Hannes Reinecke <hare@suse.com>
+---
+ drivers/scsi/qla2xxx/qla_nvme.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/scsi/qla2xxx/qla_nvme.c b/drivers/scsi/qla2xxx/qla_nvme.c
+index 42dc846cc8dd..ad923965be3c 100644
+--- a/drivers/scsi/qla2xxx/qla_nvme.c
++++ b/drivers/scsi/qla2xxx/qla_nvme.c
+@@ -607,7 +607,7 @@ void qla_nvme_abort(struct qla_hw_data *ha, struct srb *sp, int res)
+ {
+ int rval;
+
+- if (!test_bit(ABORT_ISP_ACTIVE, &sp->vha->dpc_flags)) {
++ if (ha->flags.fw_started) {
+ rval = ha->isp_ops->abort_command(sp);
+ if (!rval && !qla_nvme_wait_on_command(sp))
+ ql_log(ql_log_warn, NULL, 0x2112,
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index a85521cc99..ed3d37e7c7 100644
--- a/series.conf
+++ b/series.conf
@@ -17921,6 +17921,7 @@
# mkp/scsi 4.20/scsi-queue
patches.fixes/scsi-qla2xxx-don-t-allow-negative-thresholds.patch
+ patches.fixes/scsi-qla2xxx-Fix-NVMe-session-hang-on-unload.patch
# git://git.infradead.org/nvme.git nvme-4.20
patches.fixes/nvme_fc-add-nvme_discovery-sysfs-attribute-to-fc-tra.patch