aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/qla2xxx/qla_init.c
diff options
context:
space:
mode:
authorAndrew Vasquez <andrew.vasquez@qlogic.com>2009-04-07 01:33:49 -0400
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2009-05-20 18:21:11 -0400
commite337d9070e5821e7c8e5973679bdd34376263bd1 (patch)
tree6c0ac2b24d6b8eca0fadc632f9f70c90cdcf4c31 /drivers/scsi/qla2xxx/qla_init.c
parentb469a7cbe9bf68939c90f4ac6bc2bb99e47d7229 (diff)
[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: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_init.c')
-rw-r--r--drivers/scsi/qla2xxx/qla_init.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 138ae88e9e4d..4952fc19aa20 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -4111,6 +4111,9 @@ qla24xx_load_risc(scsi_qla_host_t *vha, uint32_t *srisc_addr)
4111{ 4111{
4112 int rval; 4112 int rval;
4113 4113
4114 if (ql2xfwloadbin == 1)
4115 return qla81xx_load_risc(vha, srisc_addr);
4116
4114 /* 4117 /*
4115 * FW Load priority: 4118 * FW Load priority:
4116 * 1) Firmware via request-firmware interface (.bin file). 4119 * 1) Firmware via request-firmware interface (.bin file).
@@ -4128,6 +4131,9 @@ qla81xx_load_risc(scsi_qla_host_t *vha, uint32_t *srisc_addr)
4128{ 4131{
4129 int rval; 4132 int rval;
4130 4133
4134 if (ql2xfwloadbin == 2)
4135 return qla24xx_load_risc(vha, srisc_addr);
4136
4131 /* 4137 /*
4132 * FW Load priority: 4138 * FW Load priority:
4133 * 1) Firmware residing in flash. 4139 * 1) Firmware residing in flash.