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

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

[SCSI] qla2xxx: Add an override option to specify ISP firmware load semantics. 



As it may be useful during debugging to use a specific firmware
image.

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

drivers/scsi/qla2xxx/qla_gbl.h

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ extern int ql2xqfulltracking; 
extern int ql2xiidmaenable;

extern int ql2xmaxqueues;

extern int ql2xmultique_tag;

extern int ql2xfwloadbin;



extern int qla2x00_loop_reset(scsi_qla_host_t *);

extern void qla2x00_abort_all_cmds(scsi_qla_host_t *, int);

drivers/scsi/qla2xxx/qla_init.c

+6 −0
Original line number Diff line number Diff line
@@ -4111,6 +4111,9 @@ qla24xx_load_risc(scsi_qla_host_t *vha, uint32_t *srisc_addr) 
{

	int rval;



	if (ql2xfwloadbin == 1)

		return qla81xx_load_risc(vha, srisc_addr);



	/*

	 * FW Load priority:

	 * 1) Firmware via request-firmware interface (.bin file).
@@ -4128,6 +4131,9 @@ qla81xx_load_risc(scsi_qla_host_t *vha, uint32_t *srisc_addr) 
{

	int rval;



	if (ql2xfwloadbin == 2)

		return qla24xx_load_risc(vha, srisc_addr);



	/*

	 * FW Load priority:

	 * 1) Firmware residing in flash.

drivers/scsi/qla2xxx/qla_os.c

+10 −0
Original line number Diff line number Diff line
@@ -111,6 +111,16 @@ MODULE_PARM_DESC(ql2xmultique_tag, 
		"Enables CPU affinity settings for the driver "

		"Default is 0 for no affinity of request and response IO. "

		"Set it to 1 to turn on the cpu affinity.");



int ql2xfwloadbin;

module_param(ql2xfwloadbin, int, S_IRUGO|S_IRUSR);

MODULE_PARM_DESC(ql2xfwloadbin,

		"Option to specify location from which to load ISP firmware:\n"

		" 2 -- load firmware via the request_firmware() (hotplug)\n"

		"      interface.\n"

		" 1 -- load firmware from flash.\n"

		" 0 -- use default semantics.\n");



/*

 * SCSI host template entry points

 */