diff options
author | Wayne Boyer <wayneb@linux.vnet.ibm.com> | 2010-02-19 16:24:21 -0500 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2010-03-03 05:35:02 -0500 |
commit | f72919ec2bbbe1c42cdda7857a96c0c40e1d78aa (patch) | |
tree | f0830554601048c8da0deccb7d33ac745201d982 /drivers/scsi/ipr.h | |
parent | dcbad00e6b403089b1846e788bc1a0c67b2bfd2d (diff) |
[SCSI] ipr: implement shutdown changes and remove obsolete write cache parameter
This patch adds a reboot notifier that will issue a shutdown prepare command
to all adapters. This helps to prevent a problem where the primary adapter can
get shut down before the secondary adapter and cause the secondary adapter to
fail over and log and error.
This patch also removes the "enable_cache" paramater as it is obsolete. Write
cache for an adapter is now controlled from the iprconfig utility.
Signed-off-by: Wayne Boyer <wayneb@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/ipr.h')
-rw-r--r-- | drivers/scsi/ipr.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h index 4f2f1d2e9875..36736b512846 100644 --- a/drivers/scsi/ipr.h +++ b/drivers/scsi/ipr.h | |||
@@ -136,7 +136,7 @@ | |||
136 | 136 | ||
137 | /* We need resources for HCAMS, IOA reset, IOA bringdown, and ERP */ | 137 | /* We need resources for HCAMS, IOA reset, IOA bringdown, and ERP */ |
138 | #define IPR_NUM_INTERNAL_CMD_BLKS (IPR_NUM_HCAMS + \ | 138 | #define IPR_NUM_INTERNAL_CMD_BLKS (IPR_NUM_HCAMS + \ |
139 | ((IPR_NUM_RESET_RELOAD_RETRIES + 1) * 2) + 3) | 139 | ((IPR_NUM_RESET_RELOAD_RETRIES + 1) * 2) + 4) |
140 | 140 | ||
141 | #define IPR_MAX_COMMANDS IPR_NUM_BASE_CMD_BLKS | 141 | #define IPR_MAX_COMMANDS IPR_NUM_BASE_CMD_BLKS |
142 | #define IPR_NUM_CMD_BLKS (IPR_NUM_BASE_CMD_BLKS + \ | 142 | #define IPR_NUM_CMD_BLKS (IPR_NUM_BASE_CMD_BLKS + \ |
@@ -1284,13 +1284,6 @@ enum ipr_sdt_state { | |||
1284 | DUMP_OBTAINED | 1284 | DUMP_OBTAINED |
1285 | }; | 1285 | }; |
1286 | 1286 | ||
1287 | enum ipr_cache_state { | ||
1288 | CACHE_NONE, | ||
1289 | CACHE_DISABLED, | ||
1290 | CACHE_ENABLED, | ||
1291 | CACHE_INVALID | ||
1292 | }; | ||
1293 | |||
1294 | /* Per-controller data */ | 1287 | /* Per-controller data */ |
1295 | struct ipr_ioa_cfg { | 1288 | struct ipr_ioa_cfg { |
1296 | char eye_catcher[8]; | 1289 | char eye_catcher[8]; |
@@ -1321,7 +1314,6 @@ struct ipr_ioa_cfg { | |||
1321 | unsigned long *array_ids; | 1314 | unsigned long *array_ids; |
1322 | unsigned long *vset_ids; | 1315 | unsigned long *vset_ids; |
1323 | 1316 | ||
1324 | enum ipr_cache_state cache_state; | ||
1325 | u16 type; /* CCIN of the card */ | 1317 | u16 type; /* CCIN of the card */ |
1326 | 1318 | ||
1327 | u8 log_level; | 1319 | u8 log_level; |