From: Greg Kroah-Hartman Date: Sat, 2 Apr 2022 14:22:35 +0000 (+0200) Subject: 4.9-stable patches X-Git-Tag: v5.17.2~170 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=23954620e5aeca09097a6a617925301e2d5527fe;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: scsi-qla2xxx-fix-incorrect-reporting-of-task-management-failure.patch --- diff --git a/queue-4.9/mmc-host-return-an-error-when-enable_sdio_irq-ops-is.patch b/queue-4.9/mmc-host-return-an-error-when-enable_sdio_irq-ops-is.patch index 996eaf7c451..3dc8cbfca09 100644 --- a/queue-4.9/mmc-host-return-an-error-when-enable_sdio_irq-ops-is.patch +++ b/queue-4.9/mmc-host-return-an-error-when-enable_sdio_irq-ops-is.patch @@ -19,14 +19,12 @@ Signed-off-by: Ulf Hansson Link: https://lore.kernel.org/r/20220303165142.129745-1-ulf.hansson@linaro.org Signed-off-by: Sasha Levin --- - drivers/mmc/core/host.c | 15 +++++++++++++-- + drivers/mmc/core/host.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) -diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c -index 848b3453517e..60c2ca58dec3 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c -@@ -403,6 +403,16 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev) +@@ -403,6 +403,16 @@ again: EXPORT_SYMBOL(mmc_alloc_host); @@ -55,6 +53,3 @@ index 848b3453517e..60c2ca58dec3 100644 err = device_add(&host->class_dev); if (err) --- -2.34.1 - diff --git a/queue-4.9/scsi-qla2xxx-fix-incorrect-reporting-of-task-management-failure.patch b/queue-4.9/scsi-qla2xxx-fix-incorrect-reporting-of-task-management-failure.patch new file mode 100644 index 00000000000..47006b1609a --- /dev/null +++ b/queue-4.9/scsi-qla2xxx-fix-incorrect-reporting-of-task-management-failure.patch @@ -0,0 +1,37 @@ +From 58ca5999e0367d131de82a75257fbfd5aed0195d Mon Sep 17 00:00:00 2001 +From: Quinn Tran +Date: Thu, 10 Mar 2022 01:25:52 -0800 +Subject: scsi: qla2xxx: Fix incorrect reporting of task management failure + +From: Quinn Tran + +commit 58ca5999e0367d131de82a75257fbfd5aed0195d upstream. + +User experienced no task management error while target device is responding +with error. The RSP_CODE field in the status IOCB is in little endian. +Driver assumes it's big endian and it picked up erroneous data. + +Convert the data back to big endian as is on the wire. + +Link: https://lore.kernel.org/r/20220310092604.22950-2-njavali@marvell.com +Fixes: faef62d13463 ("[SCSI] qla2xxx: Fix Task Management command asynchronous handling") +Cc: stable@vger.kernel.org +Reviewed-by: Himanshu Madhani +Signed-off-by: Quinn Tran +Signed-off-by: Nilesh Javali +Signed-off-by: Martin K. Petersen +Signed-off-by: Greg Kroah-Hartman +--- + drivers/scsi/qla2xxx/qla_isr.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/scsi/qla2xxx/qla_isr.c ++++ b/drivers/scsi/qla2xxx/qla_isr.c +@@ -1618,6 +1618,7 @@ qla24xx_tm_iocb_entry(scsi_qla_host_t *v + iocb->u.tmf.data = QLA_FUNCTION_FAILED; + } else if ((le16_to_cpu(sts->scsi_status) & + SS_RESPONSE_INFO_LEN_VALID)) { ++ host_to_fcp_swap(sts->data, sizeof(sts->data)); + if (le32_to_cpu(sts->rsp_data_len) < 4) { + ql_log(ql_log_warn, fcport->vha, 0x503b, + "Async-%s error - hdl=%x not enough response(%d).\n", diff --git a/queue-4.9/series b/queue-4.9/series index c5292c05b48..2e3ad0c5de5 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -149,3 +149,4 @@ arm-mmp-fix-failure-to-remove-sram-device.patch video-fbdev-sm712fb-fix-crash-in-smtcfb_write.patch media-hdpvr-initialize-dev-worker-at-hdpvr_register_.patch mmc-host-return-an-error-when-enable_sdio_irq-ops-is.patch +scsi-qla2xxx-fix-incorrect-reporting-of-task-management-failure.patch