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

Commit 6766df9e authored by Joe Carnuccio's avatar Joe Carnuccio Committed by James Bottomley
Browse files

[SCSI] qla2xxx: Unify the read/write sfp mailbox command routines. 



Make the read/write sfp mailbox command routines uniform, and remove redundancy.
Also protect against attempting to do a single byte dma in these routines.

Signed-off-by: default avatarJoe Carnuccio <joe.carnuccio@qlogic.com>
Signed-off-by: default avatarMadhuranath Iyengar <Madhu.Iyengar@qlogic.com>
Signed-off-by: default avatarJames Bottomley <jbottomley@parallels.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 773120e4

drivers/scsi/qla2xxx/qla_attr.c

+6 −6
Original line number Diff line number Diff line
@@ -496,8 +496,8 @@ qla2x00_sysfs_read_sfp(struct file *filp, struct kobject *kobj, 
			offset = 0;

		}



		rval = qla2x00_read_sfp(vha, ha->sfp_data_dma, addr, offset,

		    SFP_BLOCK_SIZE);

		rval = qla2x00_read_sfp(vha, ha->sfp_data_dma, ha->sfp_data,

		    addr, offset, SFP_BLOCK_SIZE, 0);

		if (rval != QLA_SUCCESS) {

			qla_printk(KERN_WARNING, ha,

			    "Unable to read SFP data (%x/%x/%x).\n", rval,
@@ -628,8 +628,8 @@ qla2x00_sysfs_write_edc(struct file *filp, struct kobject *kobj, 


	memcpy(ha->edc_data, &buf[8], len);



	rval = qla2x00_write_edc(vha, dev, adr, ha->edc_data_dma,

	    ha->edc_data, len, opt);

	rval = qla2x00_write_sfp(vha, ha->edc_data_dma, ha->edc_data,

	    dev, adr, len, opt);

	if (rval != QLA_SUCCESS) {

		DEBUG2(qla_printk(KERN_INFO, ha,

		    "Unable to write EDC (%x) %02x:%02x:%04x:%02x:%02x.\n",
@@ -685,8 +685,8 @@ qla2x00_sysfs_write_edc_status(struct file *filp, struct kobject *kobj, 
			return -EINVAL;



	memset(ha->edc_data, 0, len);

	rval = qla2x00_read_edc(vha, dev, adr, ha->edc_data_dma,

	    ha->edc_data, len, opt);

	rval = qla2x00_read_sfp(vha, ha->edc_data_dma, ha->edc_data,

			dev, adr, len, opt);

	if (rval != QLA_SUCCESS) {

		DEBUG2(qla_printk(KERN_INFO, ha,

		    "Unable to write EDC status (%x) %02x:%02x:%04x:%02x.\n",

drivers/scsi/qla2xxx/qla_gbl.h

+4 −7
Original line number Diff line number Diff line
@@ -323,15 +323,12 @@ extern int 
qla2x00_disable_fce_trace(scsi_qla_host_t *, uint64_t *, uint64_t *);



extern int

qla2x00_read_sfp(scsi_qla_host_t *, dma_addr_t, uint16_t, uint16_t, uint16_t);

qla2x00_read_sfp(scsi_qla_host_t *, dma_addr_t, uint8_t *,

	uint16_t, uint16_t, uint16_t, uint16_t);



extern int

qla2x00_read_edc(scsi_qla_host_t *, uint16_t, uint16_t, dma_addr_t,

    uint8_t *, uint16_t, uint16_t);



extern int

qla2x00_write_edc(scsi_qla_host_t *, uint16_t, uint16_t, dma_addr_t,

    uint8_t *, uint16_t, uint16_t);

qla2x00_write_sfp(scsi_qla_host_t *, dma_addr_t, uint8_t *,

	uint16_t, uint16_t, uint16_t, uint16_t);



extern int

qla2x00_set_idma_speed(scsi_qla_host_t *, uint16_t, uint16_t, uint16_t *);

drivers/scsi/qla2xxx/qla_mbx.c

+23 −49
Original line number Diff line number Diff line
@@ -2786,44 +2786,6 @@ qla2x00_disable_fce_trace(scsi_qla_host_t *vha, uint64_t *wr, uint64_t *rd) 
	return rval;

}



int

qla2x00_read_sfp(scsi_qla_host_t *vha, dma_addr_t sfp_dma, uint16_t addr,

    uint16_t off, uint16_t count)

{

	int rval;

	mbx_cmd_t mc;

	mbx_cmd_t *mcp = &mc;



	if (!IS_FWI2_CAPABLE(vha->hw))

		return QLA_FUNCTION_FAILED;



	DEBUG11(printk("%s(%ld): entered.\n", __func__, vha->host_no));



	mcp->mb[0] = MBC_READ_SFP;

	mcp->mb[1] = addr;

	mcp->mb[2] = MSW(sfp_dma);

	mcp->mb[3] = LSW(sfp_dma);

	mcp->mb[6] = MSW(MSD(sfp_dma));

	mcp->mb[7] = LSW(MSD(sfp_dma));

	mcp->mb[8] = count;

	mcp->mb[9] = off;

	mcp->mb[10] = 0;

	mcp->out_mb = MBX_10|MBX_9|MBX_8|MBX_7|MBX_6|MBX_3|MBX_2|MBX_1|MBX_0;

	mcp->in_mb = MBX_0;

	mcp->tov = MBX_TOV_SECONDS;

	mcp->flags = 0;

	rval = qla2x00_mailbox_command(vha, mcp);



	if (rval != QLA_SUCCESS) {

		DEBUG2_3_11(printk("%s(%ld): failed=%x (%x).\n", __func__,

		    vha->host_no, rval, mcp->mb[0]));

	} else {

		DEBUG11(printk("%s(%ld): done.\n", __func__, vha->host_no));

	}



	return rval;

}



int

qla2x00_get_idma_speed(scsi_qla_host_t *vha, uint16_t loop_id,

	uint16_t *port_speed, uint16_t *mb)
@@ -3589,15 +3551,22 @@ qla81xx_restart_mpi_firmware(scsi_qla_host_t *vha) 
}



int

qla2x00_read_edc(scsi_qla_host_t *vha, uint16_t dev, uint16_t adr,

    dma_addr_t sfp_dma, uint8_t *sfp, uint16_t len, uint16_t opt)

qla2x00_read_sfp(scsi_qla_host_t *vha, dma_addr_t sfp_dma, uint8_t *sfp,

	uint16_t dev, uint16_t off, uint16_t len, uint16_t opt)

{

	int rval;

	mbx_cmd_t mc;

	mbx_cmd_t *mcp = &mc;

	struct qla_hw_data *ha = vha->hw;



	if (!IS_FWI2_CAPABLE(ha))

		return QLA_FUNCTION_FAILED;



	DEBUG11(printk("%s(%ld): entered.\n", __func__, vha->host_no));



	if (len == 1)

		opt |= BIT_0;



	mcp->mb[0] = MBC_READ_SFP;

	mcp->mb[1] = dev;

	mcp->mb[2] = MSW(sfp_dma);
@@ -3605,7 +3574,7 @@ qla2x00_read_edc(scsi_qla_host_t *vha, uint16_t dev, uint16_t adr, 
	mcp->mb[6] = MSW(MSD(sfp_dma));

	mcp->mb[7] = LSW(MSD(sfp_dma));

	mcp->mb[8] = len;

	mcp->mb[9] = adr;

	mcp->mb[9] = off;

	mcp->mb[10] = opt;

	mcp->out_mb = MBX_10|MBX_9|MBX_8|MBX_7|MBX_6|MBX_3|MBX_2|MBX_1|MBX_0;

	mcp->in_mb = MBX_1|MBX_0;
@@ -3614,7 +3583,6 @@ qla2x00_read_edc(scsi_qla_host_t *vha, uint16_t dev, uint16_t adr, 
	rval = qla2x00_mailbox_command(vha, mcp);



	if (opt & BIT_0)

		if (sfp)

		*sfp = mcp->mb[1];



	if (rval != QLA_SUCCESS) {
@@ -3628,17 +3596,23 @@ qla2x00_read_edc(scsi_qla_host_t *vha, uint16_t dev, uint16_t adr, 
}



int

qla2x00_write_edc(scsi_qla_host_t *vha, uint16_t dev, uint16_t adr,

    dma_addr_t sfp_dma, uint8_t *sfp, uint16_t len, uint16_t opt)

qla2x00_write_sfp(scsi_qla_host_t *vha, dma_addr_t sfp_dma, uint8_t *sfp,

	uint16_t dev, uint16_t off, uint16_t len, uint16_t opt)

{

	int rval;

	mbx_cmd_t mc;

	mbx_cmd_t *mcp = &mc;

	struct qla_hw_data *ha = vha->hw;



	if (!IS_FWI2_CAPABLE(ha))

		return QLA_FUNCTION_FAILED;



	DEBUG11(printk("%s(%ld): entered.\n", __func__, vha->host_no));



	if (len == 1)

		opt |= BIT_0;



	if (opt & BIT_0)

		if (sfp)

		len = *sfp;



	mcp->mb[0] = MBC_WRITE_SFP;
@@ -3648,10 +3622,10 @@ qla2x00_write_edc(scsi_qla_host_t *vha, uint16_t dev, uint16_t adr, 
	mcp->mb[6] = MSW(MSD(sfp_dma));

	mcp->mb[7] = LSW(MSD(sfp_dma));

	mcp->mb[8] = len;

	mcp->mb[9] = adr;

	mcp->mb[9] = off;

	mcp->mb[10] = opt;

	mcp->out_mb = MBX_10|MBX_9|MBX_8|MBX_7|MBX_6|MBX_3|MBX_2|MBX_1|MBX_0;

	mcp->in_mb = MBX_0;

	mcp->in_mb = MBX_1|MBX_0;

	mcp->tov = MBX_TOV_SECONDS;

	mcp->flags = 0;

	rval = qla2x00_mailbox_command(vha, mcp);