Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69b0e7e7 authored by Himanshu Madhani's avatar Himanshu Madhani Committed by Greg Kroah-Hartman
Browse files

scsi: qla2xxx: Correctly retrieve and interpret active flash region 

commit 4e71dcae0c4cd1e9d19b8b3d80214a4bcdca5a42 upstream.

ISP27XX/28XX supports multiple flash regions. This patch fixes issue where
active flash region was not interpreted correctly during secure flash
update process.

[mkp: typo]

Fixes: 5fa8774c ("scsi: qla2xxx: Add 28xx flash primary/secondary status/image mechanism")
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20191203223657.22109-2-hmadhani@marvell.com


Signed-off-by: default avatarMichael Hernandez <mhernandez@marvell.com>
Signed-off-by: default avatarHimanshu Madhani <hmadhani@marvell.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a82545b6

drivers/scsi/qla2xxx/qla_attr.c

+1 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ qla2x00_sysfs_read_nvram(struct file *filp, struct kobject *kobj, 


	faddr = ha->flt_region_nvram;

	if (IS_QLA28XX(ha)) {

		qla28xx_get_aux_images(vha, &active_regions);

		if (active_regions.aux.vpd_nvram == QLA27XX_SECONDARY_IMAGE)

			faddr = ha->flt_region_nvram_sec;

	}

drivers/scsi/qla2xxx/qla_bsg.c

+1 −1
Original line number Diff line number Diff line
@@ -2399,7 +2399,7 @@ qla2x00_get_flash_image_status(struct bsg_job *bsg_job) 
	struct qla_active_regions regions = { };

	struct active_regions active_regions = { };



	qla28xx_get_aux_images(vha, &active_regions);

	qla27xx_get_active_image(vha, &active_regions);

	regions.global_image = active_regions.global;



	if (IS_QLA28XX(ha)) {

drivers/scsi/qla2xxx/qla_sup.c

+3 −3
Original line number Diff line number Diff line
@@ -847,15 +847,15 @@ qla2xxx_get_flt_info(scsi_qla_host_t *vha, uint32_t flt_addr) 
				ha->flt_region_img_status_pri = start;

			break;

		case FLT_REG_IMG_SEC_27XX:

			if (IS_QLA27XX(ha) && !IS_QLA28XX(ha))

			if (IS_QLA27XX(ha) || IS_QLA28XX(ha))

				ha->flt_region_img_status_sec = start;

			break;

		case FLT_REG_FW_SEC_27XX:

			if (IS_QLA27XX(ha) && !IS_QLA28XX(ha))

			if (IS_QLA27XX(ha) || IS_QLA28XX(ha))

				ha->flt_region_fw_sec = start;

			break;

		case FLT_REG_BOOTLOAD_SEC_27XX:

			if (IS_QLA27XX(ha) && !IS_QLA28XX(ha))

			if (IS_QLA27XX(ha) || IS_QLA28XX(ha))

				ha->flt_region_boot_sec = start;

			break;

		case FLT_REG_AUX_IMG_PRI_28XX: