diff options
Diffstat (limited to 'drivers/scsi/ipr.h')
-rw-r--r-- | drivers/scsi/ipr.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h index 88f285de97bb..c83ccbb24983 100644 --- a/drivers/scsi/ipr.h +++ b/drivers/scsi/ipr.h | |||
@@ -104,6 +104,9 @@ | |||
104 | #define IPR_IOASC_IOA_WAS_RESET 0x10000001 | 104 | #define IPR_IOASC_IOA_WAS_RESET 0x10000001 |
105 | #define IPR_IOASC_PCI_ACCESS_ERROR 0x10000002 | 105 | #define IPR_IOASC_PCI_ACCESS_ERROR 0x10000002 |
106 | 106 | ||
107 | /* Driver data flags */ | ||
108 | #define IPR_USE_LONG_TRANSOP_TIMEOUT 0x00000001 | ||
109 | |||
107 | #define IPR_DEFAULT_MAX_ERROR_DUMP 984 | 110 | #define IPR_DEFAULT_MAX_ERROR_DUMP 984 |
108 | #define IPR_NUM_LOG_HCAMS 2 | 111 | #define IPR_NUM_LOG_HCAMS 2 |
109 | #define IPR_NUM_CFG_CHG_HCAMS 2 | 112 | #define IPR_NUM_CFG_CHG_HCAMS 2 |
@@ -179,6 +182,7 @@ | |||
179 | #define IPR_SET_SUP_DEVICE_TIMEOUT (2 * 60 * HZ) | 182 | #define IPR_SET_SUP_DEVICE_TIMEOUT (2 * 60 * HZ) |
180 | #define IPR_REQUEST_SENSE_TIMEOUT (10 * HZ) | 183 | #define IPR_REQUEST_SENSE_TIMEOUT (10 * HZ) |
181 | #define IPR_OPERATIONAL_TIMEOUT (5 * 60) | 184 | #define IPR_OPERATIONAL_TIMEOUT (5 * 60) |
185 | #define IPR_LONG_OPERATIONAL_TIMEOUT (12 * 60) | ||
182 | #define IPR_WAIT_FOR_RESET_TIMEOUT (2 * HZ) | 186 | #define IPR_WAIT_FOR_RESET_TIMEOUT (2 * HZ) |
183 | #define IPR_CHECK_FOR_RESET_TIMEOUT (HZ / 10) | 187 | #define IPR_CHECK_FOR_RESET_TIMEOUT (HZ / 10) |
184 | #define IPR_WAIT_FOR_BIST_TIMEOUT (2 * HZ) | 188 | #define IPR_WAIT_FOR_BIST_TIMEOUT (2 * HZ) |
@@ -1119,6 +1123,7 @@ struct ipr_ioa_cfg { | |||
1119 | 1123 | ||
1120 | struct ipr_bus_attributes bus_attr[IPR_MAX_NUM_BUSES]; | 1124 | struct ipr_bus_attributes bus_attr[IPR_MAX_NUM_BUSES]; |
1121 | 1125 | ||
1126 | unsigned int transop_timeout; | ||
1122 | const struct ipr_chip_cfg_t *chip_cfg; | 1127 | const struct ipr_chip_cfg_t *chip_cfg; |
1123 | 1128 | ||
1124 | void __iomem *hdw_dma_regs; /* iomapped PCI memory space */ | 1129 | void __iomem *hdw_dma_regs; /* iomapped PCI memory space */ |