diff options
| author | Raghava Aditya Renukunta | 2017-05-10 18:39:43 +0200 |
|---|---|---|
| committer | Martin K. Petersen | 2017-06-13 02:47:59 +0200 |
| commit | 6b24d425881792b16ccf2189b43d57b4aff2a4e6 (patch) | |
| tree | 1085da5484e483abe996241449be895e053d36a4 /drivers/scsi/aacraid/src.c | |
| parent | scsi: aacraid: Print ctrl status before eh reset (diff) | |
| download | kernel-qcow2-linux-6b24d425881792b16ccf2189b43d57b4aff2a4e6.tar.gz kernel-qcow2-linux-6b24d425881792b16ccf2189b43d57b4aff2a4e6.tar.xz kernel-qcow2-linux-6b24d425881792b16ccf2189b43d57b4aff2a4e6.zip | |
scsi: aacraid: Using single reset mask for IOP reset
The driver can now trigger IOP reset with a single reset mask. Removed
code that retrieves a reset_mask from the firmware.
Signed-off-by: Raghava Aditya Renukunta <RaghavaAditya.Renukunta@microsemi.com>
Reviewed-by: David Carroll <david.carroll@microsemi.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/aacraid/src.c')
| -rw-r--r-- | drivers/scsi/aacraid/src.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/drivers/scsi/aacraid/src.c b/drivers/scsi/aacraid/src.c index 7b0410e0f569..f278a21c86db 100644 --- a/drivers/scsi/aacraid/src.c +++ b/drivers/scsi/aacraid/src.c @@ -704,22 +704,10 @@ static void aac_send_iop_reset(struct aac_dev *dev, int bled) 0, 0, 0, 0, 0, 0, &var, &reset_mask, NULL, NULL, NULL); - if ((bled || var != 0x00000001) && !dev->doorbell_mask) - bled = -EINVAL; - else if (dev->doorbell_mask) { - reset_mask = dev->doorbell_mask; - bled = 0; - var = 0x00000001; - } - aac_set_intx_mode(dev); - if (!bled && (dev->supplement_adapter_info.supported_options2 & - AAC_OPTION_DOORBELL_RESET)) { - src_writel(dev, MUnit.IDR, reset_mask); - } else { - src_writel(dev, MUnit.IDR, 0x100); - } + src_writel(dev, MUnit.IDR, IOP_SRC_RESET_MASK); + msleep(30000); } |