Commit f7f73812 authored by Maggie Zhang's avatar Maggie Zhang Committed by James Bottomley
Browse files

[SCSI] bfa: clean up one line functions 



Cleaned up one line functions.

Signed-off-by: default avatarMaggie Zhang <xmzhang@brocade.com>
Signed-off-by: default avatarJing Huang <huangj@brocade.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent df0f1933

drivers/scsi/bfa/bfa.h

+0 −17
Original line number Diff line number Diff line
@@ -296,7 +296,6 @@ void bfa_iocfc_attach(struct bfa_s *bfa, void *bfad, 
		      struct bfa_iocfc_cfg_s *cfg,

		      struct bfa_meminfo_s *meminfo,

		      struct bfa_pcidev_s *pcidev);

void bfa_iocfc_detach(struct bfa_s *bfa);

void bfa_iocfc_init(struct bfa_s *bfa);

void bfa_iocfc_start(struct bfa_s *bfa);

void bfa_iocfc_stop(struct bfa_s *bfa);
@@ -385,13 +384,7 @@ void bfa_cfg_get_meminfo(struct bfa_iocfc_cfg_s *cfg, 
void bfa_attach(struct bfa_s *bfa, void *bfad, struct bfa_iocfc_cfg_s *cfg,

		struct bfa_meminfo_s *meminfo,

		struct bfa_pcidev_s *pcidev);

void bfa_init_trc(struct bfa_s *bfa, struct bfa_trc_mod_s *trcmod);

void bfa_init_plog(struct bfa_s *bfa, struct bfa_plog_s *plog);

void bfa_detach(struct bfa_s *bfa);

void bfa_init(struct bfa_s *bfa);

void bfa_start(struct bfa_s *bfa);

void bfa_stop(struct bfa_s *bfa);

void bfa_attach_fcs(struct bfa_s *bfa);

void bfa_cb_init(void *bfad, bfa_status_t status);

void bfa_cb_updateq(void *bfad, bfa_status_t status);
@@ -405,7 +398,6 @@ void bfa_comp_free(struct bfa_s *bfa, struct list_head *comp_q); 


typedef void (*bfa_cb_ioc_t) (void *cbarg, enum bfa_status status);

void bfa_iocfc_get_attr(struct bfa_s *bfa, struct bfa_iocfc_attr_s *attr);

void bfa_get_attr(struct bfa_s *bfa, struct bfa_ioc_attr_s *ioc_attr);





bfa_status_t bfa_iocfc_israttr_set(struct bfa_s *bfa,
@@ -413,16 +405,7 @@ bfa_status_t bfa_iocfc_israttr_set(struct bfa_s *bfa, 


void bfa_iocfc_enable(struct bfa_s *bfa);

void bfa_iocfc_disable(struct bfa_s *bfa);

void bfa_timer_tick(struct bfa_s *bfa);

#define bfa_timer_start(_bfa, _timer, _timercb, _arg, _timeout)		\

	bfa_timer_begin(&(_bfa)->timer_mod, _timer, _timercb, _arg, _timeout)



/*

 * BFA debug API functions

 */

bfa_status_t bfa_debug_fwtrc(struct bfa_s *bfa, void *trcdata, int *trclen);

bfa_status_t bfa_debug_fwsave(struct bfa_s *bfa, void *trcdata, int *trclen);

bfa_status_t bfa_debug_fwcore(struct bfa_s *bfa, void *buf,

			      u32 *offset, int *buflen);



#endif /* __BFA_H__ */

drivers/scsi/bfa/bfa_core.c

+9 −164
Original line number Diff line number Diff line
@@ -66,18 +66,6 @@ static struct bfa_ioc_cbfn_s bfa_iocfc_cbfn; 
/*

 * BFA Interrupt handling functions

 */

static void

bfa_msix_errint(struct bfa_s *bfa, u32 intr)

{

	bfa_ioc_error_isr(&bfa->ioc);

}



static void

bfa_msix_lpu(struct bfa_s *bfa)

{

	bfa_ioc_mbox_isr(&bfa->ioc);

}



static void

bfa_reqq_resume(struct bfa_s *bfa, int qid)

{
@@ -267,7 +255,7 @@ bfa_msix_lpu_err(struct bfa_s *bfa, int vec) 
	intr = readl(bfa->iocfc.bfa_regs.intr_status);



	if (intr & (__HFN_INT_MBOX_LPU0 | __HFN_INT_MBOX_LPU1))

		bfa_msix_lpu(bfa);

		 bfa_ioc_mbox_isr(&bfa->ioc);



	intr &= (__HFN_INT_ERR_EMC | __HFN_INT_ERR_LPU0 |

		__HFN_INT_ERR_LPU1 | __HFN_INT_ERR_PSS | __HFN_INT_LL_HALT);
@@ -298,7 +286,7 @@ bfa_msix_lpu_err(struct bfa_s *bfa, int vec) 
		}



		writel(intr, bfa->iocfc.bfa_regs.intr_status);

		bfa_msix_errint(bfa, intr);

		bfa_ioc_error_isr(&bfa->ioc);

	}

}
@@ -467,8 +455,8 @@ bfa_iocfc_mem_claim(struct bfa_s *bfa, struct bfa_iocfc_cfg_s *cfg, 
	 * First allocate dma memory for IOC.

	 */

	bfa_ioc_mem_claim(&bfa->ioc, dm_kva, dm_pa);

	dm_kva += bfa_ioc_meminfo();

	dm_pa  += bfa_ioc_meminfo();

	dm_kva += BFA_ROUNDUP(sizeof(struct bfi_ioc_attr_s), BFA_DMA_ALIGN_SZ);

	dm_pa  += BFA_ROUNDUP(sizeof(struct bfi_ioc_attr_s), BFA_DMA_ALIGN_SZ);



	/*

	 * Claim DMA-able memory for the request/response queues and for shadow
@@ -531,7 +519,7 @@ bfa_iocfc_mem_claim(struct bfa_s *bfa, struct bfa_iocfc_cfg_s *cfg, 
	bfa_meminfo_dma_virt(meminfo) = dm_kva;

	bfa_meminfo_dma_phys(meminfo) = dm_pa;



	dbgsz = bfa_ioc_debug_trcsz(bfa_auto_recover);

	dbgsz = (bfa_auto_recover) ? BFA_DBG_FWTRC_LEN : 0;

	if (dbgsz > 0) {

		bfa_ioc_debug_memclaim(&bfa->ioc, bfa_meminfo_kva(meminfo));

		bfa_meminfo_kva(meminfo) += dbgsz;
@@ -723,11 +711,11 @@ bfa_iocfc_meminfo(struct bfa_iocfc_cfg_s *cfg, u32 *km_len, 
		  u32 *dm_len)

{

	/* dma memory for IOC */

	*dm_len += bfa_ioc_meminfo();

	*dm_len += BFA_ROUNDUP(sizeof(struct bfi_ioc_attr_s), BFA_DMA_ALIGN_SZ);



	bfa_iocfc_fw_cfg_sz(cfg, dm_len);

	bfa_iocfc_cqs_sz(cfg, dm_len);

	*km_len += bfa_ioc_debug_trcsz(bfa_auto_recover);

	*km_len += (bfa_auto_recover) ? BFA_DBG_FWTRC_LEN : 0;

}



/*
@@ -759,22 +747,13 @@ bfa_iocfc_attach(struct bfa_s *bfa, void *bfad, struct bfa_iocfc_cfg_s *cfg, 


	bfa_iocfc_init_mem(bfa, bfad, cfg, pcidev);

	bfa_iocfc_mem_claim(bfa, cfg, meminfo);

	bfa_timer_init(&bfa->timer_mod);

	INIT_LIST_HEAD(&bfa->timer_mod.timer_q);



	INIT_LIST_HEAD(&bfa->comp_q);

	for (i = 0; i < BFI_IOC_MAX_CQS; i++)

		INIT_LIST_HEAD(&bfa->reqq_waitq[i]);

}



/*

 * Query IOC memory requirement information.

 */

void

bfa_iocfc_detach(struct bfa_s *bfa)

{

	bfa_ioc_detach(&bfa->ioc);

}



/*

 * Query IOC memory requirement information.

 */
@@ -1090,79 +1069,7 @@ bfa_detach(struct bfa_s *bfa) 


	for (i = 0; hal_mods[i]; i++)

		hal_mods[i]->detach(bfa);



	bfa_iocfc_detach(bfa);

}





