Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 188323
b: refs/heads/master
c: ab53361
h: refs/heads/master
i:
  188321: 7212f34
  188319: 32d5d13
v: v3
  • Loading branch information
Krishna Gudipati authored and James Bottomley committed Mar 4, 2010
1 parent 913513d commit fc7e0eb
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2f9b8857a914b71ba1b84fb23a0a20a87de41c91
refs/heads/master: ab5336189a12b6561a1b5708d782a4e27e2e3b79
7 changes: 4 additions & 3 deletions trunk/drivers/scsi/bfa/bfa_intr.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* General Public License for more details.
*/
#include <bfa.h>
#include <bfi/bfi_cbreg.h>
#include <bfi/bfi_ctreg.h>
#include <bfa_port_priv.h>
#include <bfa_intr_priv.h>
#include <cs/bfa_debug.h>
Expand Down Expand Up @@ -96,7 +96,8 @@ bfa_isr_enable(struct bfa_s *bfa)

bfa_msix_install(bfa);
intr_unmask = (__HFN_INT_ERR_EMC | __HFN_INT_ERR_LPU0 |
__HFN_INT_ERR_LPU1 | __HFN_INT_ERR_PSS);
__HFN_INT_ERR_LPU1 | __HFN_INT_ERR_PSS |
__HFN_INT_LL_HALT);

if (pci_func == 0)
intr_unmask |= (__HFN_INT_CPE_Q0 | __HFN_INT_CPE_Q1 |
Expand Down Expand Up @@ -205,7 +206,7 @@ bfa_msix_lpu_err(struct bfa_s *bfa, int vec)

if (intr & (__HFN_INT_ERR_EMC |
__HFN_INT_ERR_LPU0 | __HFN_INT_ERR_LPU1 |
__HFN_INT_ERR_PSS))
__HFN_INT_ERR_PSS | __HFN_INT_LL_HALT))
bfa_msix_errint(bfa, intr);
}

Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/scsi/bfa/include/bfi/bfi_ctreg.h
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,7 @@ enum {
#define __HFN_INT_MBOX_LPU1 0x00200000U
#define __HFN_INT_MBOX1_LPU0 0x00400000U
#define __HFN_INT_MBOX1_LPU1 0x00800000U
#define __HFN_INT_LL_HALT 0x01000000U
#define __HFN_INT_CPE_MASK 0x000000ffU
#define __HFN_INT_RME_MASK 0x0000ff00U

Expand Down

0 comments on commit fc7e0eb

Please sign in to comment.