From: Greg Kroah-Hartman Date: Thu, 15 Nov 2018 00:13:51 +0000 (-0800) Subject: 4.4-stable patches X-Git-Tag: v4.19.3~50 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=95d0925c34a6982731500b0bb1eded0a298a2bd8;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: scsi-qla2xxx-fix-incorrect-port-speed-being-set-for-fc-adapters.patch --- diff --git a/queue-4.4/scsi-qla2xxx-fix-incorrect-port-speed-being-set-for-fc-adapters.patch b/queue-4.4/scsi-qla2xxx-fix-incorrect-port-speed-being-set-for-fc-adapters.patch new file mode 100644 index 00000000000..c0f62c5ebed --- /dev/null +++ b/queue-4.4/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 +Date: Fri, 31 Aug 2018 11:24:27 -0700 +Subject: scsi: qla2xxx: Fix incorrect port speed being set for FC adapters + +From: Himanshu Madhani + +commit 4c1458df9635c7e3ced155f594d2e7dfd7254e21 upstream. + +Fixes: 6246b8a1d26c7c ("[SCSI] qla2xxx: Enhancements to support ISP83xx.") +Fixes: 1bb395485160d2 ("qla2xxx: Correct iiDMA-update calling conventions.") +Cc: +Signed-off-by: Himanshu Madhani +Signed-off-by: Martin K. Petersen +Signed-off-by: Greg Kroah-Hartman + +--- + 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 +@@ -3315,10 +3315,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.4/series b/queue-4.4/series index 538d1c33ae1..c4392825545 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -104,3 +104,4 @@ media-tvp5150-fix-width-alignment-during-set_selection.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