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

Commit 46801ba6 authored by Vikas Chaudhary's avatar Vikas Chaudhary Committed by James Bottomley
Browse files

[SCSI] qla4xxx: Proper detection of firmware abort error code for ISP82xx 



Signed-off-by: default avatarVikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent badc5b99

drivers/scsi/qla4xxx/ql4_def.h

+0 −2
Original line number Diff line number Diff line
@@ -150,8 +150,6 @@ 
#define QL4_SESS_RECOVERY_TMO		120	/* iSCSI session */

						/* recovery timeout */



#define MSB(x) ((uint8_t)((uint16_t)(x) >> 8))

#define LSW(x) ((uint16_t)(x))

#define LSDW(x) ((u32)((u64)(x)))

#define MSDW(x) ((u32)((((u64)(x)) >> 16) >> 16))

drivers/scsi/qla4xxx/ql4_nx.h

+1 −0
Original line number Diff line number Diff line
@@ -623,6 +623,7 @@ struct crb_addr_pair { 


#define ADDR_ERROR	((unsigned long) 0xffffffff)

#define MAX_CTL_CHECK	1000

#define QLA82XX_FWERROR_CODE(code)	((code >> 8) & 0x1fffff)



/***************************************************************************

 *		PCI related defines.

drivers/scsi/qla4xxx/ql4_os.c

+1 −1
Original line number Diff line number Diff line
@@ -2165,7 +2165,7 @@ void qla4_8xxx_watchdog(struct scsi_qla_host *ha) 
				halt_status = qla4_8xxx_rd_32(ha,

						QLA82XX_PEG_HALT_STATUS1);



				if (LSW(MSB(halt_status)) == 0x67)

				if (QLA82XX_FWERROR_CODE(halt_status) == 0x67)

					ql4_printk(KERN_ERR, ha, "%s:"

						   " Firmware aborted with"

						   " error code 0x00006700."