diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-15 12:09:32 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-15 12:09:32 +0100 |
| commit | c1a0dd11e183ccd2dbc42ab699a65a335e065936 (patch) | |
| tree | 93df00912f65ff3c50ed674bfe8d4fcfbdc61f0f /drivers/scsi/megaraid/megaraid_sas_base.c | |
| parent | f462c0c2ffbaff2345c215fc65874f50c98ad09c (diff) | |
| parent | 519be4566e2e60293d55bcfec71490af8e61b9e7 (diff) | |
Merge tag 'v3.10.7' into linux-linaro-lsk
This is the 3.10.7 stable release
Diffstat (limited to 'drivers/scsi/megaraid/megaraid_sas_base.c')
| -rw-r--r-- | drivers/scsi/megaraid/megaraid_sas_base.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index 89178b833b5..9b60dc129a5 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -3508,11 +3508,21 @@ static int megasas_init_fw(struct megasas_instance *instance) break; } - /* - * We expect the FW state to be READY - */ - if (megasas_transition_to_ready(instance, 0)) - goto fail_ready_state; + if (megasas_transition_to_ready(instance, 0)) { + atomic_set(&instance->fw_reset_no_pci_access, 1); + instance->instancet->adp_reset + (instance, instance->reg_set); + atomic_set(&instance->fw_reset_no_pci_access, 0); + dev_info(&instance->pdev->dev, + "megasas: FW restarted successfully from %s!\n", + __func__); + + /*waitting for about 30 second before retry*/ + ssleep(30); + + if (megasas_transition_to_ready(instance, 0)) + goto fail_ready_state; + } /* Check if MSI-X is supported while in ready state */ msix_enable = (instance->instancet->read_fw_status_reg(reg_set) & |