void

bfa_init_trc(struct bfa_s *bfa, struct bfa_trc_mod_s *trcmod)

{

	bfa->trcmod = trcmod;

}



void

bfa_init_plog(struct bfa_s *bfa, struct bfa_plog_s *plog)

{

	bfa->plog = plog;

}



/*

 * Initialize IOC.

 *

 * This function will return immediately, when the IOC initialization is

 * completed, the bfa_cb_init() will be called.

 *

 * @param[in]	bfa	instance

 *

 * @return void

 *

 * Special Considerations:

 *

 * @note

 * When this function returns, the driver should register the interrupt service

 * routine(s) and enable the device interrupts. If this is not done,

 * bfa_cb_init() will never get called

 */

void

bfa_init(struct bfa_s *bfa)

{

	bfa_iocfc_init(bfa);

}



/*

 * Use this function initiate the IOC configuration setup. This function

 * will return immediately.

 *

 * @param[in]	bfa	instance

 *

 * @return None

 */

void

bfa_start(struct bfa_s *bfa)

{

	bfa_iocfc_start(bfa);

}



/*

 * Use this function quiese the IOC. This function will return immediately,

 * when the IOC is actually stopped, the bfad->comp will be set.

 *

 * @param[in]bfa - pointer to bfa_t.

 *

 * @return None

 *

 * Special Considerations:

 * bfad->comp can be set before or after bfa_stop() returns.

 *

 * @note

 * In case of any failure, we could handle it automatically by doing a

 * reset and then succeed the bfa_stop() call.

 */

