diff options
| author | adam radford <aradford@gmail.com> | 2011-10-08 18:14:50 -0700 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2011-10-16 11:20:05 -0500 |
| commit | 6497b2475df330437d462c770ee9af0a271d88f9 (patch) | |
| tree | 449eb9b82940c9d39dc245732a3488c0446f2873 /drivers/scsi/megaraid | |
| parent | 8d960d4311dc8d5f623d64694744b1ac36332e3f (diff) | |
| download | kernel_goldelico_gta04-6497b2475df330437d462c770ee9af0a271d88f9.zip kernel_goldelico_gta04-6497b2475df330437d462c770ee9af0a271d88f9.tar.gz kernel_goldelico_gta04-6497b2475df330437d462c770ee9af0a271d88f9.tar.bz2 | |
[SCSI] megaraid_sas: Clear state change interrupts
Signed-off-by: Adam Radford <aradford@gmail.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/megaraid')
| -rw-r--r-- | drivers/scsi/megaraid/megaraid_sas_fusion.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c index 52f6a15..ec2e097 100644 --- a/drivers/scsi/megaraid/megaraid_sas_fusion.c +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c @@ -101,6 +101,10 @@ extern u32 megasas_dbg_lvl; void megasas_enable_intr_fusion(struct megasas_register_set __iomem *regs) { + /* For Thunderbolt/Invader also clear intr on enable */ + writel(~0, ®s->outbound_intr_status); + readl(®s->outbound_intr_status); + writel(~MFI_FUSION_ENABLE_INTERRUPT_MASK, &(regs)->outbound_intr_mask); /* Dummy readl to force pci flush */ @@ -1806,10 +1810,13 @@ irqreturn_t megasas_isr_fusion(int irq, void *devp) } /* If we are resetting, bail */ - if (test_bit(MEGASAS_FUSION_IN_RESET, &instance->reset_flags)) + if (test_bit(MEGASAS_FUSION_IN_RESET, &instance->reset_flags)) { + instance->instancet->clear_intr(instance->reg_set); return IRQ_HANDLED; + } if (!complete_cmd_fusion(instance)) { + instance->instancet->clear_intr(instance->reg_set); /* If we didn't complete any commands, check for FW fault */ fw_state = instance->instancet->read_fw_status_reg( instance->reg_set) & MFI_STATE_MASK; |