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

Commit 00b6bd25 authored Jan 17, 2008 by Andrew Vasquez Committed by James Bottomley Jan 23, 2008

[SCSI] qla2xxx: Trace-Control naming cleanups.

In preparation for FCE (Fibre Channel Event) tracing support.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

parent a824ebb3

drivers/scsi/qla2xxx/qla_def.h

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -623,9 +623,6 @@ typedef struct {
	#define MBC_GET_LINK_PRIV_STATS 0x6d /* Get link & private data. */		#define MBC_GET_LINK_PRIV_STATS 0x6d /* Get link & private data. */
	#define MBC_SET_VENDOR_ID 0x76 /* Set Vendor ID. */		#define MBC_SET_VENDOR_ID 0x76 /* Set Vendor ID. */

	#define TC_ENABLE 4
	#define TC_DISABLE 5

	/* Firmware return data sizes */		/* Firmware return data sizes */
	#define FCAL_MAP_SIZE 128		#define FCAL_MAP_SIZE 128

drivers/scsi/qla2xxx/qla_fw.h

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -952,6 +952,13 @@ struct device_reg_24xx {
	uint32_t iobase_sdata;		uint32_t iobase_sdata;
	};		};

			/* Trace Control *************************************************************/

			#define TC_AEN_DISABLE 0

			#define TC_EFT_ENABLE 4
			#define TC_EFT_DISABLE 5

	/* MID Support ***************************************************************/		/* MID Support ***************************************************************/

	#define MIN_MULTI_ID_FABRIC 64 /* Must be power-of-2. */		#define MIN_MULTI_ID_FABRIC 64 /* Must be power-of-2. */

drivers/scsi/qla2xxx/qla_gbl.h

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -228,7 +228,9 @@ extern int
	qla2x00_stop_firmware(scsi_qla_host_t *);		qla2x00_stop_firmware(scsi_qla_host_t *);

	extern int		extern int
	qla2x00_trace_control(scsi_qla_host_t *, uint16_t, dma_addr_t, uint16_t);		qla2x00_enable_eft_trace(scsi_qla_host_t *, dma_addr_t, uint16_t);
			extern int
			qla2x00_disable_eft_trace(scsi_qla_host_t *);

	extern int		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, uint16_t, uint16_t, uint16_t);

