[SCSI] ipr: Better handle failure of adapter bringup commands

Some new ipr adapters do not support some of the initialization
commands currently sent to it from the driver. Handle these
commands failing and continue on with the adapter initialization.

Signed-off-by: Brian King <brking@us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 2 insertions, 0 deletions

diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h
index 2f18284b6004..637b891eb50f 100644
--- a/drivers/scsi/ipr.h
+++ b/drivers/scsi/ipr.h
@@ -84,6 +84,7 @@
 #define IPR_IOASC_HW_DEV_BUS_STATUS                     0x04448500
 #define IPR_IOASC_IOASC_MASK                    0xFFFFFF00
 #define IPR_IOASC_SCSI_STATUS_MASK              0x000000FF
+#define IPR_IOASC_IR_INVALID_REQ_TYPE_OR_PKT    0x05240000
 #define IPR_IOASC_IR_RESOURCE_HANDLE            0x05250000
 #define IPR_IOASC_IR_NO_CMDS_TO_2ND_IOA         0x05258100
 #define IPR_IOASA_IR_DUAL_IOA_DISABLED          0x052C8000
@@ -1031,6 +1032,7 @@ struct ipr_cmnd {
         struct timer_list timer;
         void (*done) (struct ipr_cmnd *);
         int (*job_step) (struct ipr_cmnd *);
+        int (*job_step_failed) (struct ipr_cmnd *);
         u16 cmd_index;
         u8 sense_buffer[SCSI_SENSE_BUFFERSIZE];
         dma_addr_t sense_buffer_dma;