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

Commit 3695310e authored Mar 12, 2019 by Joe Carnuccio Committed by Martin K. Petersen Mar 19, 2019

scsi: qla2xxx: Update flash read/write routine



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>

parent a28d9e4e

drivers/scsi/qla2xxx/qla_attr.c

+34 −31

Original line number	Diff line number	Diff line
		@@ -223,8 +223,8 @@ 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,
		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);

		@@ -511,7 +511,9 @@ qla2x00_sysfs_read_vpd(struct file filp, struct kobject kobj,
		if (!capable(CAP_SYS_ADMIN))
		return -EINVAL;

		if (IS_NOCACHE_VPD_TYPE(ha)) {
		if (IS_NOCACHE_VPD_TYPE(ha))
		goto skip;

		faddr = ha->flt_region_vpd << 2;

		if ((IS_QLA27XX(ha) \|\| IS_QLA28XX(ha)) &&
		@@ -523,10 +525,10 @@ qla2x00_sysfs_read_vpd(struct file filp, struct kobject kobj,
		mutex_unlock(&ha->optrom_mutex);
		return -EAGAIN;
		}
		ha->isp_ops->read_optrom(vha, ha->vpd, faddr,
		ha->vpd_size);

		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)) {
		@@ -934,7 +936,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, },
		@@ -957,11 +959,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,
		@@ -985,14 +987,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,
		@@ -1360,19 +1362,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))
		if (!rval && !status[0])
		return scnprintf(buf, PAGE_SIZE, "%u\n",
		(uint32_t)ha->cs84xx->op_fw_version);
		}

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

drivers/scsi/qla2xxx/qla_def.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -3161,9 +3161,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);
		@@ -3172,9 +3172,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 *);

drivers/scsi/qla2xxx/qla_gbl.h

+24 −23

Original line number	Diff line number	Diff line
		@@ -544,18 +544,19 @@ 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,
		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 , uint8_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 , uint8_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 , uint8_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 , uint8_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 , uint8_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);
		@@ -575,18 +576,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 );
		@@ -766,9 +767,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 */
		@@ -864,7 +865,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);

drivers/scsi/qla2xxx/qla_init.c

+11 −13

Original line number	Diff line number	Diff line
		@@ -4419,9 +4419,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");
		@@ -7007,13 +7006,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);

		@@ -7027,9 +7025,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");
		@@ -7418,6 +7416,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,
		@@ -8020,10 +8019,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");

drivers/scsi/qla2xxx/qla_nx.c

+6 −7

Original line number	Diff line number	Diff line
		@@ -2658,8 +2658,8 @@ qla82xx_erase_sector(struct qla_hw_data *ha, int addr)
		/*
		* 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);
		@@ -2767,15 +2767,14 @@ qla82xx_write_flash_data(struct scsi_qla_host vha, uint32_t dwptr,
		}

		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 */
		@@ -3699,8 +3698,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");