void

bfa_stop(struct bfa_s *bfa)

{

	bfa_iocfc_stop(bfa);

	bfa_ioc_detach(&bfa->ioc);

}



void
@@ -1198,20 +1105,6 @@ bfa_comp_free(struct bfa_s *bfa, struct list_head *comp_q) 
	}

}



void

bfa_attach_fcs(struct bfa_s *bfa)

{

	bfa->fcs = BFA_TRUE;

}



/*

 * Periodic timer heart beat from driver

 */

void

bfa_timer_tick(struct bfa_s *bfa)

{

	bfa_timer_beat(&bfa->timer_mod);

}



/*

 * Return the list of PCI vendor/device id lists supported by this
@@ -1282,51 +1175,3 @@ bfa_cfg_get_min(struct bfa_iocfc_cfg_s *cfg) 
	cfg->drvcfg.num_rspq_elems = BFA_RSPQ_NELEMS_MIN;

	cfg->drvcfg.min_cfg	   = BFA_TRUE;

}
 


void

bfa_get_attr(struct bfa_s *bfa, struct bfa_ioc_attr_s *ioc_attr)

{

	bfa_ioc_get_attr(&bfa->ioc, ioc_attr);

}



/*

 * Retrieve firmware trace information on IOC failure.

 */

bfa_status_t

bfa_debug_fwsave(struct bfa_s *bfa, void *trcdata, int *trclen)

{

	return bfa_ioc_debug_fwsave(&bfa->ioc, trcdata, trclen);

}



/*

 * Fetch firmware trace data.

 *

 * @param[in]		bfa			BFA instance

 * @param[out]		trcdata		Firmware trace buffer

 * @param[in,out]	trclen		Firmware trace buffer len

 *

 * @retval BFA_STATUS_OK			Firmware trace is fetched.

 * @retval BFA_STATUS_INPROGRESS	Firmware trace fetch is in progress.

 */

bfa_status_t

bfa_debug_fwtrc(struct bfa_s *bfa, void *trcdata, int *trclen)

{

	return bfa_ioc_debug_fwtrc(&bfa->ioc, trcdata, trclen);

}



/*

 * Dump firmware memory.

 *

 * @param[in]		bfa		BFA instance

 * @param[out]		buf		buffer for dump

 * @param[in,out]	offset		smem offset to start read

 * @param[in,out]	buflen		length of buffer

 *

 * @retval BFA_STATUS_OK		Firmware memory is dumped.

 * @retval BFA_STATUS_INPROGRESS	Firmware memory dump is in progress.

 */

bfa_status_t

bfa_debug_fwcore(struct bfa_s *bfa, void *buf, u32 *offset, int *buflen)

{

	return bfa_ioc_debug_fwcore(&bfa->ioc, buf, offset, buflen);

}

drivers/scsi/bfa/bfa_fcpim.c

+1 −1
Original line number Diff line number Diff line
@@ -2567,7 +2567,7 @@ bfa_ioim_notify_cleanup(struct bfa_ioim_s *ioim) 
		}

		bfa_itnim_iodone(ioim->itnim);

	} else

		bfa_tskim_iodone(ioim->iosp->tskim);

		bfa_wc_down(&ioim->iosp->tskim->wc);

}



static bfa_boolean_t

drivers/scsi/bfa/bfa_fcs.c

+27 −145
Original line number Diff line number Diff line
@@ -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
@@ -138,22 +130,6 @@ bfa_fcs_driver_info_init(struct bfa_fcs_s *fcs, 
	bfa_fcs_fabric_psymb_init(&fcs->fabric);

}



