1 files changed, 27 insertions, 4 deletions

diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h
index 4c267b5e0b9..9ecd2259eb3 100644
--- a/drivers/scsi/ipr.h
+++ b/drivers/scsi/ipr.h
@@ -244,6 +244,7 @@
 #define IPR_RUNTIME_RESET                               0x40000000
 
 #define IPR_IPL_INIT_MIN_STAGE_TIME                     5
+#define IPR_IPL_INIT_DEFAULT_STAGE_TIME                 15
 #define IPR_IPL_INIT_STAGE_UNKNOWN                      0x0
 #define IPR_IPL_INIT_STAGE_TRANSOP                      0xB0000000
 #define IPR_IPL_INIT_STAGE_MASK                         0xff000000
@@ -613,7 +614,7 @@ struct ipr_auto_sense {
         __be32 data[SCSI_SENSE_BUFFERSIZE/sizeof(__be32)];
 };
 
-struct ipr_ioasa {
+struct ipr_ioasa_hdr {
         __be32 ioasc;
 #define IPR_IOASC_SENSE_KEY(ioasc) ((ioasc) >> 24)
 #define IPR_IOASC_SENSE_CODE(ioasc) (((ioasc) & 0x00ff0000) >> 16)
@@ -645,6 +646,25 @@ struct ipr_ioasa {
 #define IPR_FIELD_POINTER_VALID         (0x80000000 >> 8)
 #define IPR_FIELD_POINTER_MASK          0x0000ffff
 
+}__attribute__((packed, aligned (4)));
+
+struct ipr_ioasa {
+        struct ipr_ioasa_hdr hdr;
+
+        union {
+                struct ipr_ioasa_vset vset;
+                struct ipr_ioasa_af_dasd dasd;
+                struct ipr_ioasa_gpdd gpdd;
+                struct ipr_ioasa_gata gata;
+        } u;
+
+        struct ipr_auto_sense auto_sense;
+}__attribute__((packed, aligned (4)));
+
+struct ipr_ioasa64 {
+        struct ipr_ioasa_hdr hdr;
+        u8 fd_res_path[8];
+
         union {
                 struct ipr_ioasa_vset vset;
                 struct ipr_ioasa_af_dasd dasd;
@@ -804,7 +824,7 @@ struct ipr_hostrcb_array_data_entry_enhanced {
 }__attribute__((packed, aligned (4)));
 
 struct ipr_hostrcb_type_ff_error {
-        __be32 ioa_data[502];
+        __be32 ioa_data[758];
 }__attribute__((packed, aligned (4)));
 
 struct ipr_hostrcb_type_01_error {
@@ -1181,7 +1201,7 @@ struct ipr_resource_entry {
         u8 flags;
         __be16 res_flags;
 
-        __be32 type;
+        u8 type;
 
         u8 qmodel;
         struct ipr_std_inq_data std_inq_data;
@@ -1464,7 +1484,10 @@ struct ipr_cmnd {
                 struct ipr_ioadl64_desc ioadl64[IPR_NUM_IOADL_ENTRIES];
                 struct ipr_ata64_ioadl ata_ioadl;
         } i;
-        struct ipr_ioasa ioasa;
+        union {
+                struct ipr_ioasa ioasa;
+                struct ipr_ioasa64 ioasa64;
+        } s;
         struct list_head queue;
         struct scsi_cmnd *scsi_cmd;
         struct ata_queued_cmd *qc;