summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/megaraid/megaraid_sas_fusion.c
diff options
context:
space:
mode:
authorSumit.Saxena@lsi.com <Sumit.Saxena@lsi.com>2014-02-12 19:06:15 +0100
committerJames Bottomley <JBottomley@Parallels.com>2014-03-15 18:19:20 +0100
commitcfbe7554f6ebdf8034604d3cc90afd60cbb2195e (patch)
tree5b9be0fbd6830d22def10a2ee7cd46f5e9df6e6d /drivers/scsi/megaraid/megaraid_sas_fusion.c
parent[SCSI] arcmsr: upper 32 of dma address lost (diff)
downloadlinux-cfbe7554f6ebdf8034604d3cc90afd60cbb2195e.tar.xz
linux-cfbe7554f6ebdf8034604d3cc90afd60cbb2195e.zip
[SCSI] megaraid_sas: Don't wait forever for non-IOCTL DCMDs
Don't wait forever for firmware response for internal DCMDs sent from driver firmware. Such DCMDs will be posted to firmware with timeout. Timeout is also introduced for DCMD sent to abort the commands. DCMD sent via IOCTL path will still be always blocking to keep the IOCTL design intact. Signed-off-by: Sumit Saxena <sumit.saxena@lsi.com> Signed-off-by: Kashyap Desai <kashyap.desai@lsi.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/megaraid/megaraid_sas_fusion.c')
-rw-r--r--drivers/scsi/megaraid/megaraid_sas_fusion.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index 357c6c65970c..4544c27b6489 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -2472,6 +2472,7 @@ int megasas_reset_fusion(struct Scsi_Host *shost)
printk(KERN_WARNING "megaraid_sas: Reset failed, killing "
"adapter.\n");
megaraid_sas_kill_hba(instance);
+ instance->adprecovery = MEGASAS_HW_CRITICAL_ERROR;
retval = FAILED;
} else {
clear_bit(MEGASAS_FUSION_IN_RESET, &instance->reset_flags);