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

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

[SCSI] qla2xxx: Add BSG interface for read/write serdes register. 



Signed-off-by: default avatarJoe Carnuccio <joe.carnuccio@qlogic.com>
Signed-off-by: default avatarSaurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent e8f5e95d

drivers/scsi/qla2xxx/qla_bsg.c

+44 −0
Original line number Diff line number Diff line
@@ -2021,6 +2021,46 @@ qlafx00_mgmt_cmd(struct fc_bsg_job *bsg_job) 
	return rval;

}



static int

qla26xx_serdes_op(struct fc_bsg_job *bsg_job)

{

	struct Scsi_Host *host = bsg_job->shost;

	scsi_qla_host_t *vha = shost_priv(host);

	int rval = 0;

	struct qla_serdes_reg sr;



	memset(&sr, 0, sizeof(sr));



	sg_copy_to_buffer(bsg_job->request_payload.sg_list,

	    bsg_job->request_payload.sg_cnt, &sr, sizeof(sr));



	switch (sr.cmd) {

	case INT_SC_SERDES_WRITE_REG:

		rval = qla2x00_write_serdes_word(vha, sr.addr, sr.val);

		bsg_job->reply->reply_payload_rcv_len = 0;

		break;

	case INT_SC_SERDES_READ_REG:

		rval = qla2x00_read_serdes_word(vha, sr.addr, &sr.val);

		sg_copy_from_buffer(bsg_job->reply_payload.sg_list,

		    bsg_job->reply_payload.sg_cnt, &sr, sizeof(sr));

		bsg_job->reply->reply_payload_rcv_len = sizeof(sr);

		break;

	default:

		ql_log(ql_log_warn, vha, 0x708c,

		    "Unknown serdes cmd %x.\n", sr.cmd);

		rval = -EDOM;

		break;

	}



	bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] =

	    rval ? EXT_STATUS_MAILBOX : 0;



	bsg_job->reply_len = sizeof(struct fc_bsg_reply);

	bsg_job->reply->result = DID_OK << 16;

	bsg_job->job_done(bsg_job);

	return 0;

}



static int

qla2x00_process_vendor_specific(struct fc_bsg_job *bsg_job)

{
@@ -2069,6 +2109,10 @@ qla2x00_process_vendor_specific(struct fc_bsg_job *bsg_job) 


	case QL_VND_FX00_MGMT_CMD:

		return qlafx00_mgmt_cmd(bsg_job);



	case QL_VND_SERDES_OP:

		return qla26xx_serdes_op(bsg_job);



	default:

		return -ENOSYS;

	}

drivers/scsi/qla2xxx/qla_bsg.h

+13 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#define QL_VND_WRITE_I2C	0x10

#define QL_VND_READ_I2C		0x11

#define QL_VND_FX00_MGMT_CMD	0x12

#define QL_VND_SERDES_OP	0x13



/* BSG Vendor specific subcode returns */

#define EXT_STATUS_OK			0
@@ -212,4 +213,16 @@ struct qla_i2c_access { 
	uint8_t  buffer[0x40];

} __packed;



/* 26xx serdes register interface */



/* serdes reg commands */

#define INT_SC_SERDES_READ_REG		1

#define INT_SC_SERDES_WRITE_REG		2



struct qla_serdes_reg {

	uint16_t cmd;

	uint16_t addr;

	uint16_t val;

} __packed;



#endif

drivers/scsi/qla2xxx/qla_dbg.c

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
 * |             Level            |   Last Value Used  |     Holes	|

 * ----------------------------------------------------------------------

 * | Module Init and Probe        |       0x015b       | 0x4b,0xba,0xfa |

 * | Mailbox commands             |       0x1181       | 0x111a-0x111b  |

 * | Mailbox commands             |       0x1187       | 0x111a-0x111b  |

 * |                              |                    | 0x1155-0x1158  |

 * |                              |                    | 0x1018-0x1019  |

 * |                              |                    | 0x1115-0x1116  |

drivers/scsi/qla2xxx/qla_def.h

+2 −1
Original line number Diff line number Diff line
@@ -862,7 +862,6 @@ struct mbx_cmd_32 { 
 */

#define MBC_LOAD_RAM			1	/* Load RAM. */

#define MBC_EXECUTE_FIRMWARE		2	/* Execute firmware. */

#define MBC_WRITE_RAM_WORD		4	/* Write RAM word. */

#define MBC_READ_RAM_WORD		5	/* Read RAM word. */

#define MBC_MAILBOX_REGISTER_TEST	6	/* Wrap incoming mailboxes */

#define MBC_VERIFY_CHECKSUM		7	/* Verify checksum. */
@@ -937,6 +936,8 @@ struct mbx_cmd_32 { 
/*

 * ISP24xx mailbox commands

 */

#define MBC_WRITE_SERDES		0x3	/* Write serdes word. */

#define MBC_READ_SERDES			0x4	/* Read serdes word. */

#define MBC_SERDES_PARAMS		0x10	/* Serdes Tx Parameters. */

#define MBC_GET_IOCB_STATUS		0x12	/* Get IOCB status command. */

#define MBC_PORT_PARAMS			0x1A	/* Port iDMA Parameters. */

drivers/scsi/qla2xxx/qla_gbl.h

+5 −0
Original line number Diff line number Diff line
@@ -340,6 +340,11 @@ qla2x00_eh_wait_for_pending_commands(scsi_qla_host_t *, unsigned int, 
extern int

qla2x00_system_error(scsi_qla_host_t *);



extern int

qla2x00_write_serdes_word(scsi_qla_host_t *, uint16_t, uint16_t);

extern int

qla2x00_read_serdes_word(scsi_qla_host_t *, uint16_t, uint16_t *);



extern int

qla2x00_set_serdes_params(scsi_qla_host_t *, uint16_t, uint16_t, uint16_t);