[SCSI] bfa: Fix to process mbox interrupts only if interrupts are enabled in INTx...

- Made changes to process mbox and error interrupts only if interrupts are
  enabled, when running in INTx mode.

Signed-off-by: Krishna Gudipati <kgudipat@brocade.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/drivers/scsi/bfa/bfa_core.c b/drivers/scsi/bfa/bfa_core.c
index a4129c929f2480aa11183a595c40e26c7855f6b0..b7c326f7a6d0f3dc337d8b7b9c45bccb671cd186 100644 (file)
--- a/drivers/scsi/bfa/bfa_core.c
+++ b/drivers/scsi/bfa/bfa_core.c
@@ -775,7 +775,8 @@ bfa_intx(struct bfa_s *bfa)
        if (!intr)
                return BFA_TRUE;
 
-       bfa_msix_lpu_err(bfa, intr);
+       if (bfa->intr_enabled)
+               bfa_msix_lpu_err(bfa, intr);
 
        return BFA_TRUE;
 }
@@ -803,11 +804,17 @@ bfa_isr_enable(struct bfa_s *bfa)
        writel(~umsk, bfa->iocfc.bfa_regs.intr_mask);
        bfa->iocfc.intr_mask = ~umsk;
        bfa_isr_mode_set(bfa, bfa->msix.nvecs != 0);
+
+       /*
+        * Set the flag indicating successful enabling of interrupts
+        */
+       bfa->intr_enabled = BFA_TRUE;
 }
 
 void
 bfa_isr_disable(struct bfa_s *bfa)
 {
+       bfa->intr_enabled = BFA_FALSE;
        bfa_isr_mode_set(bfa, BFA_FALSE);
        writel(-1L, bfa->iocfc.bfa_regs.intr_mask);
        bfa_msix_uninstall(bfa);

diff --git a/drivers/scsi/bfa/bfa_modules.h b/drivers/scsi/bfa/bfa_modules.h
index 2d36e4823835d326bfc32c2c29f9a2d8e93d55c9..189fff71e3c25842904ff911d0b52d5203897577 100644 (file)
--- a/drivers/scsi/bfa/bfa_modules.h
+++ b/drivers/scsi/bfa/bfa_modules.h
@@ -121,6 +121,7 @@ struct bfa_s {
        bfa_boolean_t           fcs;            /*  FCS is attached to BFA */
        struct bfa_msix_s       msix;
        int                     bfa_aen_seq;
+       bfa_boolean_t           intr_enabled;   /*  Status of interrupts */
 };
 
 extern bfa_boolean_t bfa_auto_recover;