Commit b5a340dd authored by Joe Carnuccio's avatar Joe Carnuccio Committed by Christoph Hellwig
Browse files

qla2xxx: Add diagnostic port functionality. 



Add support for the D-port (diagnostic port) fabric switch feature.

(Fabric Switch initiates loopback style port testing)

Signed-off-by: default avatarJoe Carnuccio <joe.carnuccio@qlogic.com>
Signed-off-by: default avatarSaurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 7c9c4766

drivers/scsi/qla2xxx/qla_attr.c

+3 −3
Original line number Diff line number Diff line
@@ -1440,7 +1440,7 @@ qla2x00_fw_state_show(struct device *dev, struct device_attribute *attr, 
{

	scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));

	int rval = QLA_FUNCTION_FAILED;

	uint16_t state[5];

	uint16_t state[6];

	uint32_t pstate;



	if (IS_QLAFX00(vha->hw)) {
@@ -1456,8 +1456,8 @@ qla2x00_fw_state_show(struct device *dev, struct device_attribute *attr, 
	if (rval != QLA_SUCCESS)

		memset(state, -1, sizeof(state));



	return scnprintf(buf, PAGE_SIZE, "0x%x 0x%x 0x%x 0x%x 0x%x\n", state[0],

	    state[1], state[2], state[3], state[4]);

	return scnprintf(buf, PAGE_SIZE, "0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n",

	    state[0], state[1], state[2], state[3], state[4], state[5]);

}



static ssize_t

drivers/scsi/qla2xxx/qla_dbg.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
 * |                              |                    | 0x303a		|

 * | DPC Thread                   |       0x4023       | 0x4002,0x4013  |

 * | Async Events                 |       0x5087       | 0x502b-0x502f  |

 * |                              |                    | 0x5047,0x5052  |

 * |                              |                    | 0x5047		|

 * |                              |                    | 0x5084,0x5075	|

 * |                              |                    | 0x503d,0x5044  |

 * |                              |                    | 0x507b,0x505f	|

drivers/scsi/qla2xxx/qla_def.h

+2 −0
Original line number Diff line number Diff line
@@ -803,6 +803,7 @@ struct mbx_cmd_32 { 
#define MBA_FW_RESTART_CMPLT	0x8060	/* Firmware restart complete */

#define MBA_INIT_REQUIRED	0x8061	/* Initialization required */

#define MBA_SHUTDOWN_REQUESTED	0x8062	/* Shutdown Requested */

#define MBA_DPORT_DIAGNOSTICS	0x8080	/* D-port Diagnostics */

#define MBA_FW_INIT_FAILURE	0x8401	/* Firmware initialization failure */

#define MBA_MIRROR_LUN_CHANGE	0x8402	/* Mirror LUN State Change

					   Notification */
@@ -948,6 +949,7 @@ struct mbx_cmd_32 { 
#define MBC_WRITE_SFP			0x30	/* Write SFP Data. */

#define MBC_READ_SFP			0x31	/* Read SFP Data. */

#define MBC_SET_TIMEOUT_PARAMS		0x32	/* Set FW timeouts. */

#define MBC_DPORT_DIAGNOSTICS		0x47	/* D-Port Diagnostics */

#define MBC_MID_INITIALIZE_FIRMWARE	0x48	/* MID Initialize firmware. */

#define MBC_MID_GET_VP_DATABASE		0x49	/* MID Get VP Database. */

#define MBC_MID_GET_VP_ENTRY		0x4a	/* MID Get VP Entry. */

drivers/scsi/qla2xxx/qla_fw.h

+1 −1
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ struct init_cb_24xx { 
	 * BIT 4  = Enable Target Mode

	 * BIT 5  = Disable Initiator Mode

	 * BIT 6  = Acquire FA-WWN

	 * BIT 7  = Reserved

	 * BIT 7  = Enable D-port Diagnostics

	 *

	 * BIT 8  = Reserved

	 * BIT 9  = Non Participating LIP

drivers/scsi/qla2xxx/qla_init.c

+3 −3
Original line number Diff line number Diff line
@@ -2224,7 +2224,7 @@ qla2x00_fw_ready(scsi_qla_host_t *vha) 
	unsigned long	wtime, mtime, cs84xx_time;

	uint16_t	min_wait;	/* Minimum wait time if loop is down */

	uint16_t	wait_time;	/* Wait time if loop is coming ready */

	uint16_t	state[5];

	uint16_t	state[6];

	struct qla_hw_data *ha = vha->hw;



	if (IS_QLAFX00(vha->hw))
@@ -2329,8 +2329,8 @@ qla2x00_fw_ready(scsi_qla_host_t *vha) 
	} while (1);



	ql_dbg(ql_dbg_taskm, vha, 0x803a,

	    "fw_state=%x (%x, %x, %x, %x) " "curr time=%lx.\n", state[0],

	    state[1], state[2], state[3], state[4], jiffies);

	    "fw_state=%x (%x, %x, %x, %x %x) curr time=%lx.\n", state[0],

	    state[1], state[2], state[3], state[4], state[5], jiffies);



	if (rval && !(vha->device_flags & DFLG_NO_CABLE)) {

		ql_log(ql_log_warn, vha, 0x803b,

CRA Git | Maintained and supported by SUSTech CRA and CCSE