FAILED: patch "[PATCH] scsi: megaraid_sas: set minimum value of resetwaittime to be" failed to apply to 4.4-stable tree

PATCH [email protected] 1 participant 1 message Sep 22, 2017

Subsystems (3)

Stable branch SCSI Megaraid SCSI/SAS drivers

lore

Share & tools

lore

[email protected]

author maintainer

2017-09-22 09:47 UTC #0 lore raw

The patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From e636a7a430f41efb0ff2727960ce61ef9f8f6769 Mon Sep 17 00:00:00 2001

From: Shivasharan S <[email protected]>
Date: Wed, 23 Aug 2017 04:46:56 -0700
Subject: [PATCH] scsi: megaraid_sas: set minimum value of resetwaittime to be
1 secs

Setting resetwaittime to 0 during a FW fault will result in driver not calling the OCR.

Signed-off-by Kashyap Desai <[email protected]>

Signed-off-by Shivasharan S <[email protected]>

Cc [email protected]

Reviewed-by Hannes Reinecke <[email protected]>

Reviewed-by Tomas Henzl <[email protected]>

Signed-off-by Martin K. Petersen <[email protected]>

drivers/scsi/megaraid/megaraid_sas_base.c +2 -1

index 5202c2fd72ac..2c309ec33696 100644
@@ -5479,7 +5479,8 @@ static int megasas_init_fw(struct megasas_instance *instance)
 		instance->throttlequeuedepth =
 				MEGASAS_THROTTLE_QUEUE_DEPTH;
 
-	if (resetwaittime > MEGASAS_RESET_WAIT_TIME)
+	if ((resetwaittime < 1) ||
+	    (resetwaittime > MEGASAS_RESET_WAIT_TIME))
 		resetwaittime = MEGASAS_RESET_WAIT_TIME;
 
 	if ((scmd_timeout < 10) || (scmd_timeout > MEGASAS_DEFAULT_CMD_TIMEOUT))