Merge branch 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek...

[pandora-kernel.git] / drivers / scsi / ipr.h

diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h
index 13f425f..f93f863 100644 (file)
--- a/drivers/scsi/ipr.h
+++ b/drivers/scsi/ipr.h
@@ -38,8 +38,8 @@
 /*
  * Literals
  */
-#define IPR_DRIVER_VERSION "2.5.1"
-#define IPR_DRIVER_DATE "(August 10, 2010)"
+#define IPR_DRIVER_VERSION "2.5.2"
+#define IPR_DRIVER_DATE "(April 27, 2011)"
 
 /*
  * IPR_MAX_CMD_PER_LUN: This defines the maximum number of outstanding
@@ -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
@@ -474,7 +478,7 @@ struct ipr_cmd_pkt {
 
        u8 flags_lo;
 #define IPR_FLAGS_LO_ALIGNED_BFR               0x20
-#define IPR_FLAGS_LO_DELAY_AFTER_RST   0x10
+#define IPR_FLAGS_LO_DELAY_AFTER_RST           0x10
 #define IPR_FLAGS_LO_UNTAGGED_TASK             0x00
 #define IPR_FLAGS_LO_SIMPLE_TASK               0x02
 #define IPR_FLAGS_LO_ORDERED_TASK              0x04
@@ -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;