From f489fc7e6dc6a1092ab9a85fce340174c6a9c1fb Mon Sep 17 00:00:00 2001

From: Himanshu Madhani <hmadhani@redhat.com>

Date: Thu, 1 Aug 2019 15:54:57 -0400

Subject: [PATCH 037/124] [scsi] scsi: qla2xxx: Update flash read/write routine

Message-id: <20190801155618.12650-38-hmadhani@redhat.com>

Patchwork-id: 267814

O-Subject: [RHEL 7.8 e-stor PATCH 037/118] scsi: qla2xxx: Update flash read/write routine

Bugzilla: 1729270

RH-Acked-by: Jarod Wilson <jarod@redhat.com>

RH-Acked-by: Tony Camuso <tcamuso@redhat.com>

From: Joe Carnuccio <joe.carnuccio@cavium.com>

Bugzilla 1729270

This patch makes following changes to flash access routines:

- update return type for read_optrom

- use void instead of uint32_t * for buffer parameter in read

  and write optrom routines

- fix flash/nvram addressing

Signed-off-by: Joe Carnuccio <joe.carnuccio@cavium.com>

Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

(cherry picked from commit 3695310e37b4e571d40593cbe59188b0006a2274)

Signed-off-by: Himanshu Madhani <hmadhani@redhat.com>

Signed-off-by: Jan Stancek <jstancek@redhat.com>

---

 drivers/scsi/qla2xxx/qla_attr.c |  65 +++---

 drivers/scsi/qla2xxx/qla_def.h  |   8 +-

 drivers/scsi/qla2xxx/qla_gbl.h  |  47 ++---

 drivers/scsi/qla2xxx/qla_init.c |  24 +--

 drivers/scsi/qla2xxx/qla_nx.c   |  13 +-

 drivers/scsi/qla2xxx/qla_nx2.c  |   8 +-

 drivers/scsi/qla2xxx/qla_sup.c  | 443 +++++++++++++++++++---------------------

 7 files changed, 296 insertions(+), 312 deletions(-)

diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c

index 4b3cd62a5c5b..02443efda34c 100644

--- a/drivers/scsi/qla2xxx/qla_attr.c

+++ b/drivers/scsi/qla2xxx/qla_attr.c

@@ -223,9 +223,9 @@ qla2x00_sysfs_write_nvram(struct file *filp, struct kobject *kobj,

 	}

 	/* Write NVRAM. */

-	ha->isp_ops->write_nvram(vha, (uint8_t *)buf, ha->nvram_base, count);

-	ha->isp_ops->read_nvram(vha, (uint8_t *)ha->nvram, ha->nvram_base,

-	     count);

+	ha->isp_ops->write_nvram(vha, buf, ha->nvram_base, count);