/*

 *	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.
@@ -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);

	}
@@ -1038,23 +971,6 @@ bfa_fcs_fabric_modstart(struct bfa_fcs_s *fcs) 
	bfa_sm_send_event(fabric, BFA_FCS_FABRIC_SM_START);

}



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.
@@ -1115,28 +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);

}



/*

 * Lookup for a vport withing a fabric given its pwwn
@@ -1156,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.
@@ -1187,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];
@@ -1344,7 +1226,7 @@ bfa_fcs_fabric_send_flogi_acc(struct bfa_fcs_fabric_s *fabric) 
				    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);

drivers/scsi/bfa/bfa_fcs.h

+72 −15
Original line number Diff line number Diff line
@@ -26,6 +26,21 @@ 


#define BFA_FCS_OS_STR_LEN		64



/*

 *  lps_pvt BFA LPS private functions

 */



enum bfa_lps_event {

	BFA_LPS_SM_LOGIN	= 1,	/* login request from user      */

	BFA_LPS_SM_LOGOUT	= 2,	/* logout request from user     */

	BFA_LPS_SM_FWRSP	= 3,	/* f/w response to login/logout */

	BFA_LPS_SM_RESUME	= 4,	/* space present in reqq queue  */

	BFA_LPS_SM_DELETE	= 5,	/* lps delete from user         */

	BFA_LPS_SM_OFFLINE	= 6,	/* Link is offline              */

	BFA_LPS_SM_RX_CVL	= 7,	/* Rx clear virtual link        */

};





/*

 * !!! Only append to the enums defined here to avoid any versioning

 * !!! needed between trace utility and driver version
@@ -41,7 +56,6 @@ enum { 
struct bfa_fcs_s;



#define __fcs_min_cfg(__fcs)       ((__fcs)->min_cfg)

void bfa_fcs_modexit_comp(struct bfa_fcs_s *fcs);



#define BFA_FCS_BRCD_SWITCH_OUI  0x051e

#define N2N_LOCAL_PID	    0x010000
@@ -444,9 +458,6 @@ void bfa_fcs_rport_scn(struct bfa_fcs_rport_s *rport); 


struct bfa_fcs_rport_s *bfa_fcs_rport_create(struct bfa_fcs_lport_s *port,

	 u32 pid);

void bfa_fcs_rport_delete(struct bfa_fcs_rport_s *rport);

void bfa_fcs_rport_online(struct bfa_fcs_rport_s *rport);

void bfa_fcs_rport_offline(struct bfa_fcs_rport_s *rport);

void bfa_fcs_rport_start(struct bfa_fcs_lport_s *port, struct fchs_s *rx_fchs,

			 struct fc_logi_s *plogi_rsp);

void bfa_fcs_rport_plogi_create(struct bfa_fcs_lport_s *port,
@@ -454,10 +465,8 @@ void bfa_fcs_rport_plogi_create(struct bfa_fcs_lport_s *port, 
				struct fc_logi_s *plogi);

void bfa_fcs_rport_plogi(struct bfa_fcs_rport_s *rport, struct fchs_s *fchs,

			 struct fc_logi_s *plogi);

void bfa_fcs_rport_logo_imp(struct bfa_fcs_rport_s *rport);

void bfa_fcs_rport_prlo(struct bfa_fcs_rport_s *rport, __be16 ox_id);



void bfa_fcs_rport_itnim_ack(struct bfa_fcs_rport_s *rport);

void bfa_fcs_rport_itntm_ack(struct bfa_fcs_rport_s *rport);

void bfa_fcs_rport_fcptm_offline_done(struct bfa_fcs_rport_s *rport);

int  bfa_fcs_rport_get_state(struct bfa_fcs_rport_s *rport);
@@ -647,6 +656,57 @@ struct bfa_fcs_s { 
	struct bfa_wc_s		wc;	/*  waiting counter */

};



/*

 *  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       */

};



/*

 *  fcs_rport_sm FCS rport state machine events

 */



enum rport_event {

	RPSM_EVENT_PLOGI_SEND   = 1,    /*  new rport; start with PLOGI */

	RPSM_EVENT_PLOGI_RCVD   = 2,    /*  Inbound PLOGI from remote port */

	RPSM_EVENT_PLOGI_COMP   = 3,    /*  PLOGI completed to rport    */

	RPSM_EVENT_LOGO_RCVD    = 4,    /*  LOGO from remote device     */

	RPSM_EVENT_LOGO_IMP     = 5,    /*  implicit logo for SLER      */

	RPSM_EVENT_FCXP_SENT    = 6,    /*  Frame from has been sent    */

