git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From 18e1c7f68a5814442abad849abe6eacbf02ffd7c Mon Sep 17 00:00:00 2001
   2 From: Kashyap Desai <kashyap.desai@broadcom.com>
   3 Date: Fri, 21 Oct 2016 06:33:29 -0700
   4 Subject: scsi: megaraid_sas: For SRIOV enabled firmware, ensure VF driver waits for 30secs before reset
   5
   6 From: Kashyap Desai <kashyap.desai@broadcom.com>
   7
   8 commit 18e1c7f68a5814442abad849abe6eacbf02ffd7c upstream.
   9
  10 For SRIOV enabled firmware, if there is a OCR(online controller reset)
  11 possibility driver set the convert flag to 1, which is not happening if
  12 there are outstanding commands even after 180 seconds.  As driver does
  13 not set convert flag to 1 and still making the OCR to run, VF(Virtual
  14 function) driver is directly writing on to the register instead of
  15 waiting for 30 seconds. Setting convert flag to 1 will cause VF driver
  16 will wait for 30 secs before going for reset.
  17
  18 Signed-off-by: Kiran Kumar Kasturi <kiran-kumar.kasturi@broadcom.com>
  19 Signed-off-by: Sumit Saxena <sumit.saxena@broadcom.com>
  20 Reviewed-by: Hannes Reinecke <hare@suse.com>
  21 Reviewed-by: Tomas Henzl <thenzl@redhat.com>
  22 Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
  23 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  24
  25 ---
  26  drivers/scsi/megaraid/megaraid_sas_fusion.c |    1 +
  27  1 file changed, 1 insertion(+)
  28
  29 --- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
  30 +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
  31 @@ -2648,6 +2648,7 @@ int megasas_wait_for_outstanding_fusion(
  32                 dev_err(&instance->pdev->dev, "pending commands remain after waiting, "
  33                        "will reset adapter scsi%d.\n",
  34                        instance->host->host_no);
  35 +               *convert = 1;
  36                 retval = 1;
  37         }
  38  out: