From: Kashyap Desai Date: Fri, 21 Oct 2016 13:33:29 +0000 (-0700) Subject: scsi: megaraid_sas: For SRIOV enabled firmware, ensure VF driver waits for 30secs... X-Git-Tag: v4.10-rc1~128^2~153 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=18e1c7f68a5814442abad849abe6eacbf02ffd7c;p=karo-tx-linux.git scsi: megaraid_sas: For SRIOV enabled firmware, ensure VF driver waits for 30secs before reset For SRIOV enabled firmware, if there is a OCR(online controller reset) possibility driver set the convert flag to 1, which is not happening if there are outstanding commands even after 180 seconds. As driver does not set convert flag to 1 and still making the OCR to run, VF(Virtual function) driver is directly writing on to the register instead of waiting for 30 seconds. Setting convert flag to 1 will cause VF driver will wait for 30 secs before going for reset. CC: stable@vger.kernel.org Signed-off-by: Kiran Kumar Kasturi Signed-off-by: Sumit Saxena Reviewed-by: Hannes Reinecke Reviewed-by: Tomas Henzl Signed-off-by: Martin K. Petersen --- diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c index 52d8bbf7feb5..61be7ed73a7c 100644 --- a/drivers/scsi/megaraid/megaraid_sas_fusion.c +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c @@ -2823,6 +2823,7 @@ int megasas_wait_for_outstanding_fusion(struct megasas_instance *instance, dev_err(&instance->pdev->dev, "pending commands remain after waiting, " "will reset adapter scsi%d.\n", instance->host->host_no); + *convert = 1; retval = 1; } out: