diff options
Diffstat (limited to 'drivers/scsi/hpsa.h')
| -rw-r--r-- | drivers/scsi/hpsa.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h index 19586e189f0..621a1530054 100644 --- a/drivers/scsi/hpsa.h +++ b/drivers/scsi/hpsa.h | |||
| @@ -72,11 +72,12 @@ struct ctlr_info { | |||
| 72 | unsigned int intr[4]; | 72 | unsigned int intr[4]; |
| 73 | unsigned int msix_vector; | 73 | unsigned int msix_vector; |
| 74 | unsigned int msi_vector; | 74 | unsigned int msi_vector; |
| 75 | int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */ | ||
| 75 | struct access_method access; | 76 | struct access_method access; |
| 76 | 77 | ||
| 77 | /* queue and queue Info */ | 78 | /* queue and queue Info */ |
| 78 | struct hlist_head reqQ; | 79 | struct list_head reqQ; |
| 79 | struct hlist_head cmpQ; | 80 | struct list_head cmpQ; |
| 80 | unsigned int Qdepth; | 81 | unsigned int Qdepth; |
| 81 | unsigned int maxQsinceinit; | 82 | unsigned int maxQsinceinit; |
| 82 | unsigned int maxSG; | 83 | unsigned int maxSG; |
| @@ -154,12 +155,16 @@ struct ctlr_info { | |||
| 154 | * HPSA_BOARD_READY_ITERATIONS are derived from those. | 155 | * HPSA_BOARD_READY_ITERATIONS are derived from those. |
| 155 | */ | 156 | */ |
| 156 | #define HPSA_BOARD_READY_WAIT_SECS (120) | 157 | #define HPSA_BOARD_READY_WAIT_SECS (120) |
| 158 | #define HPSA_BOARD_NOT_READY_WAIT_SECS (10) | ||
| 157 | #define HPSA_BOARD_READY_POLL_INTERVAL_MSECS (100) | 159 | #define HPSA_BOARD_READY_POLL_INTERVAL_MSECS (100) |
| 158 | #define HPSA_BOARD_READY_POLL_INTERVAL \ | 160 | #define HPSA_BOARD_READY_POLL_INTERVAL \ |
| 159 | ((HPSA_BOARD_READY_POLL_INTERVAL_MSECS * HZ) / 1000) | 161 | ((HPSA_BOARD_READY_POLL_INTERVAL_MSECS * HZ) / 1000) |
| 160 | #define HPSA_BOARD_READY_ITERATIONS \ | 162 | #define HPSA_BOARD_READY_ITERATIONS \ |
| 161 | ((HPSA_BOARD_READY_WAIT_SECS * 1000) / \ | 163 | ((HPSA_BOARD_READY_WAIT_SECS * 1000) / \ |
| 162 | HPSA_BOARD_READY_POLL_INTERVAL_MSECS) | 164 | HPSA_BOARD_READY_POLL_INTERVAL_MSECS) |
| 165 | #define HPSA_BOARD_NOT_READY_ITERATIONS \ | ||
| 166 | ((HPSA_BOARD_NOT_READY_WAIT_SECS * 1000) / \ | ||
| 167 | HPSA_BOARD_READY_POLL_INTERVAL_MSECS) | ||
| 163 | #define HPSA_POST_RESET_PAUSE_MSECS (3000) | 168 | #define HPSA_POST_RESET_PAUSE_MSECS (3000) |
| 164 | #define HPSA_POST_RESET_NOOP_RETRIES (12) | 169 | #define HPSA_POST_RESET_NOOP_RETRIES (12) |
| 165 | 170 | ||