	RPSM_EVENT_DELETE       = 7,    /*  RPORT delete request        */

	RPSM_EVENT_SCN          = 8,    /*  state change notification   */

	RPSM_EVENT_ACCEPTED     = 9,    /*  Good response from remote device */

	RPSM_EVENT_FAILED       = 10,   /*  Request to rport failed.    */

	RPSM_EVENT_TIMEOUT      = 11,   /*  Rport SM timeout event      */

	RPSM_EVENT_HCB_ONLINE  = 12,    /*  BFA rport online callback   */

	RPSM_EVENT_HCB_OFFLINE = 13,    /*  BFA rport offline callback  */

	RPSM_EVENT_FC4_OFFLINE = 14,    /*  FC-4 offline complete       */

	RPSM_EVENT_ADDRESS_CHANGE = 15, /*  Rport's PID has changed     */

	RPSM_EVENT_ADDRESS_DISC = 16,   /*  Need to Discover rport's PID */

	RPSM_EVENT_PRLO_RCVD   = 17,    /*  PRLO from remote device     */

	RPSM_EVENT_PLOGI_RETRY = 18,    /*  Retry PLOGI continously */

};



/*

 * bfa fcs API functions

 */
@@ -656,16 +716,12 @@ void bfa_fcs_attach(struct bfa_fcs_s *fcs, struct bfa_s *bfa, 
void bfa_fcs_init(struct bfa_fcs_s *fcs);

void bfa_fcs_driver_info_init(struct bfa_fcs_s *fcs,

			      struct bfa_fcs_driver_info_s *driver_info);

void bfa_fcs_set_fdmi_param(struct bfa_fcs_s *fcs, bfa_boolean_t fdmi_enable);

void bfa_fcs_exit(struct bfa_fcs_s *fcs);

void bfa_fcs_trc_init(struct bfa_fcs_s *fcs, struct bfa_trc_mod_s *trcmod);

void		bfa_fcs_start(struct bfa_fcs_s *fcs);



/*

 * bfa fcs vf public functions

 */

bfa_fcs_vf_t *bfa_fcs_vf_lookup(struct bfa_fcs_s *fcs, u16 vf_id);

u16 bfa_fcs_fabric_vport_count(struct bfa_fcs_fabric_s *fabric);



/*

 * fabric protected interface functions
@@ -679,22 +735,23 @@ void bfa_fcs_fabric_addvport(struct bfa_fcs_fabric_s *fabric, 
	struct bfa_fcs_vport_s *vport);

void bfa_fcs_fabric_delvport(struct bfa_fcs_fabric_s *fabric,

	struct bfa_fcs_vport_s *vport);

int bfa_fcs_fabric_is_online(struct bfa_fcs_fabric_s *fabric);

struct bfa_fcs_vport_s *bfa_fcs_fabric_vport_lookup(

		struct bfa_fcs_fabric_s *fabric, wwn_t pwwn);

void bfa_fcs_fabric_modstart(struct bfa_fcs_s *fcs);

void bfa_fcs_fabric_uf_recv(struct bfa_fcs_fabric_s *fabric,

		struct fchs_s *fchs, u16 len);

bfa_boolean_t	bfa_fcs_fabric_is_loopback(struct bfa_fcs_fabric_s *fabric);

bfa_boolean_t	bfa_fcs_fabric_is_auth_failed(struct bfa_fcs_fabric_s *fabric);

enum bfa_port_type bfa_fcs_fabric_port_type(struct bfa_fcs_fabric_s *fabric);

void	bfa_fcs_fabric_psymb_init(struct bfa_fcs_fabric_s *fabric);

void	bfa_fcs_fabric_port_delete_comp(struct bfa_fcs_fabric_s *fabric);

void bfa_fcs_fabric_set_fabric_name(struct bfa_fcs_fabric_s *fabric,

	       wwn_t fabric_name);

u16 bfa_fcs_fabric_get_switch_oui(struct bfa_fcs_fabric_s *fabric);

void bfa_fcs_uf_attach(struct bfa_fcs_s *fcs);

void bfa_fcs_port_attach(struct bfa_fcs_s *fcs);

void bfa_fcs_fabric_sm_online(struct bfa_fcs_fabric_s *fabric,

			enum bfa_fcs_fabric_event event);

void bfa_fcs_fabric_sm_loopback(struct bfa_fcs_fabric_s *fabric,

			enum bfa_fcs_fabric_event event);

void bfa_fcs_fabric_sm_auth_failed(struct bfa_fcs_fabric_s *fabric,

			enum bfa_fcs_fabric_event event);



/*

 * BFA FCS callback interfaces