From fc7e0eba5b76292df3861351790fd19a16166d04 Mon Sep 17 00:00:00 2001 From: Krishna Gudipati Date: Wed, 3 Mar 2010 17:43:09 -0800 Subject: [PATCH] --- yaml --- r: 188323 b: refs/heads/master c: ab5336189a12b6561a1b5708d782a4e27e2e3b79 h: refs/heads/master i: 188321: 7212f3419227adbe0b044a5d0b669a166253ef25 188319: 32d5d138d381805ff030ae33aa63be5e28d575f5 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/bfa/bfa_intr.c | 7 ++++--- trunk/drivers/scsi/bfa/include/bfi/bfi_ctreg.h | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9e5f77fb0e00..3929e7848229 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f9b8857a914b71ba1b84fb23a0a20a87de41c91 +refs/heads/master: ab5336189a12b6561a1b5708d782a4e27e2e3b79 diff --git a/trunk/drivers/scsi/bfa/bfa_intr.c b/trunk/drivers/scsi/bfa/bfa_intr.c index b36540e4ed76..ab463db11144 100644 --- a/trunk/drivers/scsi/bfa/bfa_intr.c +++ b/trunk/drivers/scsi/bfa/bfa_intr.c @@ -15,7 +15,7 @@ * General Public License for more details. */ #include -#include +#include #include #include #include @@ -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 | @@ -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); } diff --git a/trunk/drivers/scsi/bfa/include/bfi/bfi_ctreg.h b/trunk/drivers/scsi/bfa/include/bfi/bfi_ctreg.h index d3caa58c0a0a..dd2992c38afb 100644 --- a/trunk/drivers/scsi/bfa/include/bfi/bfi_ctreg.h +++ b/trunk/drivers/scsi/bfa/include/bfi/bfi_ctreg.h @@ -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