4.9-stable patches

added patches:
	scsi-qla2xxx-fix-incorrect-port-speed-being-set-for-fc-adapters.patch
	scsi-qla2xxx-shutdown-chip-if-reset-fail.patch

diff --git a/queue-4.9/scsi-qla2xxx-fix-incorrect-port-speed-being-set-for-fc-adapters.patch b/queue-4.9/scsi-qla2xxx-fix-incorrect-port-speed-being-set-for-fc-adapters.patch
new file mode 100644 (file)
index 0000000..adb43fe
--- /dev/null
+++ b/queue-4.9/scsi-qla2xxx-fix-incorrect-port-speed-being-set-for-fc-adapters.patch
@@ -0,0 +1,34 @@
+From 4c1458df9635c7e3ced155f594d2e7dfd7254e21 Mon Sep 17 00:00:00 2001
+From: Himanshu Madhani <himanshu.madhani@cavium.com>
+Date: Fri, 31 Aug 2018 11:24:27 -0700
+Subject: scsi: qla2xxx: Fix incorrect port speed being set for FC adapters
+
+From: Himanshu Madhani <himanshu.madhani@cavium.com>
+
+commit 4c1458df9635c7e3ced155f594d2e7dfd7254e21 upstream.
+
+Fixes: 6246b8a1d26c7c ("[SCSI] qla2xxx: Enhancements to support ISP83xx.")
+Fixes: 1bb395485160d2 ("qla2xxx: Correct iiDMA-update calling conventions.")
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/scsi/qla2xxx/qla_mbx.c |    5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+--- a/drivers/scsi/qla2xxx/qla_mbx.c
++++ b/drivers/scsi/qla2xxx/qla_mbx.c
+@@ -3580,10 +3580,7 @@ qla2x00_set_idma_speed(scsi_qla_host_t *
+       mcp->mb[0] = MBC_PORT_PARAMS;
+       mcp->mb[1] = loop_id;
+       mcp->mb[2] = BIT_0;
+-      if (IS_CNA_CAPABLE(vha->hw))
+-              mcp->mb[3] = port_speed & (BIT_5|BIT_4|BIT_3|BIT_2|BIT_1|BIT_0);
+-      else
+-              mcp->mb[3] = port_speed & (BIT_2|BIT_1|BIT_0);
++      mcp->mb[3] = port_speed & (BIT_5|BIT_4|BIT_3|BIT_2|BIT_1|BIT_0);
+       mcp->mb[9] = vha->vp_idx;
+       mcp->out_mb = MBX_9|MBX_3|MBX_2|MBX_1|MBX_0;
+       mcp->in_mb = MBX_3|MBX_1|MBX_0;

diff --git a/queue-4.9/scsi-qla2xxx-shutdown-chip-if-reset-fail.patch b/queue-4.9/scsi-qla2xxx-shutdown-chip-if-reset-fail.patch
new file mode 100644 (file)
index 0000000..f645798
--- /dev/null
+++ b/queue-4.9/scsi-qla2xxx-shutdown-chip-if-reset-fail.patch
@@ -0,0 +1,34 @@
+From 1e4ac5d6fe0a4af17e4b6251b884485832bf75a3 Mon Sep 17 00:00:00 2001
+From: Quinn Tran <quinn.tran@cavium.com>
+Date: Tue, 11 Sep 2018 10:18:21 -0700
+Subject: scsi: qla2xxx: shutdown chip if reset fail
+
+From: Quinn Tran <quinn.tran@cavium.com>
+
+commit 1e4ac5d6fe0a4af17e4b6251b884485832bf75a3 upstream.
+
+If chip unable to fully initialize, use full shutdown sequence to clear out
+any stale FW state.
+
+Fixes: e315cd28b9ef ("[SCSI] qla2xxx: Code changes for qla data structure refactoring")
+Cc: stable@vger.kernel.org  #4.10
+Signed-off-by: Quinn Tran <quinn.tran@cavium.com>
+Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/scsi/qla2xxx/qla_init.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/scsi/qla2xxx/qla_init.c
++++ b/drivers/scsi/qla2xxx/qla_init.c
+@@ -4894,7 +4894,7 @@ qla2x00_abort_isp(scsi_qla_host_t *vha)
+                                        * The next call disables the board
+                                        * completely.
+                                        */
+-                                      ha->isp_ops->reset_adapter(vha);
++                                      qla2x00_abort_isp_cleanup(vha);
+                                       vha->flags.online = 0;
+                                       clear_bit(ISP_ABORT_RETRY,
+                                           &vha->dpc_flags);

diff --git a/queue-4.9/series b/queue-4.9/series
index 5149e1ead8ab07b5ee5c11785485fadc6c147a3a..e2980083ea065db2f3b4bb4a1c3d54e9a4c71f51 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -13,3 +13,5 @@ powerpc-selftests-wait-all-threads-to-join.patch
 9p-locks-fix-glock.client_id-leak-in-do_lock.patch
 9p-clear-dangling-pointers-in-p9stat_free.patch
 cdrom-fix-improper-type-cast-which-can-leat-to-information-leak.patch
+scsi-qla2xxx-fix-incorrect-port-speed-being-set-for-fc-adapters.patch
+scsi-qla2xxx-shutdown-chip-if-reset-fail.patch