4.14-stable patches

added patches:
	scsi-qla2xxx-fix-inconsistent-tmf-timeout.patch
	scsi-qla2xxx-turn-off-noisy-message-log.patch

diff --git a/queue-4.14/scsi-qla2xxx-fix-inconsistent-tmf-timeout.patch b/queue-4.14/scsi-qla2xxx-fix-inconsistent-tmf-timeout.patch
new file mode 100644 (file)
index 0000000..58ce1b3
--- /dev/null
+++ b/queue-4.14/scsi-qla2xxx-fix-inconsistent-tmf-timeout.patch
@@ -0,0 +1,36 @@
+From 009e7fe4a1ed52276b332842a6b6e23b07200f2d Mon Sep 17 00:00:00 2001
+From: Quinn Tran <qutran@marvell.com>
+Date: Fri, 14 Jul 2023 12:31:03 +0530
+Subject: scsi: qla2xxx: fix inconsistent TMF timeout
+
+From: Quinn Tran <qutran@marvell.com>
+
+commit 009e7fe4a1ed52276b332842a6b6e23b07200f2d upstream.
+
+Different behavior were experienced of session being torn down vs not when
+TMF is timed out. When FW detects the time out, the session is torn down.
+When driver detects the time out, the session is not torn down.
+
+Allow TMF error to return to upper layer without session tear down.
+
+Cc: stable@vger.kernel.org
+Signed-off-by: Quinn Tran <qutran@marvell.com>
+Signed-off-by: Nilesh Javali <njavali@marvell.com>
+Link: https://lore.kernel.org/r/20230714070104.40052-10-njavali@marvell.com
+Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/scsi/qla2xxx/qla_isr.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/drivers/scsi/qla2xxx/qla_isr.c
++++ b/drivers/scsi/qla2xxx/qla_isr.c
+@@ -2622,7 +2622,6 @@ check_scsi_status:
+       case CS_PORT_BUSY:
+       case CS_INCOMPLETE:
+       case CS_PORT_UNAVAILABLE:
+-      case CS_TIMEOUT:
+       case CS_RESET:
+ 
+               /*

diff --git a/queue-4.14/scsi-qla2xxx-turn-off-noisy-message-log.patch b/queue-4.14/scsi-qla2xxx-turn-off-noisy-message-log.patch
new file mode 100644 (file)
index 0000000..dafd422
--- /dev/null
+++ b/queue-4.14/scsi-qla2xxx-turn-off-noisy-message-log.patch
@@ -0,0 +1,33 @@
+From 8ebaa45163a3fedc885c1dc7d43ea987a2f00a06 Mon Sep 17 00:00:00 2001
+From: Quinn Tran <qutran@marvell.com>
+Date: Fri, 14 Jul 2023 12:31:01 +0530
+Subject: scsi: qla2xxx: Turn off noisy message log
+
+From: Quinn Tran <qutran@marvell.com>
+
+commit 8ebaa45163a3fedc885c1dc7d43ea987a2f00a06 upstream.
+
+Some consider noisy log as test failure.  Turn off noisy message log.
+
+Cc: stable@vger.kernel.org
+Signed-off-by: Quinn Tran <qutran@marvell.com>
+Signed-off-by: Nilesh Javali <njavali@marvell.com>
+Link: https://lore.kernel.org/r/20230714070104.40052-8-njavali@marvell.com
+Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/scsi/qla2xxx/qla_nvme.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/scsi/qla2xxx/qla_nvme.c
++++ b/drivers/scsi/qla2xxx/qla_nvme.c
+@@ -535,7 +535,7 @@ static int qla_nvme_post_cmd(struct nvme
+ 
+       rval = qla2x00_start_nvme_mq(sp);
+       if (rval != QLA_SUCCESS) {
+-              ql_log(ql_log_warn, vha, 0x212d,
++              ql_dbg(ql_dbg_io + ql_dbg_verbose, vha, 0x212d,
+                   "qla2x00_start_nvme_mq failed = %d\n", rval);
+               atomic_dec(&sp->ref_count);
+               wake_up(&sp->nvme_ls_waitq);

diff --git a/queue-4.14/series b/queue-4.14/series
index 5d0ee567f75617c5a242c8d554afb596e16a104b..85e084d4ddac7e3c0e12ffdb6bf1fc655359f8b9 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -117,3 +117,5 @@ x.509-if-signature-is-unsupported-skip-validation.patch
 net-handle-arphrd_ppp-in-dev_is_mac_header_xmit.patch
 pstore-ram-check-start-of-empty-przs-during-init.patch
 crypto-stm32-fix-loop-iterating-through-scatterlist-for-dma.patch
+scsi-qla2xxx-fix-inconsistent-tmf-timeout.patch
+scsi-qla2xxx-turn-off-noisy-message-log.patch