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

Commit 3d79038f authored by Andrew Vasquez's avatar Andrew Vasquez Committed by James Bottomley
Browse files

[SCSI] qla2xxx: Always use an FLT's NVRAM/VPD region information. 



Rather than assuming a particular layout of the data.  Applies to
recent ISPs only.

Signed-off-by: default avatarAndrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent d1b1bef4

drivers/scsi/qla2xxx/qla_attr.c

+4 −2
Original line number Diff line number Diff line
@@ -111,7 +111,8 @@ qla2x00_sysfs_write_nvram(struct kobject *kobj, 
	struct qla_hw_data *ha = vha->hw;

	uint16_t	cnt;



	if (!capable(CAP_SYS_ADMIN) || off != 0 || count != ha->nvram_size)

	if (!capable(CAP_SYS_ADMIN) || off != 0 || count != ha->nvram_size ||

	    !ha->isp_ops->write_nvram)

		return 0;



	/* Checksum NVRAM. */
@@ -393,7 +394,8 @@ qla2x00_sysfs_write_vpd(struct kobject *kobj, 
	struct qla_hw_data *ha = vha->hw;

	uint8_t *tmp_data;



	if (!capable(CAP_SYS_ADMIN) || off != 0 || count != ha->vpd_size)

	if (!capable(CAP_SYS_ADMIN) || off != 0 || count != ha->vpd_size ||

	    !ha->isp_ops->write_nvram)

		return 0;



	if (qla2x00_wait_for_hba_online(vha) != QLA_SUCCESS) {

drivers/scsi/qla2xxx/qla_def.h

+2 −0
Original line number Diff line number Diff line
@@ -2506,6 +2506,8 @@ struct qla_hw_data { 
	uint32_t        flt_region_boot;

	uint32_t        flt_region_fw;

	uint32_t        flt_region_vpd_nvram;

	uint32_t        flt_region_vpd;

	uint32_t        flt_region_nvram;

	uint32_t        flt_region_npiv_conf;



	/* Needed for BEACON */

drivers/scsi/qla2xxx/qla_fw.h

+4 −0
Original line number Diff line number Diff line
@@ -1708,6 +1708,10 @@ struct ex_init_cb_81xx { 
#define FA_RISC_CODE_ADDR_81	0xA0000

#define FA_FW_AREA_ADDR_81	0xC0000

#define FA_VPD_NVRAM_ADDR_81	0xD0000

#define FA_VPD0_ADDR_81		0xD0000

#define FA_VPD1_ADDR_81		0xD0400

#define FA_NVRAM0_ADDR_81	0xD0080

#define FA_NVRAM1_ADDR_81	0xD0480

#define FA_FEATURE_ADDR_81	0xD4000

#define FA_FLASH_DESCR_ADDR_81	0xD8000

#define FA_FLASH_LAYOUT_ADDR_81	0xD8400

drivers/scsi/qla2xxx/qla_init.c

+4 −10
Original line number Diff line number Diff line
@@ -4344,23 +4344,17 @@ qla81xx_nvram_config(scsi_qla_host_t *vha) 


	/* Determine NVRAM starting address. */

	ha->nvram_size = sizeof(struct nvram_81xx);

	ha->nvram_base = FA_NVRAM_FUNC0_ADDR;

	ha->vpd_size = FA_NVRAM_VPD_SIZE;

	ha->vpd_base = FA_NVRAM_VPD0_ADDR;

	if (PCI_FUNC(ha->pdev->devfn) & 1) {

		ha->nvram_base = FA_NVRAM_FUNC1_ADDR;

		ha->vpd_base = FA_NVRAM_VPD1_ADDR;

	}



	/* Get VPD data into cache */

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

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

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

	ha->isp_ops->read_optrom(vha, ha->vpd, ha->flt_region_vpd << 2,

	    ha->vpd_size);



	/* 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->isp_ops->read_optrom(vha, ha->nvram, ha->flt_region_nvram << 2,

	    ha->nvram_size);

	dptr = (uint32_t *)nv;

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

		chksum += le32_to_cpu(*dptr++);

drivers/scsi/qla2xxx/qla_os.c

+2 −2
Original line number Diff line number Diff line
@@ -1409,8 +1409,8 @@ static struct isp_operations qla81xx_isp_ops = { 
	.build_iocbs		= NULL,

	.prep_ms_iocb		= qla24xx_prep_ms_iocb,

	.prep_ms_fdmi_iocb	= qla24xx_prep_ms_fdmi_iocb,

	.read_nvram		= qla25xx_read_nvram_data,

	.write_nvram		= qla25xx_write_nvram_data,

	.read_nvram		= NULL,

	.write_nvram		= NULL,

	.fw_dump		= qla81xx_fw_dump,

	.beacon_on		= qla24xx_beacon_on,

	.beacon_off		= qla24xx_beacon_off,