Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[SCSI] megaraid_sas: Clear state change interrupts

Browse source 
Signed-off-by: Adam Radford <aradford@gmail.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
adam radford 2011-10-08 18:14:50 -07:00 committed by James Bottomley
parent 8d960d4311
commit 6497b2475d
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/scsi/megaraid/megaraid_sas_fusion.c
View file

@ -101,6 +101,10 @@ extern u32 megasas_dbg_lvl;
void void
megasas_enable_intr_fusion(struct megasas_register_set __iomem *regs) megasas_enable_intr_fusion(struct megasas_register_set __iomem *regs)
{ {
/* For Thunderbolt/Invader also clear intr on enable */
writel(~0, &regs->outbound_intr_status);
readl(&regs->outbound_intr_status);
writel(~MFI_FUSION_ENABLE_INTERRUPT_MASK, &(regs)->outbound_intr_mask); writel(~MFI_FUSION_ENABLE_INTERRUPT_MASK, &(regs)->outbound_intr_mask);
/* Dummy readl to force pci flush */ /* 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 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; return IRQ_HANDLED;
}
if (!complete_cmd_fusion(instance)) { if (!complete_cmd_fusion(instance)) {
instance->instancet->clear_intr(instance->reg_set);
/* If we didn't complete any commands, check for FW fault */ /* If we didn't complete any commands, check for FW fault */
fw_state = instance->instancet->read_fw_status_reg( fw_state = instance->instancet->read_fw_status_reg(
instance->reg_set) & MFI_STATE_MASK; instance->reg_set) & MFI_STATE_MASK;