1 files changed, 34 insertions, 172 deletions

diff --git a/drivers/scsi/bfa/bfa_fcs.c b/drivers/scsi/bfa/bfa_fcs.c
index 045d7e87b632..f674f9318629 100644
--- a/drivers/scsi/bfa/bfa_fcs.c
+++ b/drivers/scsi/bfa/bfa_fcs.c
@@ -19,9 +19,9 @@
  *  bfa_fcs.c BFA FCS main
  */
 
+#include "bfad_drv.h"
 #include "bfa_fcs.h"
 #include "bfa_fcbuild.h"
-#include "bfad_drv.h"
 
 BFA_TRC_FILE(FCS, FCS);
 
@@ -76,7 +76,7 @@ bfa_fcs_attach(struct bfa_fcs_s *fcs, struct bfa_s *bfa, struct bfad_s *bfad,
         fcs->bfad = bfad;
         fcs->min_cfg = min_cfg;
 
-        bfa_attach_fcs(bfa);
+        bfa->fcs = BFA_TRUE;
         fcbuild_init();
 
         for (i = 0; i < sizeof(fcs_modules) / sizeof(fcs_modules[0]); i++) {
@@ -110,14 +110,6 @@ bfa_fcs_init(struct bfa_fcs_s *fcs)
         }
 }
 
-/*
- * Start FCS operations.
- */
-void
-bfa_fcs_start(struct bfa_fcs_s *fcs)
-{
-        bfa_fcs_fabric_modstart(fcs);
-}
 
 /*
  *      brief
@@ -140,22 +132,6 @@ bfa_fcs_driver_info_init(struct bfa_fcs_s *fcs,
 
 /*
  *      brief
- *              FCS FDMI Driver Parameter Initialization
- *
- *      param[in]               fcs             FCS instance
- *      param[in]               fdmi_enable     TRUE/FALSE
- *
- *      return None
- */
-void
-bfa_fcs_set_fdmi_param(struct bfa_fcs_s *fcs, bfa_boolean_t fdmi_enable)
-{
-
-        fcs->fdmi_enabled = fdmi_enable;
-
-}
-/*
- *      brief
  *              FCS instance cleanup and exit.
  *
  *      param[in]               fcs                     FCS instance
@@ -184,18 +160,6 @@ bfa_fcs_exit(struct bfa_fcs_s *fcs)
 }
 
 
-void
-bfa_fcs_trc_init(struct bfa_fcs_s *fcs, struct bfa_trc_mod_s *trcmod)
-{
-        fcs->trcmod = trcmod;
-}
-
-void
-bfa_fcs_modexit_comp(struct bfa_fcs_s *fcs)
-{
-        bfa_wc_down(&fcs->wc);
-}
-
 /*
  * Fabric module implementation.
  */
@@ -232,31 +196,6 @@ static void bfa_fcs_fabric_flogiacc_comp(void *fcsarg,
                                          u32 rsp_len,
                                          u32 resid_len,
                                          struct fchs_s *rspfchs);
-/*
- *  fcs_fabric_sm fabric state machine functions
- */
-
-/*
- * Fabric state machine events
- */
-enum bfa_fcs_fabric_event {
-        BFA_FCS_FABRIC_SM_CREATE        = 1,    /*  create from driver        */
-        BFA_FCS_FABRIC_SM_DELETE        = 2,    /*  delete from driver        */
-        BFA_FCS_FABRIC_SM_LINK_DOWN     = 3,    /*  link down from port      */
-        BFA_FCS_FABRIC_SM_LINK_UP       = 4,    /*  link up from port         */
-        BFA_FCS_FABRIC_SM_CONT_OP       = 5,    /*  flogi/auth continue op   */
-        BFA_FCS_FABRIC_SM_RETRY_OP      = 6,    /*  flogi/auth retry op      */
-        BFA_FCS_FABRIC_SM_NO_FABRIC     = 7,    /*  from flogi/auth           */
-        BFA_FCS_FABRIC_SM_PERF_EVFP     = 8,    /*  from flogi/auth           */
-        BFA_FCS_FABRIC_SM_ISOLATE       = 9,    /*  from EVFP processing     */
-        BFA_FCS_FABRIC_SM_NO_TAGGING    = 10,   /*  no VFT tagging from EVFP */
-        BFA_FCS_FABRIC_SM_DELAYED       = 11,   /*  timeout delay event      */
-        BFA_FCS_FABRIC_SM_AUTH_FAILED   = 12,   /*  auth failed       */
-        BFA_FCS_FABRIC_SM_AUTH_SUCCESS  = 13,   /*  auth successful           */
-        BFA_FCS_FABRIC_SM_DELCOMP       = 14,   /*  all vports deleted event */
-        BFA_FCS_FABRIC_SM_LOOPBACK      = 15,   /*  Received our own FLOGI   */
-        BFA_FCS_FABRIC_SM_START         = 16,   /*  from driver       */
-};
 
 static void     bfa_fcs_fabric_sm_uninit(struct bfa_fcs_fabric_s *fabric,
                                          enum bfa_fcs_fabric_event event);
