Commit 18edcdbd authored by Christof Schmitt's avatar Christof Schmitt Committed by James Bottomley
Browse files

[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: default avatarChristof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarSwen Schillig <swen@vnet.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 345bfea5

drivers/s390/scsi/zfcp_def.h

+2 −2
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ zfcp_address_to_sg(void *address, struct scatterlist *list, unsigned int size) 


#define ZFCP_SBAL_TIMEOUT               (5*HZ)



#define ZFCP_TYPE2_RECOVERY_TIME        (8*HZ)

#define ZFCP_TYPE2_RECOVERY_TIME        8	/* seconds */



/* queue polling (values in microseconds) */

#define ZFCP_MAX_INPUT_THRESHOLD 	5000	/* FIXME: tune */
@@ -139,7 +139,7 @@ zfcp_address_to_sg(void *address, struct scatterlist *list, unsigned int size) 
#define ZFCP_STATUS_READS_RECOM		        FSF_STATUS_READS_RECOM



/* Do 1st retry in 1 second, then double the timeout for each following retry */

#define ZFCP_EXCHANGE_CONFIG_DATA_FIRST_SLEEP	100

#define ZFCP_EXCHANGE_CONFIG_DATA_FIRST_SLEEP	1

#define ZFCP_EXCHANGE_CONFIG_DATA_RETRIES	7



/* timeout value for "default timer" for fsf requests */

drivers/s390/scsi/zfcp_erp.c

+4 −4
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static void zfcp_close_qdio(struct zfcp_adapter *adapter) 
	debug_text_event(adapter->erp_dbf, 3, "qdio_down2a");

	while (qdio_shutdown(adapter->ccw_device,

			     QDIO_FLAG_CLEANUP_USING_CLEAR) == -EINPROGRESS)

		msleep(1000);

		ssleep(1);

	debug_text_event(adapter->erp_dbf, 3, "qdio_down2b");



	/* cleanup used outbound sbals */
@@ -1900,7 +1900,7 @@ zfcp_erp_adapter_strategy(struct zfcp_erp_action *erp_action) 
		ZFCP_LOG_INFO("Waiting to allow the adapter %s "

			      "to recover itself\n",

			      zfcp_get_busid_by_adapter(adapter));

		msleep(jiffies_to_msecs(ZFCP_TYPE2_RECOVERY_TIME));

		ssleep(ZFCP_TYPE2_RECOVERY_TIME);

	}



	return retval;
@@ -2080,7 +2080,7 @@ zfcp_erp_adapter_strategy_open_qdio(struct zfcp_erp_action *erp_action) 
	debug_text_event(adapter->erp_dbf, 3, "qdio_down1a");

	while (qdio_shutdown(adapter->ccw_device,

			     QDIO_FLAG_CLEANUP_USING_CLEAR) == -EINPROGRESS)

		msleep(1000);

		ssleep(1);

	debug_text_event(adapter->erp_dbf, 3, "qdio_down1b");



 failed_qdio_establish:
@@ -2165,7 +2165,7 @@ zfcp_erp_adapter_strategy_open_fsf_xconfig(struct zfcp_erp_action *erp_action) 
		ZFCP_LOG_DEBUG("host connection still initialising... "

			       "waiting and retrying...\n");

		/* sleep a little bit before retry */

		msleep(jiffies_to_msecs(sleep));

		ssleep(sleep);

		sleep *= 2;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE