mirror of
https://github.com/torvalds/linux
synced 2024-09-24 13:31:12 +00:00
[SCSI] qla4xxx: Fail initialization if qla4_8xxx_pci_mem_write_2M fails
Since if fw load is failing, running on incomplete fw load would be fatal. Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com> Signed-off-by: Lalit Chandivade <lalit.chandivade@qlogic.com> Signed-off-by: Ravi Anand <ravi.anand@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
parent
fe998527e3
commit
4cd83cbef8
|
@ -1127,7 +1127,7 @@ qla4_8xxx_pinit_from_rom(struct scsi_qla_host *ha, int verbose)
|
||||||
static int
|
static int
|
||||||
qla4_8xxx_load_from_flash(struct scsi_qla_host *ha, uint32_t image_start)
|
qla4_8xxx_load_from_flash(struct scsi_qla_host *ha, uint32_t image_start)
|
||||||
{
|
{
|
||||||
int i;
|
int i, rval = 0;
|
||||||
long size = 0;
|
long size = 0;
|
||||||
long flashaddr, memaddr;
|
long flashaddr, memaddr;
|
||||||
u64 data;
|
u64 data;
|
||||||
|
@ -1143,10 +1143,14 @@ qla4_8xxx_load_from_flash(struct scsi_qla_host *ha, uint32_t image_start)
|
||||||
if ((qla4_8xxx_rom_fast_read(ha, flashaddr, (int *)&low)) ||
|
if ((qla4_8xxx_rom_fast_read(ha, flashaddr, (int *)&low)) ||
|
||||||
(qla4_8xxx_rom_fast_read(ha, flashaddr + 4,
|
(qla4_8xxx_rom_fast_read(ha, flashaddr + 4,
|
||||||
(int *)&high))) {
|
(int *)&high))) {
|
||||||
return -1;
|
rval = -1;
|
||||||
|
goto exit_load_from_flash;
|
||||||
}
|
}
|
||||||
data = ((u64)high << 32) | low ;
|
data = ((u64)high << 32) | low ;
|
||||||
qla4_8xxx_pci_mem_write_2M(ha, memaddr, &data, 8);
|
rval = qla4_8xxx_pci_mem_write_2M(ha, memaddr, &data, 8);
|
||||||
|
if (rval)
|
||||||
|
goto exit_load_from_flash;
|
||||||
|
|
||||||
flashaddr += 8;
|
flashaddr += 8;
|
||||||
memaddr += 8;
|
memaddr += 8;
|
||||||
|
|
||||||
|
@ -1162,7 +1166,8 @@ qla4_8xxx_load_from_flash(struct scsi_qla_host *ha, uint32_t image_start)
|
||||||
qla4_8xxx_wr_32(ha, QLA82XX_ROMUSB_GLB_SW_RESET, 0x80001e);
|
qla4_8xxx_wr_32(ha, QLA82XX_ROMUSB_GLB_SW_RESET, 0x80001e);
|
||||||
read_unlock(&ha->hw_lock);
|
read_unlock(&ha->hw_lock);
|
||||||
|
|
||||||
return 0;
|
exit_load_from_flash:
|
||||||
|
return rval;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int qla4_8xxx_load_fw(struct scsi_qla_host *ha, uint32_t image_start)
|
static int qla4_8xxx_load_fw(struct scsi_qla_host *ha, uint32_t image_start)
|
||||||
|
|
Loading…
Reference in a new issue