diff options
Diffstat (limited to 'drivers/scsi/ipr.h')
-rw-r--r-- | drivers/scsi/ipr.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h index 79a3ae4fb2c7..4b63dd6b1c81 100644 --- a/drivers/scsi/ipr.h +++ b/drivers/scsi/ipr.h | |||
@@ -37,8 +37,8 @@ | |||
37 | /* | 37 | /* |
38 | * Literals | 38 | * Literals |
39 | */ | 39 | */ |
40 | #define IPR_DRIVER_VERSION "2.4.2" | 40 | #define IPR_DRIVER_VERSION "2.4.3" |
41 | #define IPR_DRIVER_DATE "(January 21, 2009)" | 41 | #define IPR_DRIVER_DATE "(June 10, 2009)" |
42 | 42 | ||
43 | /* | 43 | /* |
44 | * IPR_MAX_CMD_PER_LUN: This defines the maximum number of outstanding | 44 | * IPR_MAX_CMD_PER_LUN: This defines the maximum number of outstanding |
@@ -1025,6 +1025,9 @@ struct ipr_chip_cfg_t { | |||
1025 | struct ipr_chip_t { | 1025 | struct ipr_chip_t { |
1026 | u16 vendor; | 1026 | u16 vendor; |
1027 | u16 device; | 1027 | u16 device; |
1028 | u16 intr_type; | ||
1029 | #define IPR_USE_LSI 0x00 | ||
1030 | #define IPR_USE_MSI 0x01 | ||
1028 | const struct ipr_chip_cfg_t *cfg; | 1031 | const struct ipr_chip_cfg_t *cfg; |
1029 | }; | 1032 | }; |
1030 | 1033 | ||
@@ -1094,6 +1097,7 @@ struct ipr_ioa_cfg { | |||
1094 | u8 needs_hard_reset:1; | 1097 | u8 needs_hard_reset:1; |
1095 | u8 dual_raid:1; | 1098 | u8 dual_raid:1; |
1096 | u8 needs_warm_reset:1; | 1099 | u8 needs_warm_reset:1; |
1100 | u8 msi_received:1; | ||
1097 | 1101 | ||
1098 | u8 revid; | 1102 | u8 revid; |
1099 | 1103 | ||
@@ -1159,6 +1163,7 @@ struct ipr_ioa_cfg { | |||
1159 | 1163 | ||
1160 | unsigned int transop_timeout; | 1164 | unsigned int transop_timeout; |
1161 | const struct ipr_chip_cfg_t *chip_cfg; | 1165 | const struct ipr_chip_cfg_t *chip_cfg; |
1166 | const struct ipr_chip_t *ipr_chip; | ||
1162 | 1167 | ||
1163 | void __iomem *hdw_dma_regs; /* iomapped PCI memory space */ | 1168 | void __iomem *hdw_dma_regs; /* iomapped PCI memory space */ |
1164 | unsigned long hdw_dma_regs_pci; /* raw PCI memory space */ | 1169 | unsigned long hdw_dma_regs_pci; /* raw PCI memory space */ |
@@ -1179,6 +1184,7 @@ struct ipr_ioa_cfg { | |||
1179 | struct work_struct work_q; | 1184 | struct work_struct work_q; |
1180 | 1185 | ||
1181 | wait_queue_head_t reset_wait_q; | 1186 | wait_queue_head_t reset_wait_q; |
1187 | wait_queue_head_t msi_wait_q; | ||
1182 | 1188 | ||
1183 | struct ipr_dump *dump; | 1189 | struct ipr_dump *dump; |
1184 | enum ipr_sdt_state sdt_state; | 1190 | enum ipr_sdt_state sdt_state; |