1 files changed, 10 insertions, 6 deletions

diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h
index 11b2dac71ab3..4e9701ee599d 100644
--- a/drivers/scsi/ipr.h
+++ b/drivers/scsi/ipr.h
@@ -217,7 +217,8 @@
 #define IPR_CHECK_FOR_RESET_TIMEOUT             (HZ / 10)
 #define IPR_WAIT_FOR_BIST_TIMEOUT               (2 * HZ)
 #define IPR_PCI_RESET_TIMEOUT                   (HZ / 2)
-#define IPR_DUMP_TIMEOUT                        (15 * HZ)
+#define IPR_SIS32_DUMP_TIMEOUT                  (15 * HZ)
+#define IPR_SIS64_DUMP_TIMEOUT                  (40 * HZ)
 #define IPR_DUMP_DELAY_SECONDS                  4
 #define IPR_DUMP_DELAY_TIMEOUT                  (IPR_DUMP_DELAY_SECONDS * HZ)
 
@@ -285,9 +286,12 @@ IPR_PCII_NO_HOST_RRQ | IPR_PCII_IOARRIN_LOST | IPR_PCII_MMIO_ERROR)
 /*
  * Dump literals
  */
-#define IPR_MAX_IOA_DUMP_SIZE                           (4 * 1024 * 1024)
-#define IPR_NUM_SDT_ENTRIES                             511
-#define IPR_MAX_NUM_DUMP_PAGES  ((IPR_MAX_IOA_DUMP_SIZE / PAGE_SIZE) + 1)
+#define IPR_FMT2_MAX_IOA_DUMP_SIZE                      (4 * 1024 * 1024)
+#define IPR_FMT3_MAX_IOA_DUMP_SIZE                      (32 * 1024 * 1024)
+#define IPR_FMT2_NUM_SDT_ENTRIES                        511
+#define IPR_FMT3_NUM_SDT_ENTRIES                        0xFFF
+#define IPR_FMT2_MAX_NUM_DUMP_PAGES     ((IPR_FMT2_MAX_IOA_DUMP_SIZE / PAGE_SIZE) + 1)
+#define IPR_FMT3_MAX_NUM_DUMP_PAGES     ((IPR_FMT3_MAX_IOA_DUMP_SIZE / PAGE_SIZE) + 1)
 
 /*
  * Misc literals
@@ -1164,7 +1168,7 @@ struct ipr_sdt_header {
 
 struct ipr_sdt {
         struct ipr_sdt_header hdr;
-        struct ipr_sdt_entry entry[IPR_NUM_SDT_ENTRIES];
+        struct ipr_sdt_entry entry[IPR_FMT3_NUM_SDT_ENTRIES];
 }__attribute__((packed, aligned (4)));
 
 struct ipr_uc_sdt {
@@ -1608,7 +1612,7 @@ struct ipr_driver_dump {
 struct ipr_ioa_dump {
         struct ipr_dump_entry_header hdr;
         struct ipr_sdt sdt;
-        __be32 *ioa_data[IPR_MAX_NUM_DUMP_PAGES];
+        __be32 **ioa_data;
         u32 reserved;
         u32 next_page_index;
         u32 page_offset;