+	ha->isp_ops->read_nvram(vha, ha->nvram, ha->nvram_base,

+	    count);

 	mutex_unlock(&ha->optrom_mutex);

 	ql_dbg(ql_dbg_user, vha, 0x7060,

@@ -511,22 +511,24 @@ qla2x00_sysfs_read_vpd(struct file *filp, struct kobject *kobj,

 	if (!capable(CAP_SYS_ADMIN))

 		return -EINVAL;

-	if (IS_NOCACHE_VPD_TYPE(ha)) {

-		faddr = ha->flt_region_vpd << 2;

+	if (IS_NOCACHE_VPD_TYPE(ha))

+		goto skip;

-		if ((IS_QLA27XX(ha) || IS_QLA28XX(ha)) &&

-		    qla27xx_find_valid_image(vha) == QLA27XX_SECONDARY_IMAGE)

-			faddr = ha->flt_region_vpd_sec << 2;

+	faddr = ha->flt_region_vpd << 2;

-		mutex_lock(&ha->optrom_mutex);

-		if (qla2x00_chip_is_down(vha)) {

-			mutex_unlock(&ha->optrom_mutex);

-			return -EAGAIN;

-		}

-		ha->isp_ops->read_optrom(vha, ha->vpd, faddr,

-		    ha->vpd_size);

+	if ((IS_QLA27XX(ha) || IS_QLA28XX(ha)) &&

+	    qla27xx_find_valid_image(vha) == QLA27XX_SECONDARY_IMAGE)

+		faddr = ha->flt_region_vpd_sec << 2;

+

+	mutex_lock(&ha->optrom_mutex);

+	if (qla2x00_chip_is_down(vha)) {

 		mutex_unlock(&ha->optrom_mutex);

+		return -EAGAIN;

 	}

+

+	ha->isp_ops->read_optrom(vha, ha->vpd, faddr, ha->vpd_size);

+	mutex_unlock(&ha->optrom_mutex);

+skip:

 	return memory_read_from_buffer(buf, count, &off, ha->vpd, ha->vpd_size);

 }

@@ -563,8 +565,8 @@ qla2x00_sysfs_write_vpd(struct file *filp, struct kobject *kobj,

 	}

 	/* Write NVRAM. */

-	ha->isp_ops->write_nvram(vha, (uint8_t *)buf, ha->vpd_base, count);

-	ha->isp_ops->read_nvram(vha, (uint8_t *)ha->vpd, ha->vpd_base, count);

+	ha->isp_ops->write_nvram(vha, buf, ha->vpd_base, count);

+	ha->isp_ops->read_nvram(vha, ha->vpd, ha->vpd_base, count);

 	/* Update flash version information for 4Gb & above. */

 	if (!IS_FWI2_CAPABLE(ha)) {

@@ -935,7 +937,7 @@ static struct bin_attribute sysfs_dcbx_tlv_attr = {

 static struct sysfs_entry {

 	char *name;

 	struct bin_attribute *attr;

-	int is4GBp_only;

+	int type;

 } bin_file_entries[] = {

 	{ "fw_dump", &sysfs_fw_dump_attr, },

 	{ "nvram", &sysfs_nvram_attr, },

@@ -958,11 +960,11 @@ qla2x00_alloc_sysfs_attr(scsi_qla_host_t *vha)

 	int ret;

 	for (iter = bin_file_entries; iter->name; iter++) {

-		if (iter->is4GBp_only && !IS_FWI2_CAPABLE(vha->hw))

+		if (iter->type && !IS_FWI2_CAPABLE(vha->hw))

 			continue;

-		if (iter->is4GBp_only == 2 && !IS_QLA25XX(vha->hw))

+		if (iter->type == 2 && !IS_QLA25XX(vha->hw))

 			continue;

-		if (iter->is4GBp_only == 3 && !(IS_CNA_CAPABLE(vha->hw)))

+		if (iter->type == 3 && !(IS_CNA_CAPABLE(vha->hw)))

 			continue;

 		ret = sysfs_create_bin_file(&host->shost_gendev.kobj,

@@ -986,14 +988,14 @@ qla2x00_free_sysfs_attr(scsi_qla_host_t *vha, bool stop_beacon)

 	struct qla_hw_data *ha = vha->hw;

 	for (iter = bin_file_entries; iter->name; iter++) {

-		if (iter->is4GBp_only && !IS_FWI2_CAPABLE(ha))

+		if (iter->type && !IS_FWI2_CAPABLE(ha))

 			continue;

-		if (iter->is4GBp_only == 2 && !IS_QLA25XX(ha))

+		if (iter->type == 2 && !IS_QLA25XX(ha))

 			continue;

-		if (iter->is4GBp_only == 3 && !(IS_CNA_CAPABLE(vha->hw)))

+		if (iter->type == 3 && !(IS_CNA_CAPABLE(ha)))

 			continue;

-		if (iter->is4GBp_only == 0x27 &&

-		    (!IS_QLA27XX(vha->hw) || !IS_QLA28XX(ha)))

+		if (iter->type == 0x27 &&

+		    (!IS_QLA27XX(ha) || !IS_QLA28XX(ha)))

 			continue;

 		sysfs_remove_bin_file(&host->shost_gendev.kobj,

@@ -1361,19 +1363,20 @@ qla24xx_84xx_fw_version_show(struct device *dev,

 	struct device_attribute *attr, char *buf)

 {

 	int rval = QLA_SUCCESS;

-	uint16_t status[2] = {0, 0};

+	uint16_t status[2] = { 0 };

 	scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));

 	struct qla_hw_data *ha = vha->hw;

 	if (!IS_QLA84XX(ha))

 		return scnprintf(buf, PAGE_SIZE, "\n");

-	if (ha->cs84xx->op_fw_version == 0)

+	if (!ha->cs84xx->op_fw_version) {

 		rval = qla84xx_verify_chip(vha, status);

-	if ((rval == QLA_SUCCESS) && (status[0] == 0))

-		return scnprintf(buf, PAGE_SIZE, "%u\n",

-			(uint32_t)ha->cs84xx->op_fw_version);

+		if (!rval && !status[0])

+			return scnprintf(buf, PAGE_SIZE, "%u\n",

+			    (uint32_t)ha->cs84xx->op_fw_version);

+	}

 	return scnprintf(buf, PAGE_SIZE, "\n");

 }

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h

index ed5283e50b32..19bf9fb9b19c 100644

--- a/drivers/scsi/qla2xxx/qla_def.h

+++ b/drivers/scsi/qla2xxx/qla_def.h

@@ -3171,9 +3171,9 @@ struct isp_operations {

 	void *(*prep_ms_fdmi_iocb) (struct scsi_qla_host *, uint32_t,

 	    uint32_t);

-	uint8_t *(*read_nvram) (struct scsi_qla_host *, uint8_t *,

+	uint8_t *(*read_nvram)(struct scsi_qla_host *, void *,

 		uint32_t, uint32_t);

-	int (*write_nvram) (struct scsi_qla_host *, uint8_t *, uint32_t,

+	int (*write_nvram)(struct scsi_qla_host *, void *, uint32_t,

 		uint32_t);

 	void (*fw_dump) (struct scsi_qla_host *, int);

@@ -3182,9 +3182,9 @@ struct isp_operations {

 	int (*beacon_off) (struct scsi_qla_host *);

 	void (*beacon_blink) (struct scsi_qla_host *);

-	uint8_t * (*read_optrom) (struct scsi_qla_host *, uint8_t *,

+	void *(*read_optrom)(struct scsi_qla_host *, void *,

 		uint32_t, uint32_t);

-	int (*write_optrom) (struct scsi_qla_host *, uint8_t *, uint32_t,

+	int (*write_optrom)(struct scsi_qla_host *, void *, uint32_t,

 		uint32_t);

 	int (*get_flash_version) (struct scsi_qla_host *, void *);

diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h

index fcb85c15c703..b0422ce94f20 100644

--- a/drivers/scsi/qla2xxx/qla_gbl.h

+++ b/drivers/scsi/qla2xxx/qla_gbl.h

@@ -542,19 +542,20 @@ fc_port_t *qla2x00_find_fcport_by_nportid(scsi_qla_host_t *, port_id_t *, u8);

  */

 extern void qla2x00_release_nvram_protection(scsi_qla_host_t *);

 extern uint32_t *qla24xx_read_flash_data(scsi_qla_host_t *, uint32_t *,

-					 uint32_t, uint32_t);

-extern uint8_t *qla2x00_read_nvram_data(scsi_qla_host_t *, uint8_t *, uint32_t,

-					uint32_t);

-extern uint8_t *qla24xx_read_nvram_data(scsi_qla_host_t *, uint8_t *, uint32_t,

-					uint32_t);

-extern int qla2x00_write_nvram_data(scsi_qla_host_t *, uint8_t *, uint32_t,

-				    uint32_t);

-extern int qla24xx_write_nvram_data(scsi_qla_host_t *, uint8_t *, uint32_t,

-				    uint32_t);

-extern uint8_t *qla25xx_read_nvram_data(scsi_qla_host_t *, uint8_t *, uint32_t,

-					uint32_t);

-extern int qla25xx_write_nvram_data(scsi_qla_host_t *, uint8_t *, uint32_t,

-				    uint32_t);

+    uint32_t, uint32_t);

+extern uint8_t *qla2x00_read_nvram_data(scsi_qla_host_t *, void *, uint32_t,

+    uint32_t);

+extern uint8_t *qla24xx_read_nvram_data(scsi_qla_host_t *, void *, uint32_t,

+    uint32_t);

+extern int qla2x00_write_nvram_data(scsi_qla_host_t *, void *, uint32_t,

+    uint32_t);

+extern int qla24xx_write_nvram_data(scsi_qla_host_t *, void *, uint32_t,

+    uint32_t);

+extern uint8_t *qla25xx_read_nvram_data(scsi_qla_host_t *, void *, uint32_t,

+    uint32_t);

+extern int qla25xx_write_nvram_data(scsi_qla_host_t *, void *, uint32_t,

+    uint32_t);

+

 extern int qla2x00_is_a_vp_did(scsi_qla_host_t *, uint32_t);

 bool qla2x00_check_reg32_for_disconnect(scsi_qla_host_t *, uint32_t);

 bool qla2x00_check_reg16_for_disconnect(scsi_qla_host_t *, uint16_t);

@@ -574,18 +575,18 @@ extern int qla83xx_restart_nic_firmware(scsi_qla_host_t *);

 extern int qla83xx_access_control(scsi_qla_host_t *, uint16_t, uint32_t,

 				  uint32_t, uint16_t *);

-extern uint8_t *qla2x00_read_optrom_data(struct scsi_qla_host *, uint8_t *,

+extern void *qla2x00_read_optrom_data(struct scsi_qla_host *, void *,

 					 uint32_t, uint32_t);

-extern int qla2x00_write_optrom_data(struct scsi_qla_host *, uint8_t *,

+extern int qla2x00_write_optrom_data(struct scsi_qla_host *, void *,

 				     uint32_t, uint32_t);

-extern uint8_t *qla24xx_read_optrom_data(struct scsi_qla_host *, uint8_t *,

+extern void *qla24xx_read_optrom_data(struct scsi_qla_host *, void *,

 					 uint32_t, uint32_t);

-extern int qla24xx_write_optrom_data(struct scsi_qla_host *, uint8_t *,

+extern int qla24xx_write_optrom_data(struct scsi_qla_host *, void *,

 				     uint32_t, uint32_t);

-extern uint8_t *qla25xx_read_optrom_data(struct scsi_qla_host *, uint8_t *,

+extern void *qla25xx_read_optrom_data(struct scsi_qla_host *, void *,

 					 uint32_t, uint32_t);

-extern uint8_t *qla8044_read_optrom_data(struct scsi_qla_host *,

-					 uint8_t *, uint32_t, uint32_t);

+extern void *qla8044_read_optrom_data(struct scsi_qla_host *,

+					 void *, uint32_t, uint32_t);

 extern void qla8044_watchdog(struct scsi_qla_host *vha);

 extern int qla2x00_get_flash_version(scsi_qla_host_t *, void *);

@@ -765,9 +766,9 @@ extern int qla82xx_start_firmware(scsi_qla_host_t *);

 /* Firmware and flash related functions */

 extern int qla82xx_load_risc(scsi_qla_host_t *, uint32_t *);

-extern uint8_t *qla82xx_read_optrom_data(struct scsi_qla_host *, uint8_t *,

+extern void *qla82xx_read_optrom_data(struct scsi_qla_host *, void *,

 					 uint32_t, uint32_t);

-extern int qla82xx_write_optrom_data(struct scsi_qla_host *, uint8_t *,

+extern int qla82xx_write_optrom_data(struct scsi_qla_host *, void *,

 				     uint32_t, uint32_t);

 /* Mailbox related functions */

@@ -863,7 +864,7 @@ extern void qla8044_clear_drv_active(struct qla_hw_data *);

 void qla8044_get_minidump(struct scsi_qla_host *vha);

 int qla8044_collect_md_data(struct scsi_qla_host *vha);

 extern int qla8044_md_get_template(scsi_qla_host_t *);

-extern int qla8044_write_optrom_data(struct scsi_qla_host *, uint8_t *,

+extern int qla8044_write_optrom_data(struct scsi_qla_host *, void *,

 				     uint32_t, uint32_t);

 extern irqreturn_t qla8044_intr_handler(int, void *);

 extern void qla82xx_mbx_completion(scsi_qla_host_t *, uint16_t);

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c

index 9fa3c3322809..27482aa84adf 100644

--- a/drivers/scsi/qla2xxx/qla_init.c

+++ b/drivers/scsi/qla2xxx/qla_init.c

@@ -4433,9 +4433,8 @@ qla2x00_nvram_config(scsi_qla_host_t *vha)

 	    nv->nvram_version < 1) {

 		/* Reset NVRAM data. */

 		ql_log(ql_log_warn, vha, 0x0064,

-		    "Inconsistent NVRAM "

-		    "detected: checksum=0x%x id=%c version=0x%x.\n",

-		    chksum, nv->id[0], nv->nvram_version);

+		    "Inconsistent NVRAM detected: checksum=%#x id=%.4s version=%#x.\n",

+		    chksum, nv->id, nv->nvram_version);

 		ql_log(ql_log_warn, vha, 0x0065,

 		    "Falling back to "

 		    "functioning (yet invalid -- WWPN) defaults.\n");

@@ -7021,13 +7020,12 @@ qla24xx_nvram_config(scsi_qla_host_t *vha)

 	/* Get VPD data into cache */

 	ha->vpd = ha->nvram + VPD_OFFSET;

-	ha->isp_ops->read_nvram(vha, (uint8_t *)ha->vpd,

+	ha->isp_ops->read_nvram(vha, ha->vpd,

 	    ha->nvram_base - FA_NVRAM_FUNC0_ADDR, FA_NVRAM_VPD_SIZE * 4);

 	/* Get NVRAM data into cache and calculate checksum. */

 	dptr = (uint32_t *)nv;

-	ha->isp_ops->read_nvram(vha, (uint8_t *)dptr, ha->nvram_base,

-	    ha->nvram_size);

+	ha->isp_ops->read_nvram(vha, dptr, ha->nvram_base, ha->nvram_size);

 	for (cnt = 0, chksum = 0; cnt < ha->nvram_size >> 2; cnt++, dptr++)

 		chksum += le32_to_cpu(*dptr);

@@ -7041,9 +7039,9 @@ qla24xx_nvram_config(scsi_qla_host_t *vha)

 	    le16_to_cpu(nv->nvram_version) < ICB_VERSION) {

 		/* Reset NVRAM data. */

 		ql_log(ql_log_warn, vha, 0x006b,

-		    "Inconsistent NVRAM detected: checksum=0x%x id=%c "

-		    "version=0x%x.\n", chksum, nv->id[0], nv->nvram_version);

-		ql_dump_buffer(ql_dbg_init, vha, 0x006b, nv, 32);

+		    "Inconsistent NVRAM checksum=%#x id=%.4s version=%#x.\n",

+		    chksum, nv->id, nv->nvram_version);

+		ql_dump_buffer(ql_dbg_init, vha, 0x006b, nv, sizeof(*nv));

 		ql_log(ql_log_warn, vha, 0x006c,

 		    "Falling back to functioning (yet invalid -- WWPN) "

 		    "defaults.\n");

@@ -7432,6 +7430,7 @@ qla24xx_load_risc_flash(scsi_qla_host_t *vha, uint32_t *srisc_addr,

 		fwdt->template = NULL;

 		fwdt->length = 0;

+		dcode = (void *)req->ring;

 		qla24xx_read_flash_data(vha, dcode, faddr, 7);

 		risc_size = be32_to_cpu(dcode[2]);

 		ql_dbg(ql_dbg_init, vha, 0x0161,

@@ -8034,10 +8033,9 @@ qla81xx_nvram_config(scsi_qla_host_t *vha)

 	    le16_to_cpu(nv->nvram_version) < ICB_VERSION) {

 		/* Reset NVRAM data. */

 		ql_log(ql_log_info, vha, 0x0073,

-		    "Inconsistent NVRAM detected: checksum=0x%x id=%c "

-		    "version=0x%x.\n", chksum, nv->id[0],

-		    le16_to_cpu(nv->nvram_version));

-		ql_dump_buffer(ql_dbg_init, vha, 0x0073, nv, 32);

+		    "Inconsistent NVRAM checksum=%#x id=%.4s version=%#x.\n",

+		    chksum, nv->id, le16_to_cpu(nv->nvram_version));

+		ql_dump_buffer(ql_dbg_init, vha, 0x0073, nv, sizeof(*nv));

 		ql_log(ql_log_info, vha, 0x0074,

 		    "Falling back to functioning (yet invalid -- WWPN) "

 		    "defaults.\n");

diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c

index 868bfb56d972..ff624c06824e 100644

--- a/drivers/scsi/qla2xxx/qla_nx.c

+++ b/drivers/scsi/qla2xxx/qla_nx.c

@@ -2653,8 +2653,8 @@ done:

 /*

  * Address and length are byte address

  */

-uint8_t *

-qla82xx_read_optrom_data(struct scsi_qla_host *vha, uint8_t *buf,

+void *

+qla82xx_read_optrom_data(struct scsi_qla_host *vha, void *buf,

 	uint32_t offset, uint32_t length)

 {

 	scsi_block_requests(vha->host);

@@ -2762,15 +2762,14 @@ write_done:

 }

 int

-qla82xx_write_optrom_data(struct scsi_qla_host *vha, uint8_t *buf,

+qla82xx_write_optrom_data(struct scsi_qla_host *vha, void *buf,

 	uint32_t offset, uint32_t length)

 {

 	int rval;

 	/* Suspend HBA. */

 	scsi_block_requests(vha->host);

-	rval = qla82xx_write_flash_data(vha, (uint32_t *)buf, offset,

-		length >> 2);

+	rval = qla82xx_write_flash_data(vha, buf, offset, length >> 2);

 	scsi_unblock_requests(vha->host);

 	/* Convert return ISP82xx to generic */

@@ -3694,8 +3693,8 @@ qla82xx_chip_reset_cleanup(scsi_qla_host_t *vha)

 		spin_unlock_irqrestore(&ha->hardware_lock, flags);

 		/* Wait for pending cmds (physical and virtual) to complete */

-		if (qla2x00_eh_wait_for_pending_commands(vha, 0, 0,

-		    WAIT_HOST)) {

+		if (!qla2x00_eh_wait_for_pending_commands(vha, 0, 0,

+		    WAIT_HOST) == QLA_SUCCESS) {

 			ql_dbg(ql_dbg_init, vha, 0x00b3,

 			    "Done wait for "

 			    "pending commands.\n");

diff --git a/drivers/scsi/qla2xxx/qla_nx2.c b/drivers/scsi/qla2xxx/qla_nx2.c

index 56f72b44a965..412d589fe550 100644

--- a/drivers/scsi/qla2xxx/qla_nx2.c

+++ b/drivers/scsi/qla2xxx/qla_nx2.c

@@ -542,12 +542,12 @@ exit_lock_error:

 /*

  * Address and length are byte address

  */

-uint8_t *

-qla8044_read_optrom_data(struct scsi_qla_host *vha, uint8_t *buf,

+void *

+qla8044_read_optrom_data(struct scsi_qla_host *vha, void *buf,

 	uint32_t offset, uint32_t length)

 {

 	scsi_block_requests(vha->host);

-	if (qla8044_read_flash_data(vha, (uint8_t *)buf, offset, length / 4)

+	if (qla8044_read_flash_data(vha, buf, offset, length / 4)

 	    != QLA_SUCCESS) {

 		ql_log(ql_log_warn, vha,  0xb08d,

 		    "%s: Failed to read from flash\n",

@@ -3780,7 +3780,7 @@ qla8044_write_flash_dword_mode(scsi_qla_host_t *vha, uint32_t *dwptr,

 }

 int

-qla8044_write_optrom_data(struct scsi_qla_host *vha, uint8_t *buf,

+qla8044_write_optrom_data(struct scsi_qla_host *vha, void *buf,

 			  uint32_t offset, uint32_t length)

 {

 	int rval = QLA_FUNCTION_FAILED, i, burst_iter_count;

diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c

index 5c0c62f1f010..8a275cf2d4fc 100644

--- a/drivers/scsi/qla2xxx/qla_sup.c

+++ b/drivers/scsi/qla2xxx/qla_sup.c

@@ -429,66 +429,64 @@ qla2x00_set_nvram_protection(struct qla_hw_data *ha, int stat)

 static inline uint32_t

 flash_conf_addr(struct qla_hw_data *ha, uint32_t faddr)

 {

-	return ha->flash_conf_off | faddr;

+	return ha->flash_conf_off + faddr;

 }

 static inline uint32_t

 flash_data_addr(struct qla_hw_data *ha, uint32_t faddr)

 {

-	return ha->flash_data_off | faddr;

+	return ha->flash_data_off + faddr;

 }

 static inline uint32_t

 nvram_conf_addr(struct qla_hw_data *ha, uint32_t naddr)

 {

-	return ha->nvram_conf_off | naddr;

+	return ha->nvram_conf_off + naddr;

 }

 static inline uint32_t

 nvram_data_addr(struct qla_hw_data *ha, uint32_t naddr)

 {

-	return ha->nvram_data_off | naddr;

+	return ha->nvram_data_off + naddr;

 }

-static uint32_t

-qla24xx_read_flash_dword(struct qla_hw_data *ha, uint32_t addr)

+static int

+qla24xx_read_flash_dword(struct qla_hw_data *ha, uint32_t addr, uint32_t *data)

 {

-	int rval;

-	uint32_t cnt, data;

 	struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;

+	ulong cnt = 30000;

 	WRT_REG_DWORD(&reg->flash_addr, addr & ~FARX_DATA_FLAG);

-	/* Wait for READ cycle to complete. */

-	rval = QLA_SUCCESS;

-	for (cnt = 3000;

-	    (RD_REG_DWORD(&reg->flash_addr) & FARX_DATA_FLAG) == 0 &&

-	    rval == QLA_SUCCESS; cnt--) {

-		if (cnt)

-			udelay(10);

-		else

-			rval = QLA_FUNCTION_TIMEOUT;

+

+	while (cnt--) {

+		if (RD_REG_DWORD(&reg->flash_addr) & FARX_DATA_FLAG) {

+			*data = RD_REG_DWORD(&reg->flash_data);

+			return QLA_SUCCESS;

+		}

+		udelay(10);

 		cond_resched();

 	}

-	/* TODO: What happens if we time out? */

-	data = 0xDEADDEAD;

-	if (rval == QLA_SUCCESS)

-		data = RD_REG_DWORD(&reg->flash_data);

-

-	return data;

+	ql_log(ql_log_warn, pci_get_drvdata(ha->pdev), 0x7090,

+	    "Flash read dword at %x timeout.\n", addr);

+	*data = 0xDEADDEAD;

+	return QLA_FUNCTION_TIMEOUT;

 }

 uint32_t *

 qla24xx_read_flash_data(scsi_qla_host_t *vha, uint32_t *dwptr, uint32_t faddr,

     uint32_t dwords)

 {

-	uint32_t i;

+	ulong i;

 	struct qla_hw_data *ha = vha->hw;

 	/* Dword reads to flash. */

-	for (i = 0; i < dwords; i++, faddr++)

-		dwptr[i] = cpu_to_le32(qla24xx_read_flash_dword(ha,

-		    flash_data_addr(ha, faddr)));

+	faddr =  flash_data_addr(ha, faddr);

+	for (i = 0; i < dwords; i++, faddr++, dwptr++) {

+		if (qla24xx_read_flash_dword(ha, faddr, dwptr))

+			break;

+		cpu_to_le32s(dwptr);

+	}

 	return dwptr;

 }

@@ -496,35 +494,37 @@ qla24xx_read_flash_data(scsi_qla_host_t *vha, uint32_t *dwptr, uint32_t faddr,

 static int

 qla24xx_write_flash_dword(struct qla_hw_data *ha, uint32_t addr, uint32_t data)

 {

-	int rval;

-	uint32_t cnt;

 	struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;

+	ulong cnt = 500000;

 	WRT_REG_DWORD(&reg->flash_data, data);

-	RD_REG_DWORD(&reg->flash_data);		/* PCI Posting. */

 	WRT_REG_DWORD(&reg->flash_addr, addr | FARX_DATA_FLAG);

-	/* Wait for Write cycle to complete. */

-	rval = QLA_SUCCESS;

-	for (cnt = 500000; (RD_REG_DWORD(&reg->flash_addr) & FARX_DATA_FLAG) &&

-	    rval == QLA_SUCCESS; cnt--) {

-		if (cnt)

-			udelay(10);

-		else

-			rval = QLA_FUNCTION_TIMEOUT;

+

+	while (cnt--) {

+		if (!(RD_REG_DWORD(&reg->flash_addr) & FARX_DATA_FLAG))

+			return QLA_SUCCESS;

+		udelay(10);

 		cond_resched();

 	}

-	return rval;

+

+	ql_log(ql_log_warn, pci_get_drvdata(ha->pdev), 0x7090,

+	    "Flash write dword at %x timeout.\n", addr);

+	return QLA_FUNCTION_TIMEOUT;

 }

 static void

 qla24xx_get_flash_manufacturer(struct qla_hw_data *ha, uint8_t *man_id,

     uint8_t *flash_id)

 {

-	uint32_t ids;

+	uint32_t faddr, ids = 0;

-	ids = qla24xx_read_flash_dword(ha, flash_conf_addr(ha, 0x03ab));

-	*man_id = LSB(ids);

-	*flash_id = MSB(ids);

+	*man_id = *flash_id = 0;

+

+	faddr = flash_conf_addr(ha, 0x03ab);

+	if (!qla24xx_read_flash_dword(ha, faddr, &ids)) {

+		*man_id = LSB(ids);

+		*flash_id = MSB(ids);

+	}

 	/* Check if man_id and flash_id are valid. */

 	if (ids != 0xDEADDEAD && (*man_id == 0 || *flash_id == 0)) {

@@ -534,9 +534,11 @@ qla24xx_get_flash_manufacturer(struct qla_hw_data *ha, uint8_t *man_id,

 		 * Example: ATMEL 0x00 01 45 1F

 		 * Extract MFG and Dev ID from last two bytes.

 		 */

-		ids = qla24xx_read_flash_dword(ha, flash_conf_addr(ha, 0x009f));

-		*man_id = LSB(ids);

-		*flash_id = MSB(ids);

+		faddr = flash_conf_addr(ha, 0x009f);

+		if (!qla24xx_read_flash_dword(ha, faddr, &ids)) {

+			*man_id = LSB(ids);

+			*flash_id = MSB(ids);

+		}

 	}

 }

@@ -545,12 +547,12 @@ qla2xxx_find_flt_start(scsi_qla_host_t *vha, uint32_t *start)

 {

 	const char *loc, *locations[] = { "DEF", "PCI" };

 	uint32_t pcihdr, pcids;

-	uint32_t *dcode;

-	uint8_t *buf, *bcode, last_image;

 	uint16_t cnt, chksum, *wptr;

-	struct qla_flt_location *fltl;

 	struct qla_hw_data *ha = vha->hw;

 	struct req_que *req = ha->req_q_map[0];

+	struct qla_flt_location *fltl = (void *)req->ring;

+	uint32_t *dcode = (void *)req->ring;

+	uint8_t *buf = (void *)req->ring, *bcode,  last_image;

 	/*

 	 * FLT-location structure resides after the last PCI region.

@@ -575,11 +577,9 @@ qla2xxx_find_flt_start(scsi_qla_host_t *vha, uint32_t *start)

 		*start = FA_FLASH_LAYOUT_ADDR_28;

 		goto end;

 	}

+

 	/* Begin with first PCI expansion ROM header. */

-	buf = (uint8_t *)req->ring;

-	dcode = (uint32_t *)req->ring;

 	pcihdr = 0;

-	last_image = 1;

 	do {

 		/* Verify PCI expansion ROM header. */

 		qla24xx_read_flash_data(vha, dcode, pcihdr >> 2, 0x20);

@@ -604,15 +604,12 @@ qla2xxx_find_flt_start(scsi_qla_host_t *vha, uint32_t *start)

 	} while (!last_image);

 	/* Now verify FLT-location structure. */

-	fltl = (struct qla_flt_location *)req->ring;

-	qla24xx_read_flash_data(vha, dcode, pcihdr >> 2,

-	    sizeof(struct qla_flt_location) >> 2);

-	if (fltl->sig[0] != 'Q' || fltl->sig[1] != 'F' ||

-	    fltl->sig[2] != 'L' || fltl->sig[3] != 'T')

+	qla24xx_read_flash_data(vha, dcode, pcihdr >> 2, sizeof(*fltl) >> 2);

+	if (memcmp(fltl->sig, "QFLT", 4))

 		goto end;

-	wptr = (uint16_t *)req->ring;

-	cnt = sizeof(struct qla_flt_location) >> 1;

+	wptr = (void *)req->ring;

+	cnt = sizeof(*fltl) / sizeof(*wptr);

 	for (chksum = 0; cnt--; wptr++)

 		chksum += le16_to_cpu(*wptr);

 	if (chksum) {

@@ -915,22 +912,19 @@ qla2xxx_get_fdt_info(scsi_qla_host_t *vha)

 #define FLASH_BLK_SIZE_32K	0x8000

 #define FLASH_BLK_SIZE_64K	0x10000

 	const char *loc, *locations[] = { "MID", "FDT" };

+	struct qla_hw_data *ha = vha->hw;

+	struct req_que *req = ha->req_q_map[0];

 	uint16_t cnt, chksum;

-	uint16_t *wptr;

-	struct qla_fdt_layout *fdt;

+	uint16_t *wptr = (void *)req->ring;

+	struct qla_fdt_layout *fdt = (void *)req->ring;

 	uint8_t	man_id, flash_id;

 	uint16_t mid = 0, fid = 0;

-	struct qla_hw_data *ha = vha->hw;

-	struct req_que *req = ha->req_q_map[0];

-	wptr = (uint16_t *)req->ring;

-	fdt = (struct qla_fdt_layout *)req->ring;

-	ha->isp_ops->read_optrom(vha, (uint8_t *)req->ring,

-	    ha->flt_region_fdt << 2, OPTROM_BURST_SIZE);

-	if (*wptr == cpu_to_le16(0xffff))

+	qla24xx_read_flash_data(vha, (void *)fdt, ha->flt_region_fdt,

+	    OPTROM_BURST_DWORDS);

+	if (le16_to_cpu(*wptr) == 0xffff)

 		goto no_flash_data;

-	if (fdt->sig[0] != 'Q' || fdt->sig[1] != 'L' || fdt->sig[2] != 'I' ||

-	    fdt->sig[3] != 'D')

+	if (memcmp(fdt->sig, "QLID", 4))

 		goto no_flash_data;

 	for (cnt = 0, chksum = 0; cnt < sizeof(*fdt) >> 1; cnt++, wptr++)

@@ -1022,8 +1016,7 @@ qla2xxx_get_idc_param(scsi_qla_host_t *vha)

 		return;

 	wptr = (uint32_t *)req->ring;

-	ha->isp_ops->read_optrom(vha, (uint8_t *)req->ring,

-		QLA82XX_IDC_PARAM_ADDR , 8);

+	ha->isp_ops->read_optrom(vha, req->ring, QLA82XX_IDC_PARAM_ADDR, 8);

 	if (*wptr == cpu_to_le32(0xffffffff)) {

 		ha->fcoe_dev_init_timeout = QLA82XX_ROM_DEV_INIT_TIMEOUT;

@@ -1085,8 +1078,8 @@ qla2xxx_flash_npiv_conf(scsi_qla_host_t *vha)

 	if (IS_QLA8044(ha))

 		return;

-	ha->isp_ops->read_optrom(vha, (uint8_t *)&hdr,

-	    ha->flt_region_npiv_conf << 2, sizeof(struct qla_npiv_header));

+	ha->isp_ops->read_optrom(vha, &hdr, ha->flt_region_npiv_conf << 2,

+	    sizeof(struct qla_npiv_header));

 	if (hdr.version == cpu_to_le16(0xffff))

 		return;

 	if (hdr.version != cpu_to_le16(1)) {

@@ -1105,8 +1098,8 @@ qla2xxx_flash_npiv_conf(scsi_qla_host_t *vha)

 		return;

 	}

-	ha->isp_ops->read_optrom(vha, (uint8_t *)data,

-	    ha->flt_region_npiv_conf << 2, NPIV_CONFIG_SIZE);

+	ha->isp_ops->read_optrom(vha, data, ha->flt_region_npiv_conf << 2,

+	    NPIV_CONFIG_SIZE);

 	cnt = (sizeof(hdr) + le16_to_cpu(hdr.entries) * sizeof(*entry)) >> 1;

 	for (wptr = data, chksum = 0; cnt--; wptr++)

@@ -1143,10 +1136,8 @@ qla2xxx_flash_npiv_conf(scsi_qla_host_t *vha)

 		vid.node_name = wwn_to_u64(entry->node_name);

 		ql_dbg(ql_dbg_user, vha, 0x7093,

-		    "NPIV[%02x]: wwpn=%llx "

-		    "wwnn=%llx vf_id=0x%x Q_qos=0x%x F_qos=0x%x.\n", cnt,

-		    (unsigned long long)vid.port_name,

-		    (unsigned long long)vid.node_name,

+		    "NPIV[%02x]: wwpn=%llx wwnn=%llx vf_id=%#x Q_qos=%#x F_qos=%#x.\n",

+		    cnt, vid.port_name, vid.node_name,

 		    le16_to_cpu(entry->vf_id),

 		    entry->q_qos, entry->f_qos);

@@ -1154,10 +1145,8 @@ qla2xxx_flash_npiv_conf(scsi_qla_host_t *vha)

 			vport = fc_vport_create(vha->host, 0, &vid);

 			if (!vport)