[SCSI] bfa: Brocade-1860 Fabric Adapter Hardware Enablement

- Added support for Brocade-1860 Fabric Adapter.
- Made changes to support single firmware image per asic type.
- Combined bfi_cbreg.h and bfi_ctreg.h defines into bfi_reg.h with
  only minimal defines used by host.
- Added changes to setup CPE/RME Queue register offsets based on
  firmware response.
- Removed queue register offset initializations and added register offsets
  to BFI config response message.
- Added Brocade-1860 asic specific interrupt status definitions and
  mailbox interfaces.

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

1 files changed, 8 insertions, 26 deletions

diff --git a/drivers/scsi/bfa/bfa_hw_cb.c b/drivers/scsi/bfa/bfa_hw_cb.c
index 977e681ec80..4ef3cf2e7d9 100644
--- a/drivers/scsi/bfa/bfa_hw_cb.c
+++ b/drivers/scsi/bfa/bfa_hw_cb.c
@@ -17,14 +17,14 @@
 
 #include "bfad_drv.h"
 #include "bfa_modules.h"
-#include "bfi_cbreg.h"
+#include "bfi_reg.h"
 
 void
 bfa_hwcb_reginit(struct bfa_s *bfa)
 {
         struct bfa_iocfc_regs_s *bfa_regs = &bfa->iocfc.bfa_regs;
         void __iomem *kva = bfa_ioc_bar0(&bfa->ioc);
-        int                     i, q, fn = bfa_ioc_pcifn(&bfa->ioc);
+        int     fn = bfa_ioc_pcifn(&bfa->ioc);
 
         if (fn == 0) {
                 bfa_regs->intr_status = (kva + HOSTFN0_INT_STATUS);
@@ -33,24 +33,6 @@ bfa_hwcb_reginit(struct bfa_s *bfa)
                 bfa_regs->intr_status = (kva + HOSTFN1_INT_STATUS);
                 bfa_regs->intr_mask   = (kva + HOSTFN1_INT_MSK);
         }
-
-        for (i = 0; i < BFI_IOC_MAX_CQS; i++) {
-                /*
-                 * CPE registers
-                 */
-                q = CPE_Q_NUM(fn, i);
-                bfa_regs->cpe_q_pi[i] = (kva + CPE_Q_PI(q));
-                bfa_regs->cpe_q_ci[i] = (kva + CPE_Q_CI(q));
-                bfa_regs->cpe_q_depth[i] = (kva + CPE_Q_DEPTH(q));
-
-                /*
-                 * RME registers
-                 */
-                q = CPE_Q_NUM(fn, i);
-                bfa_regs->rme_q_pi[i] = (kva + RME_Q_PI(q));
-                bfa_regs->rme_q_ci[i] = (kva + RME_Q_CI(q));
-                bfa_regs->rme_q_depth[i] = (kva + RME_Q_DEPTH(q));
-        }
 }
 
 void
@@ -115,18 +97,18 @@ bfa_hwcb_msix_init(struct bfa_s *bfa, int nvecs)
 
         bfa->msix.nvecs = nvecs;
         if (nvecs == 1) {
-                for (i = 0; i < BFA_MSIX_CB_MAX; i++)
+                for (i = 0; i < BFI_MSIX_CB_MAX; i++)
                         bfa->msix.handler[i] = bfa_msix_all;
                 return;
         }
 
-        for (i = BFA_MSIX_CPE_Q0; i <= BFA_MSIX_CPE_Q7; i++)
+        for (i = BFI_MSIX_CPE_QMIN_CB; i <= BFI_MSIX_CPE_QMAX_CB; i++)
                 bfa->msix.handler[i] = bfa_msix_reqq;
 
-        for (i = BFA_MSIX_RME_Q0; i <= BFA_MSIX_RME_Q7; i++)
+        for (i = BFI_MSIX_RME_QMIN_CB; i <= BFI_MSIX_RME_QMAX_CB; i++)
                 bfa->msix.handler[i] = bfa_msix_rspq;
 
-        for (; i < BFA_MSIX_CB_MAX; i++)
+        for (; i < BFI_MSIX_CB_MAX; i++)
                 bfa->msix.handler[i] = bfa_msix_lpu_err;
 }
 
@@ -156,6 +138,6 @@ bfa_hwcb_isr_mode_set(struct bfa_s *bfa, bfa_boolean_t msix)
 void
 bfa_hwcb_msix_get_rme_range(struct bfa_s *bfa, u32 *start, u32 *end)
 {
-        *start = BFA_MSIX_RME_Q0;
-        *end = BFA_MSIX_RME_Q7;
+        *start = BFI_MSIX_RME_QMIN_CB;
+        *end = BFI_MSIX_RME_QMAX_CB;
 }