drivers/scsi/qla2xxx/qla_init.c

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -766,8 +766,7 @@ qla2x00_alloc_fw_dump(scsi_qla_host_t *ha)
	goto cont_alloc;		goto cont_alloc;
	}		}

	rval = qla2x00_trace_control(ha, TC_ENABLE, eft_dma,		rval = qla2x00_enable_eft_trace(ha, eft_dma, EFT_NUM_BUFFERS);
	EFT_NUM_BUFFERS);
	if (rval) {		if (rval) {
	qla_printk(KERN_WARNING, ha, "Unable to initialize "		qla_printk(KERN_WARNING, ha, "Unable to initialize "
	"EFT (%d).\n", rval);		"EFT (%d).\n", rval);
	@@ -3240,7 +3239,7 @@ qla2x00_abort_isp(scsi_qla_host_t *ha)
	clear_bit(ISP_ABORT_RETRY, &ha->dpc_flags);		clear_bit(ISP_ABORT_RETRY, &ha->dpc_flags);

	if (ha->eft) {		if (ha->eft) {
	rval = qla2x00_trace_control(ha, TC_ENABLE,		rval = qla2x00_enable_eft_trace(ha,
	ha->eft_dma, EFT_NUM_BUFFERS);		ha->eft_dma, EFT_NUM_BUFFERS);
	if (rval) {		if (rval) {
	qla_printk(KERN_WARNING, ha,		qla_printk(KERN_WARNING, ha,

drivers/scsi/qla2xxx/qla_mbx.c

+37 −12

Original line number	Original line	Diff line number	Diff line
	@@ -2350,7 +2350,7 @@ qla2x00_stop_firmware(scsi_qla_host_t *ha)
	}		}

	int		int
	qla2x00_trace_control(scsi_qla_host_t *ha, uint16_t ctrl, dma_addr_t eft_dma,		qla2x00_enable_eft_trace(scsi_qla_host_t *ha, dma_addr_t eft_dma,
	uint16_t buffers)		uint16_t buffers)
	{		{
	int rval;		int rval;
	@@ -2363,22 +2363,47 @@ qla2x00_trace_control(scsi_qla_host_t *ha, uint16_t ctrl, dma_addr_t eft_dma,
	DEBUG11(printk("%s(%ld): entered.\n", __func__, ha->host_no));		DEBUG11(printk("%s(%ld): entered.\n", __func__, ha->host_no));

	mcp->mb[0] = MBC_TRACE_CONTROL;		mcp->mb[0] = MBC_TRACE_CONTROL;
	mcp->mb[1] = ctrl;		mcp->mb[1] = TC_EFT_ENABLE;
	mcp->out_mb = MBX_1\|MBX_0;
	mcp->in_mb = MBX_1\|MBX_0;
	if (ctrl == TC_ENABLE) {
	mcp->mb[2] = LSW(eft_dma);		mcp->mb[2] = LSW(eft_dma);
	mcp->mb[3] = MSW(eft_dma);		mcp->mb[3] = MSW(eft_dma);
	mcp->mb[4] = LSW(MSD(eft_dma));		mcp->mb[4] = LSW(MSD(eft_dma));
	mcp->mb[5] = MSW(MSD(eft_dma));		mcp->mb[5] = MSW(MSD(eft_dma));
	mcp->mb[6] = buffers;		mcp->mb[6] = buffers;
	mcp->mb[7] = 0;		mcp->mb[7] = TC_AEN_DISABLE;
	mcp->out_mb \|= MBX_7\|MBX_6\|MBX_5\|MBX_4\|MBX_3\|MBX_2;		mcp->out_mb = MBX_7\|MBX_6\|MBX_5\|MBX_4\|MBX_3\|MBX_2\|MBX_1\|MBX_0;
	}		mcp->in_mb = MBX_1\|MBX_0;
	mcp->tov = 30;		mcp->tov = 30;
	mcp->flags = 0;		mcp->flags = 0;
	rval = qla2x00_mailbox_command(ha, mcp);		rval = qla2x00_mailbox_command(ha, mcp);
			if (rval != QLA_SUCCESS) {
			DEBUG2_3_11(printk("%s(%ld): failed=%x mb[0]=%x mb[1]=%x.\n",
			__func__, ha->host_no, rval, mcp->mb[0], mcp->mb[1]));
			} else {
			DEBUG11(printk("%s(%ld): done.\n", __func__, ha->host_no));
			}

			return rval;
			}

			int
			qla2x00_disable_eft_trace(scsi_qla_host_t *ha)
			{
			int rval;
			mbx_cmd_t mc;
			mbx_cmd_t *mcp = &mc;

			if (!IS_FWI2_CAPABLE(ha))
			return QLA_FUNCTION_FAILED;

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

			mcp->mb[0] = MBC_TRACE_CONTROL;
			mcp->mb[1] = TC_EFT_DISABLE;
			mcp->out_mb = MBX_1\|MBX_0;
			mcp->in_mb = MBX_1\|MBX_0;
			mcp->tov = 30;
			mcp->flags = 0;
			rval = qla2x00_mailbox_command(ha, mcp);
	if (rval != QLA_SUCCESS) {		if (rval != QLA_SUCCESS) {
	DEBUG2_3_11(printk("%s(%ld): failed=%x mb[0]=%x mb[1]=%x.\n",		DEBUG2_3_11(printk("%s(%ld): failed=%x mb[0]=%x mb[1]=%x.\n",
	__func__, ha->host_no, rval, mcp->mb[0], mcp->mb[1]));		__func__, ha->host_no, rval, mcp->mb[0], mcp->mb[1]));