@@ -270,14 +209,8 @@ static void	bfa_fcs_fabric_sm_flogi_retry(struct bfa_fcs_fabric_s *fabric,
                                               enum bfa_fcs_fabric_event event);
 static void     bfa_fcs_fabric_sm_auth(struct bfa_fcs_fabric_s *fabric,
                                        enum bfa_fcs_fabric_event event);
-static void     bfa_fcs_fabric_sm_auth_failed(struct bfa_fcs_fabric_s *fabric,
-                                              enum bfa_fcs_fabric_event event);
-static void     bfa_fcs_fabric_sm_loopback(struct bfa_fcs_fabric_s *fabric,
-                                           enum bfa_fcs_fabric_event event);
 static void     bfa_fcs_fabric_sm_nofabric(struct bfa_fcs_fabric_s *fabric,
                                            enum bfa_fcs_fabric_event event);
-static void     bfa_fcs_fabric_sm_online(struct bfa_fcs_fabric_s *fabric,
-                                         enum bfa_fcs_fabric_event event);
 static void     bfa_fcs_fabric_sm_evfp(struct bfa_fcs_fabric_s *fabric,
                                        enum bfa_fcs_fabric_event event);
 static void     bfa_fcs_fabric_sm_evfp_done(struct bfa_fcs_fabric_s *fabric,
@@ -337,7 +270,7 @@ bfa_fcs_fabric_sm_created(struct bfa_fcs_fabric_s *fabric,
 
         case BFA_FCS_FABRIC_SM_DELETE:
                 bfa_sm_set_state(fabric, bfa_fcs_fabric_sm_uninit);
-                bfa_fcs_modexit_comp(fabric->fcs);
+                bfa_wc_down(&fabric->fcs->wc);
                 break;
 
         default:
@@ -410,7 +343,7 @@ bfa_fcs_fabric_sm_flogi(struct bfa_fcs_fabric_s *fabric,
 
         case BFA_FCS_FABRIC_SM_LOOPBACK:
                 bfa_sm_set_state(fabric, bfa_fcs_fabric_sm_loopback);
-                bfa_lps_discard(fabric->lps);
+                bfa_sm_send_event(fabric->lps, BFA_LPS_SM_OFFLINE);
                 bfa_fcs_fabric_set_opertype(fabric);
                 break;
 
@@ -424,12 +357,12 @@ bfa_fcs_fabric_sm_flogi(struct bfa_fcs_fabric_s *fabric,
 
         case BFA_FCS_FABRIC_SM_LINK_DOWN:
                 bfa_sm_set_state(fabric, bfa_fcs_fabric_sm_linkdown);
-                bfa_lps_discard(fabric->lps);
+                bfa_sm_send_event(fabric->lps, BFA_LPS_SM_OFFLINE);
                 break;
 
         case BFA_FCS_FABRIC_SM_DELETE:
                 bfa_sm_set_state(fabric, bfa_fcs_fabric_sm_deleting);
-                bfa_lps_discard(fabric->lps);
+                bfa_sm_send_event(fabric->lps, BFA_LPS_SM_OFFLINE);
                 bfa_fcs_fabric_delete(fabric);
                 break;
 
@@ -481,7 +414,7 @@ bfa_fcs_fabric_sm_auth(struct bfa_fcs_fabric_s *fabric,
         switch (event) {
         case BFA_FCS_FABRIC_SM_AUTH_FAILED:
                 bfa_sm_set_state(fabric, bfa_fcs_fabric_sm_auth_failed);
-                bfa_lps_discard(fabric->lps);
+                bfa_sm_send_event(fabric->lps, BFA_LPS_SM_OFFLINE);
                 break;
 
         case BFA_FCS_FABRIC_SM_AUTH_SUCCESS:
@@ -495,7 +428,7 @@ bfa_fcs_fabric_sm_auth(struct bfa_fcs_fabric_s *fabric,
 
         case BFA_FCS_FABRIC_SM_LINK_DOWN:
                 bfa_sm_set_state(fabric, bfa_fcs_fabric_sm_linkdown);
-                bfa_lps_discard(fabric->lps);
+                bfa_sm_send_event(fabric->lps, BFA_LPS_SM_OFFLINE);
                 break;
 
         case BFA_FCS_FABRIC_SM_DELETE:
@@ -511,7 +444,7 @@ bfa_fcs_fabric_sm_auth(struct bfa_fcs_fabric_s *fabric,
 /*
  *   Authentication failed
  */
-static void
+void
 bfa_fcs_fabric_sm_auth_failed(struct bfa_fcs_fabric_s *fabric,
                               enum bfa_fcs_fabric_event event)
 {
@@ -537,7 +470,7 @@ bfa_fcs_fabric_sm_auth_failed(struct bfa_fcs_fabric_s *fabric,
 /*
  *   Port is in loopback mode.
  */
-static void
+void
 bfa_fcs_fabric_sm_loopback(struct bfa_fcs_fabric_s *fabric,
                            enum bfa_fcs_fabric_event event)
 {
@@ -573,7 +506,7 @@ bfa_fcs_fabric_sm_nofabric(struct bfa_fcs_fabric_s *fabric,
         switch (event) {
         case BFA_FCS_FABRIC_SM_LINK_DOWN:
                 bfa_sm_set_state(fabric, bfa_fcs_fabric_sm_linkdown);
-                bfa_lps_discard(fabric->lps);
+                bfa_sm_send_event(fabric->lps, BFA_LPS_SM_OFFLINE);
                 bfa_fcs_fabric_notify_offline(fabric);
                 break;
 
@@ -596,7 +529,7 @@ bfa_fcs_fabric_sm_nofabric(struct bfa_fcs_fabric_s *fabric,
 /*
  *   Fabric is online - normal operating state.
  */
-static void
+void
 bfa_fcs_fabric_sm_online(struct bfa_fcs_fabric_s *fabric,
                          enum bfa_fcs_fabric_event event)
 {
@@ -606,7 +539,7 @@ bfa_fcs_fabric_sm_online(struct bfa_fcs_fabric_s *fabric,
         switch (event) {
         case BFA_FCS_FABRIC_SM_LINK_DOWN:
                 bfa_sm_set_state(fabric, bfa_fcs_fabric_sm_linkdown);
-                bfa_lps_discard(fabric->lps);
+                bfa_sm_send_event(fabric->lps, BFA_LPS_SM_OFFLINE);
                 bfa_fcs_fabric_notify_offline(fabric);
                 break;
 
@@ -617,7 +550,7 @@ bfa_fcs_fabric_sm_online(struct bfa_fcs_fabric_s *fabric,
 
         case BFA_FCS_FABRIC_SM_AUTH_FAILED:
                 bfa_sm_set_state(fabric, bfa_fcs_fabric_sm_auth_failed);
-                bfa_lps_discard(fabric->lps);
+                bfa_sm_send_event(fabric->lps, BFA_LPS_SM_OFFLINE);
                 break;
 
         case BFA_FCS_FABRIC_SM_AUTH_SUCCESS:
@@ -697,7 +630,7 @@ bfa_fcs_fabric_sm_deleting(struct bfa_fcs_fabric_s *fabric,
         switch (event) {
         case BFA_FCS_FABRIC_SM_DELCOMP:
                 bfa_sm_set_state(fabric, bfa_fcs_fabric_sm_uninit);
-                bfa_fcs_modexit_comp(fabric->fcs);
+                bfa_wc_down(&fabric->fcs->wc);
                 break;
 
         case BFA_FCS_FABRIC_SM_LINK_UP:
@@ -724,8 +657,8 @@ bfa_fcs_fabric_init(struct bfa_fcs_fabric_s *fabric)
         struct bfa_lport_cfg_s *port_cfg = &fabric->bport.port_cfg;
 
         port_cfg->roles = BFA_LPORT_ROLE_FCP_IM;
-        port_cfg->nwwn = bfa_ioc_get_nwwn(&fabric->fcs->bfa->ioc);
-        port_cfg->pwwn = bfa_ioc_get_pwwn(&fabric->fcs->bfa->ioc);
+        port_cfg->nwwn = fabric->fcs->bfa->ioc.attr->nwwn;
+        port_cfg->pwwn = fabric->fcs->bfa->ioc.attr->pwwn;
 }
 
 /*
@@ -813,7 +746,7 @@ bfa_cb_lps_flogi_comp(void *bfad, void *uarg, bfa_status_t status)
                 return;
 
         case BFA_STATUS_EPROTOCOL:
-                switch (bfa_lps_get_extstatus(fabric->lps)) {
+                switch (fabric->lps->ext_status) {
                 case BFA_EPROTO_BAD_ACCEPT:
                         fabric->stats.flogi_acc_err++;
                         break;
@@ -840,26 +773,26 @@ bfa_cb_lps_flogi_comp(void *bfad, void *uarg, bfa_status_t status)
                 return;
         }
 
-        fabric->bb_credit = bfa_lps_get_peer_bbcredit(fabric->lps);
+        fabric->bb_credit = fabric->lps->pr_bbcred;
         bfa_trc(fabric->fcs, fabric->bb_credit);
 
-        if (!bfa_lps_is_brcd_fabric(fabric->lps))
-                fabric->fabric_name =  bfa_lps_get_peer_nwwn(fabric->lps);
+        if (!(fabric->lps->brcd_switch))
+                fabric->fabric_name =  fabric->lps->pr_nwwn;
 
         /*
          * Check port type. It should be 1 = F-port.
          */
-        if (bfa_lps_is_fport(fabric->lps)) {
-                fabric->bport.pid = bfa_lps_get_pid(fabric->lps);
-                fabric->is_npiv = bfa_lps_is_npiv_en(fabric->lps);
-                fabric->is_auth = bfa_lps_is_authreq(fabric->lps);
+        if (fabric->lps->fport) {
+                fabric->bport.pid = fabric->lps->lp_pid;
+                fabric->is_npiv = fabric->lps->npiv_en;
+                fabric->is_auth = fabric->lps->auth_req;
                 bfa_sm_send_event(fabric, BFA_FCS_FABRIC_SM_CONT_OP);
         } else {
                 /*
                  * Nport-2-Nport direct attached
                  */
                 fabric->bport.port_topo.pn2n.rem_port_wwn =
-                        bfa_lps_get_peer_pwwn(fabric->lps);
+                        fabric->lps->pr_pwwn;
                 bfa_sm_send_event(fabric, BFA_FCS_FABRIC_SM_NO_FABRIC);
         }
 
@@ -987,7 +920,7 @@ bfa_fcs_fabric_attach(struct bfa_fcs_s *fcs)
         INIT_LIST_HEAD(&fabric->vport_q);
         INIT_LIST_HEAD(&fabric->vf_q);
         fabric->lps = bfa_lps_alloc(fcs->bfa);
-        bfa_assert(fabric->lps);
+        WARN_ON(!fabric->lps);
 
         /*
          * Initialize fabric delete completion handler. Fabric deletion is
@@ -1038,31 +971,6 @@ bfa_fcs_fabric_modstart(struct bfa_fcs_s *fcs)
         bfa_sm_send_event(fabric, BFA_FCS_FABRIC_SM_START);
 }
 
-/*
- *   Suspend fabric activity as part of driver suspend.
- */
-void
-bfa_fcs_fabric_modsusp(struct bfa_fcs_s *fcs)
-{
-}
-
-bfa_boolean_t
-bfa_fcs_fabric_is_loopback(struct bfa_fcs_fabric_s *fabric)
-{
-        return bfa_sm_cmp_state(fabric, bfa_fcs_fabric_sm_loopback);
-}
-
-bfa_boolean_t
-bfa_fcs_fabric_is_auth_failed(struct bfa_fcs_fabric_s *fabric)
-{
-        return bfa_sm_cmp_state(fabric, bfa_fcs_fabric_sm_auth_failed);
-}
-
-enum bfa_port_type
-bfa_fcs_fabric_port_type(struct bfa_fcs_fabric_s *fabric)
-{
-        return fabric->oper_type;
-}
 
 /*
  *   Link up notification from BFA physical port module.
@@ -1123,40 +1031,6 @@ bfa_fcs_fabric_delvport(struct bfa_fcs_fabric_s *fabric,
         bfa_wc_down(&fabric->wc);
 }
 
-/*
- *   Base port is deleted.
- */
-void
-bfa_fcs_fabric_port_delete_comp(struct bfa_fcs_fabric_s *fabric)
-{
-        bfa_wc_down(&fabric->wc);
-}
-
-
-/*
- *    Check if fabric is online.
- *
- *   param[in] fabric - Fabric instance. This can be a base fabric or vf.
- *
- *   @return  TRUE/FALSE
- */
-int
-bfa_fcs_fabric_is_online(struct bfa_fcs_fabric_s *fabric)
-{
-        return bfa_sm_cmp_state(fabric, bfa_fcs_fabric_sm_online);
-}
-
-/*
- *      brief
- *
- */
-bfa_status_t
-bfa_fcs_fabric_addvf(struct bfa_fcs_fabric_s *vf, struct bfa_fcs_s *fcs,
-                     struct bfa_lport_cfg_s *port_cfg, struct bfad_vf_s *vf_drv)
-{
-        bfa_sm_set_state(vf, bfa_fcs_fabric_sm_uninit);
-        return BFA_STATUS_OK;
-}
 
 /*
  * Lookup for a vport withing a fabric given its pwwn
@@ -1176,18 +1050,6 @@ bfa_fcs_fabric_vport_lookup(struct bfa_fcs_fabric_s *fabric, wwn_t pwwn)
         return NULL;
 }
 
-/*
- *    In a given fabric, return the number of lports.
- *
- *   param[in] fabric - Fabric instance. This can be a base fabric or vf.
- *
- *   @return : 1 or more.
- */
-u16
-bfa_fcs_fabric_vport_count(struct bfa_fcs_fabric_s *fabric)
-{
-        return fabric->num_vports;
-}
 
 /*
  *  Get OUI of the attached switch.
@@ -1207,7 +1069,7 @@ bfa_fcs_fabric_get_switch_oui(struct bfa_fcs_fabric_s *fabric)
         u8 *tmp;
         u16 oui;
 
-        fab_nwwn = bfa_lps_get_peer_nwwn(fabric->lps);
+        fab_nwwn = fabric->lps->pr_nwwn;
 
         tmp = (u8 *)&fab_nwwn;
         oui = (tmp[3] << 8) | tmp[4];
@@ -1235,7 +1097,7 @@ bfa_fcs_fabric_uf_recv(struct bfa_fcs_fabric_s *fabric, struct fchs_s *fchs,
          * external loopback cable is in place. Our own FLOGI frames are
          * sometimes looped back when switch port gets temporarily bypassed.
          */
-        if ((pid == bfa_os_ntoh3b(FC_FABRIC_PORT)) &&
+        if ((pid == bfa_ntoh3b(FC_FABRIC_PORT)) &&
             (els_cmd->els_code == FC_ELS_FLOGI) &&
             (flogi->port_name == bfa_fcs_lport_get_pwwn(&fabric->bport))) {
                 bfa_sm_send_event(fabric, BFA_FCS_FABRIC_SM_LOOPBACK);
@@ -1245,7 +1107,7 @@ bfa_fcs_fabric_uf_recv(struct bfa_fcs_fabric_s *fabric, struct fchs_s *fchs,
         /*
          * FLOGI/EVFP exchanges should be consumed by base fabric.
          */
-        if (fchs->d_id == bfa_os_hton3b(FC_FABRIC_PORT)) {
+        if (fchs->d_id == bfa_hton3b(FC_FABRIC_PORT)) {
                 bfa_trc(fabric->fcs, pid);
                 bfa_fcs_fabric_process_uf(fabric, fchs, len);
                 return;
@@ -1358,13 +1220,13 @@ bfa_fcs_fabric_send_flogi_acc(struct bfa_fcs_fabric_s *fabric)
                 return;
 
         reqlen = fc_flogi_acc_build(&fchs, bfa_fcxp_get_reqbuf(fcxp),
-                                    bfa_os_hton3b(FC_FABRIC_PORT),
+                                    bfa_hton3b(FC_FABRIC_PORT),
                                     n2n_port->reply_oxid, pcfg->pwwn,
                                     pcfg->nwwn,
                                     bfa_fcport_get_maxfrsize(bfa),
                                     bfa_fcport_get_rx_bbcredit(bfa));
 
-        bfa_fcxp_send(fcxp, NULL, fabric->vf_id, bfa_lps_get_tag(fabric->lps),
+        bfa_fcxp_send(fcxp, NULL, fabric->vf_id, fabric->lps->lp_tag,
                       BFA_FALSE, FC_CLASS_3,
                       reqlen, &fchs, bfa_fcs_fabric_flogiacc_comp, fabric,
                       FC_MAX_PDUSZ, 0);
@@ -1455,7 +1317,7 @@ bfa_fcs_port_event_handler(void *cbarg, enum bfa_port_linkstate event)
                 break;
 
         default:
-                bfa_assert(0);
+                WARN_ON(1);
         }
 }
 
@@ -1502,7 +1364,7 @@ bfa_fcs_uf_recv(void *cbarg, struct bfa_uf_s *uf)
                  * drop frame if vfid is unknown
                  */
                 if (!fabric) {
-                        bfa_assert(0);
+                        WARN_ON(1);
                         bfa_stats(fcs, uf.vfid_unknown);
                         bfa_uf_free(uf);
                         return;