From 6931d007fcdf9d26ef886a316c43296143717ea9 Mon Sep 17 00:00:00 2001
From: Himanshu Madhani <hmadhani@redhat.com>
Date: Mon, 16 Dec 2019 17:58:33 -0500
Subject: [PATCH 155/155] [scsi] scsi: qla2xxx: Fix incorrect SFUB length used
for Secure Flash Update MB Cmd
Message-id: <20191216175833.14530-4-hmadhani@redhat.com>
Patchwork-id: 292029
Patchwork-instance: patchwork
O-Subject: [RHEL 7.8 e-stor PATCH 3/3] scsi: qla2xxx: Fix incorrect SFUB length used for Secure Flash Update MB Cmd
Bugzilla: 1783016
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
RH-Acked-by: Ewan Milne <emilne@redhat.com>
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
From: Michael Hernandez <mhernandez@marvell.com>
Bugzilla 1783016
SFUB length should be in DWORDs when passed to FW.
Fixes: 3f006ac342c03 ("scsi: qla2xxx: Secure flash update support for ISP28XX")
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20191203223657.22109-4-hmadhani@marvell.com
Signed-off-by: Michael Hernandez <mhernandez@marvell.com>
Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit c868907e1ac6a08a17f8fa9ce482c0a496896e9e)
Signed-off-by: Himanshu Madhani <hmadhani@redhat.com>
Signed-off-by: Jan Stancek <jstancek@redhat.com>
---
drivers/scsi/qla2xxx/qla_sup.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: src/drivers/scsi/qla2xxx/qla_sup.c
===================================================================
--- src.orig/drivers/scsi/qla2xxx/qla_sup.c 2019-12-20 19:07:21.283593212 +0100
+++ src/drivers/scsi/qla2xxx/qla_sup.c 2019-12-20 19:07:21.297593089 +0100
@@ -2895,7 +2895,7 @@
"Sending Secure Flash MB Cmd\n");
rval = qla28xx_secure_flash_update(vha, 0, region.code,
buf_size_without_sfub, sfub_dma,
- sizeof(struct secure_flash_update_block));
+ sizeof(struct secure_flash_update_block) >> 2);
if (rval != QLA_SUCCESS) {
ql_log(ql_log_warn, vha, 0xffff,
"Secure Flash MB Cmd failed %x.", rval);