diff options
author | Christof Schmitt <christof.schmitt@de.ibm.com> | 2007-11-05 06:37:45 -0500 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-01-11 19:22:40 -0500 |
commit | 18edcdbdb2911baa5aaeb0ed781e3424cbf98d64 (patch) | |
tree | f90d7616b99859e583e67e21ad5842c384aa47ce /drivers/s390/scsi | |
parent | 345bfea5e424f086b654294eddcfa3f8ff92b47f (diff) |
[SCSI] zfcp: Specify waiting times in ERP in seconds
It is not necessary to use jiffies or milliseconds to specify
waiting times that last a couple of seconds.
Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Swen Schillig <swen@vnet.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/s390/scsi')
-rw-r--r-- | drivers/s390/scsi/zfcp_def.h | 4 | ||||
-rw-r--r-- | drivers/s390/scsi/zfcp_erp.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h index e268f79bdbd2..3d2d2dc0d6f8 100644 --- a/drivers/s390/scsi/zfcp_def.h +++ b/drivers/s390/scsi/zfcp_def.h | |||
@@ -118,7 +118,7 @@ zfcp_address_to_sg(void *address, struct scatterlist *list, unsigned int size) | |||
118 | 118 | ||
119 | #define ZFCP_SBAL_TIMEOUT (5*HZ) | 119 | #define ZFCP_SBAL_TIMEOUT (5*HZ) |
120 | 120 | ||
121 | #define ZFCP_TYPE2_RECOVERY_TIME (8*HZ) | 121 | #define ZFCP_TYPE2_RECOVERY_TIME 8 /* seconds */ |
122 | 122 | ||
123 | /* queue polling (values in microseconds) */ | 123 | /* queue polling (values in microseconds) */ |
124 | #define ZFCP_MAX_INPUT_THRESHOLD 5000 /* FIXME: tune */ | 124 | #define ZFCP_MAX_INPUT_THRESHOLD 5000 /* FIXME: tune */ |
@@ -139,7 +139,7 @@ zfcp_address_to_sg(void *address, struct scatterlist *list, unsigned int size) | |||
139 | #define ZFCP_STATUS_READS_RECOM FSF_STATUS_READS_RECOM | 139 | #define ZFCP_STATUS_READS_RECOM FSF_STATUS_READS_RECOM |
140 | 140 | ||
141 | /* Do 1st retry in 1 second, then double the timeout for each following retry */ | 141 | /* Do 1st retry in 1 second, then double the timeout for each following retry */ |
142 | #define ZFCP_EXCHANGE_CONFIG_DATA_FIRST_SLEEP 100 | 142 | #define ZFCP_EXCHANGE_CONFIG_DATA_FIRST_SLEEP 1 |
143 | #define ZFCP_EXCHANGE_CONFIG_DATA_RETRIES 7 | 143 | #define ZFCP_EXCHANGE_CONFIG_DATA_RETRIES 7 |
144 | 144 | ||
145 | /* timeout value for "default timer" for fsf requests */ | 145 | /* timeout value for "default timer" for fsf requests */ |
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c index 07fa824d179f..9c6ea9962cd2 100644 --- a/drivers/s390/scsi/zfcp_erp.c +++ b/drivers/s390/scsi/zfcp_erp.c | |||
@@ -131,7 +131,7 @@ static void zfcp_close_qdio(struct zfcp_adapter *adapter) | |||
131 | debug_text_event(adapter->erp_dbf, 3, "qdio_down2a"); | 131 | debug_text_event(adapter->erp_dbf, 3, "qdio_down2a"); |
132 | while (qdio_shutdown(adapter->ccw_device, | 132 | while (qdio_shutdown(adapter->ccw_device, |
133 | QDIO_FLAG_CLEANUP_USING_CLEAR) == -EINPROGRESS) | 133 | QDIO_FLAG_CLEANUP_USING_CLEAR) == -EINPROGRESS) |
134 | msleep(1000); | 134 | ssleep(1); |
135 | debug_text_event(adapter->erp_dbf, 3, "qdio_down2b"); | 135 | debug_text_event(adapter->erp_dbf, 3, "qdio_down2b"); |
136 | 136 | ||
137 | /* cleanup used outbound sbals */ | 137 | /* cleanup used outbound sbals */ |
@@ -1900,7 +1900,7 @@ zfcp_erp_adapter_strategy(struct zfcp_erp_action *erp_action) | |||
1900 | ZFCP_LOG_INFO("Waiting to allow the adapter %s " | 1900 | ZFCP_LOG_INFO("Waiting to allow the adapter %s " |
1901 | "to recover itself\n", | 1901 | "to recover itself\n", |
1902 | zfcp_get_busid_by_adapter(adapter)); | 1902 | zfcp_get_busid_by_adapter(adapter)); |
1903 | msleep(jiffies_to_msecs(ZFCP_TYPE2_RECOVERY_TIME)); | 1903 | ssleep(ZFCP_TYPE2_RECOVERY_TIME); |
1904 | } | 1904 | } |
1905 | 1905 | ||
1906 | return retval; | 1906 | return retval; |
@@ -2080,7 +2080,7 @@ zfcp_erp_adapter_strategy_open_qdio(struct zfcp_erp_action *erp_action) | |||
2080 | debug_text_event(adapter->erp_dbf, 3, "qdio_down1a"); | 2080 | debug_text_event(adapter->erp_dbf, 3, "qdio_down1a"); |
2081 | while (qdio_shutdown(adapter->ccw_device, | 2081 | while (qdio_shutdown(adapter->ccw_device, |
2082 | QDIO_FLAG_CLEANUP_USING_CLEAR) == -EINPROGRESS) | 2082 | QDIO_FLAG_CLEANUP_USING_CLEAR) == -EINPROGRESS) |
2083 | msleep(1000); | 2083 | ssleep(1); |
2084 | debug_text_event(adapter->erp_dbf, 3, "qdio_down1b"); | 2084 | debug_text_event(adapter->erp_dbf, 3, "qdio_down1b"); |
2085 | 2085 | ||
2086 | failed_qdio_establish: | 2086 | failed_qdio_establish: |
@@ -2165,7 +2165,7 @@ zfcp_erp_adapter_strategy_open_fsf_xconfig(struct zfcp_erp_action *erp_action) | |||
2165 | ZFCP_LOG_DEBUG("host connection still initialising... " | 2165 | ZFCP_LOG_DEBUG("host connection still initialising... " |
2166 | "waiting and retrying...\n"); | 2166 | "waiting and retrying...\n"); |
2167 | /* sleep a little bit before retry */ | 2167 | /* sleep a little bit before retry */ |
2168 | msleep(jiffies_to_msecs(sleep)); | 2168 | ssleep(sleep); |
2169 | sleep *= 2; | 2169 | sleep *= 2; |
2170 | } | 2170 | } |
2171 | 2171 | ||