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

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

[SCSI] qla2xxx: Stop firmware execution at unintialization time. 



On ISP24xx parts, stop execution of firmware during ISP
tear-down.

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

drivers/scsi/qla2xxx/qla_def.h

+1 −0
Original line number Diff line number Diff line
@@ -631,6 +631,7 @@ typedef struct { 
#define MBC_WRITE_RAM_WORD_EXTENDED	0xd	/* Write RAM word extended */

#define MBC_READ_RAM_EXTENDED		0xf	/* Read RAM extended. */

#define MBC_IOCB_COMMAND		0x12	/* Execute IOCB command. */

#define MBC_STOP_FIRMWARE		0x14	/* Stop firmware. */

#define MBC_ABORT_COMMAND		0x15	/* Abort IOCB command. */

#define MBC_ABORT_DEVICE		0x16	/* Abort device (ID/LUN). */

#define MBC_ABORT_TARGET		0x17	/* Abort target (ID). */

drivers/scsi/qla2xxx/qla_gbl.h

+3 −0
Original line number Diff line number Diff line
@@ -213,6 +213,9 @@ qla2x00_get_serdes_params(scsi_qla_host_t *, uint16_t *, uint16_t *, 
extern int

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



extern int

qla2x00_stop_firmware(scsi_qla_host_t *);



/*

 * Global Function Prototypes in qla_isr.c source file.

 */

drivers/scsi/qla2xxx/qla_mbx.c

+29 −0
Original line number Diff line number Diff line
@@ -2427,3 +2427,32 @@ qla2x00_set_serdes_params(scsi_qla_host_t *ha, uint16_t sw_em_1g, 


	return rval;

}



int

qla2x00_stop_firmware(scsi_qla_host_t *ha)

{

	int rval;

	mbx_cmd_t mc;

	mbx_cmd_t *mcp = &mc;



	if (!IS_QLA24XX(ha) && !IS_QLA25XX(ha))

		return QLA_FUNCTION_FAILED;



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



	mcp->mb[0] = MBC_STOP_FIRMWARE;

	mcp->out_mb = MBX_0;

	mcp->in_mb = MBX_0;

	mcp->tov = 5;

	mcp->flags = 0;

	rval = qla2x00_mailbox_command(ha, mcp);



	if (rval != QLA_SUCCESS) {

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

		    ha->host_no, rval));

	} else {

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

	}



	return rval;

}

drivers/scsi/qla2xxx/qla_os.c

+8 −6
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ module_param(ql2xloginretrycount, int, S_IRUGO|S_IRUSR); 
MODULE_PARM_DESC(ql2xloginretrycount,

		"Specify an alternate value for the NVRAM login retry count.");



int ql2xfwloadbin;

int ql2xfwloadbin=1;

module_param(ql2xfwloadbin, int, S_IRUGO|S_IRUSR);

MODULE_PARM_DESC(ql2xfwloadbin,

		"Load ISP2xxx firmware image via hotplug.");
@@ -1626,10 +1626,6 @@ qla2x00_free_device(scsi_qla_host_t *ha) 
	if (!IS_QLA2100(ha) && !IS_QLA2200(ha))

		qla2x00_cancel_io_descriptors(ha);



	/* turn-off interrupts on the card */

	if (ha->interrupts_on)

		ha->isp_ops.disable_intrs(ha);



	/* Disable timer */

	if (ha->timer_active)

		qla2x00_stop_timer(ha);
@@ -1649,8 +1645,14 @@ qla2x00_free_device(scsi_qla_host_t *ha) 
		}

	}



	qla2x00_mem_free(ha);

	/* Stop currently executing firmware. */

	qla2x00_stop_firmware(ha);



	/* turn-off interrupts on the card */

	if (ha->interrupts_on)

		ha->isp_ops.disable_intrs(ha);



	qla2x00_mem_free(ha);



	ha->flags.online = 0;