diff options
| author | Krishna Gudipati <kgudipat@brocade.com> | 2010-03-03 20:43:09 -0500 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-03-04 05:42:58 -0500 |
| commit | ab5336189a12b6561a1b5708d782a4e27e2e3b79 (patch) | |
| tree | 84dd4fc380349d8303b5101fe506351ee59428fe | |
| parent | 2f9b8857a914b71ba1b84fb23a0a20a87de41c91 (diff) | |
[SCSI] bfa: Enable new halt interrupt in BFA.
bfa_intr.c: Enable new halt interrupt in BFA.
bfi_ctreg.h: Expose new halt interrupt bit definition to host.
Signed-off-by: Krishna Gudipati <kgudipat@brocade.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
| -rw-r--r-- | drivers/scsi/bfa/bfa_intr.c | 7 | ||||
| -rw-r--r-- | drivers/scsi/bfa/include/bfi/bfi_ctreg.h | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/scsi/bfa/bfa_intr.c b/drivers/scsi/bfa/bfa_intr.c index b36540e4ed76..ab463db11144 100644 --- a/drivers/scsi/bfa/bfa_intr.c +++ b/drivers/scsi/bfa/bfa_intr.c | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | * General Public License for more details. | 15 | * General Public License for more details. |
| 16 | */ | 16 | */ |
| 17 | #include <bfa.h> | 17 | #include <bfa.h> |
| 18 | #include <bfi/bfi_cbreg.h> | 18 | #include <bfi/bfi_ctreg.h> |
| 19 | #include <bfa_port_priv.h> | 19 | #include <bfa_port_priv.h> |
| 20 | #include <bfa_intr_priv.h> | 20 | #include <bfa_intr_priv.h> |
| 21 | #include <cs/bfa_debug.h> | 21 | #include <cs/bfa_debug.h> |
| @@ -96,7 +96,8 @@ bfa_isr_enable(struct bfa_s *bfa) | |||
| 96 | 96 | ||
| 97 | bfa_msix_install(bfa); | 97 | bfa_msix_install(bfa); |
| 98 | intr_unmask = (__HFN_INT_ERR_EMC | __HFN_INT_ERR_LPU0 | | 98 | intr_unmask = (__HFN_INT_ERR_EMC | __HFN_INT_ERR_LPU0 | |
| 99 | __HFN_INT_ERR_LPU1 | __HFN_INT_ERR_PSS); | 99 | __HFN_INT_ERR_LPU1 | __HFN_INT_ERR_PSS | |
| 100 | __HFN_INT_LL_HALT); | ||
| 100 | 101 | ||
| 101 | if (pci_func == 0) | 102 | if (pci_func == 0) |
| 102 | intr_unmask |= (__HFN_INT_CPE_Q0 | __HFN_INT_CPE_Q1 | | 103 | intr_unmask |= (__HFN_INT_CPE_Q0 | __HFN_INT_CPE_Q1 | |
| @@ -205,7 +206,7 @@ bfa_msix_lpu_err(struct bfa_s *bfa, int vec) | |||
| 205 | 206 | ||
| 206 | if (intr & (__HFN_INT_ERR_EMC | | 207 | if (intr & (__HFN_INT_ERR_EMC | |
| 207 | __HFN_INT_ERR_LPU0 | __HFN_INT_ERR_LPU1 | | 208 | __HFN_INT_ERR_LPU0 | __HFN_INT_ERR_LPU1 | |
| 208 | __HFN_INT_ERR_PSS)) | 209 | __HFN_INT_ERR_PSS | __HFN_INT_LL_HALT)) |
| 209 | bfa_msix_errint(bfa, intr); | 210 | bfa_msix_errint(bfa, intr); |
| 210 | } | 211 | } |
| 211 | 212 | ||
diff --git a/drivers/scsi/bfa/include/bfi/bfi_ctreg.h b/drivers/scsi/bfa/include/bfi/bfi_ctreg.h index d3caa58c0a0a..dd2992c38afb 100644 --- a/drivers/scsi/bfa/include/bfi/bfi_ctreg.h +++ b/drivers/scsi/bfa/include/bfi/bfi_ctreg.h | |||
| @@ -589,6 +589,7 @@ enum { | |||
| 589 | #define __HFN_INT_MBOX_LPU1 0x00200000U | 589 | #define __HFN_INT_MBOX_LPU1 0x00200000U |
| 590 | #define __HFN_INT_MBOX1_LPU0 0x00400000U | 590 | #define __HFN_INT_MBOX1_LPU0 0x00400000U |
| 591 | #define __HFN_INT_MBOX1_LPU1 0x00800000U | 591 | #define __HFN_INT_MBOX1_LPU1 0x00800000U |
| 592 | #define __HFN_INT_LL_HALT 0x01000000U | ||
| 592 | #define __HFN_INT_CPE_MASK 0x000000ffU | 593 | #define __HFN_INT_CPE_MASK 0x000000ffU |
| 593 | #define __HFN_INT_RME_MASK 0x0000ff00U | 594 | #define __HFN_INT_RME_MASK 0x0000ff00U |
| 594 | 595 | ||
