| From 59464a4a9bb05238d9c57ae94af706a585deeed2 Mon Sep 17 00:00:00 2001 |
| From: Michael Hernandez <mhernandez@marvell.com> |
| Date: Tue, 3 Dec 2019 14:36:57 -0800 |
| Subject: [PATCH] scsi: qla2xxx: Fix incorrect SFUB length used for Secure |
| Flash Update MB Cmd |
| |
| commit c868907e1ac6a08a17f8fa9ce482c0a496896e9e upstream. |
| |
| 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> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c |
| index 7aac207b5015..ee32ef70eabd 100644 |
| --- a/drivers/scsi/qla2xxx/qla_sup.c |
| +++ b/drivers/scsi/qla2xxx/qla_sup.c |
| @@ -2895,7 +2895,7 @@ qla28xx_write_flash_data(scsi_qla_host_t *vha, uint32_t *dwptr, uint32_t faddr, |
| "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); |
| -- |
| 2.7.4 |
| |