megaraid_sas: call ISR function to clean up pending replies in OCR path

In OCR path, before calling chip reset calls function
megasas_wait_for_outstanding_fusion to check reason for OCR. In case of
firmware FAULT initiated OCR and DCMD timeout initiated timeout, driver
will clear any outstanding reply (yet to be processed by driver) in
reply queues before going for chip reset. This code is added to handle a
scenario when IO timeout initiated adapter reset and management
application initiated adapter reset (by sending command to FAULT
firmware) happens simultaneously since adapter reset function is
safe-guarded by reset_mutex so only thread will be doing controller
reset. Consider IO timeout thread gets mutex and proceeds with adapter
reset process after disabling interrupts and by the time management
application has fired command to firmware to do adapter reset and the
same command is completed by firmware but since interrupts are disabled,
driver will not get completion and the same command will be in
outstanding/pending commands list of driver and refires same command
from IO timeout thread after chip reset which will again FAULT firmware
and eventually causes kill adapter.

Signed-off-by: Sumit Saxena <sumit.saxena@broadcom.com>
Reviewed-by: Hannes Reinicke <hare@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index 320c1a0952d072c9ca3c28abfe08e6c8e757ae4c..e2dc20566ab707a2c81575ecc93f643a76db5544 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -2762,6 +2762,7 @@ int megasas_wait_for_outstanding_fusion(struct megasas_instance *instance,
                        dev_warn(&instance->pdev->dev, "Found FW in FAULT state,"
                               " will reset adapter scsi%d.\n",
                                instance->host->host_no);
+                       megasas_complete_cmd_dpc_fusion((unsigned long)instance);
                        retval = 1;
                        goto out;
                }
@@ -2769,6 +2770,7 @@ int megasas_wait_for_outstanding_fusion(struct megasas_instance *instance,
                if (reason == MFI_IO_TIMEOUT_OCR) {
                        dev_info(&instance->pdev->dev,
                                "MFI IO is timed out, initiating OCR\n");
+                       megasas_complete_cmd_dpc_fusion((unsigned long)instance);
                        retval = 1;
                        goto out;
                }