Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a18b167 authored by Jing Huang's avatar Jing Huang Committed by James Bottomley
Browse files

[SCSI] bfa: remove os wrapper and unused functions 



This patch removes os wrapper and unused functions.
bfa_os_assign(), bfa_os_memset(), bfa_os_memcpy(), bfa_os_udelay()
bfa_os_vsprintf(), bfa_os_snprintf(), and bfa_os_get_clock() are replaced with
direct assignment or native linux functions. Some unused functions related to VF
(Vitual fabric) are also removed.

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

drivers/scsi/bfa/bfa_core.c

+4 −4
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ bfa_iocfc_init_mem(struct bfa_s *bfa, void *bfad, struct bfa_iocfc_cfg_s *cfg, 
	iocfc->bfa = bfa;

	iocfc->action = BFA_IOCFC_ACT_NONE;



	bfa_os_assign(iocfc->cfg, *cfg);

	iocfc->cfg = *cfg;



	/**

	 * Initialize chip specific handlers.
@@ -503,13 +503,13 @@ bfa_iocfc_mem_claim(struct bfa_s *bfa, struct bfa_iocfc_cfg_s *cfg, 
	for (i = 0; i < cfg->fwcfg.num_cqs; i++) {

		iocfc->req_cq_ba[i].kva = dm_kva;

		iocfc->req_cq_ba[i].pa = dm_pa;

		bfa_os_memset(dm_kva, 0, per_reqq_sz);

		memset(dm_kva, 0, per_reqq_sz);

		dm_kva += per_reqq_sz;

		dm_pa += per_reqq_sz;



		iocfc->rsp_cq_ba[i].kva = dm_kva;

		iocfc->rsp_cq_ba[i].pa = dm_pa;

		bfa_os_memset(dm_kva, 0, per_rspq_sz);

		memset(dm_kva, 0, per_rspq_sz);

		dm_kva += per_rspq_sz;

		dm_pa += per_rspq_sz;

	}
@@ -1038,7 +1038,7 @@ bfa_cfg_get_meminfo(struct bfa_iocfc_cfg_s *cfg, struct bfa_meminfo_s *meminfo) 


	bfa_assert((cfg != NULL) && (meminfo != NULL));



	bfa_os_memset((void *)meminfo, 0, sizeof(struct bfa_meminfo_s));

	memset((void *)meminfo, 0, sizeof(struct bfa_meminfo_s));

	meminfo->meminfo[BFA_MEM_TYPE_KVA - 1].mem_type =

		BFA_MEM_TYPE_KVA;

	meminfo->meminfo[BFA_MEM_TYPE_DMA - 1].mem_type =

drivers/scsi/bfa/bfa_fcbuild.c

+51 −51
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ fcbuild_init(void) 
static void

fc_gs_fchdr_build(struct fchs_s *fchs, u32 d_id, u32 s_id, u32 ox_id)

{

	bfa_os_memset(fchs, 0, sizeof(struct fchs_s));

	memset(fchs, 0, sizeof(struct fchs_s));



	fchs->routing = FC_RTG_FC4_DEV_DATA;

	fchs->cat_info = FC_CAT_UNSOLICIT_CTRL;
@@ -159,7 +159,7 @@ fc_gs_fchdr_build(struct fchs_s *fchs, u32 d_id, u32 s_id, u32 ox_id) 
void

fc_els_req_build(struct fchs_s *fchs, u32 d_id, u32 s_id, u16 ox_id)

{

	bfa_os_memcpy(fchs, &fc_els_req_tmpl, sizeof(struct fchs_s));

	memcpy(fchs, &fc_els_req_tmpl, sizeof(struct fchs_s));

	fchs->d_id = (d_id);

	fchs->s_id = (s_id);

	fchs->ox_id = bfa_os_htons(ox_id);
@@ -168,7 +168,7 @@ fc_els_req_build(struct fchs_s *fchs, u32 d_id, u32 s_id, u16 ox_id) 
static void

fc_els_rsp_build(struct fchs_s *fchs, u32 d_id, u32 s_id, u16 ox_id)

{

	bfa_os_memcpy(fchs, &fc_els_rsp_tmpl, sizeof(struct fchs_s));

	memcpy(fchs, &fc_els_rsp_tmpl, sizeof(struct fchs_s));

	fchs->d_id = d_id;

	fchs->s_id = s_id;

	fchs->ox_id = ox_id;
@@ -198,7 +198,7 @@ fc_els_rsp_parse(struct fchs_s *fchs, int len) 
static void

fc_bls_rsp_build(struct fchs_s *fchs, u32 d_id, u32 s_id, u16 ox_id)

{

	bfa_os_memcpy(fchs, &fc_bls_rsp_tmpl, sizeof(struct fchs_s));

	memcpy(fchs, &fc_bls_rsp_tmpl, sizeof(struct fchs_s));

	fchs->d_id = d_id;

	fchs->s_id = s_id;

	fchs->ox_id = ox_id;
@@ -211,7 +211,7 @@ fc_plogi_x_build(struct fchs_s *fchs, void *pld, u32 d_id, u32 s_id, 
{

	struct fc_logi_s *plogi = (struct fc_logi_s *) (pld);



	bfa_os_memcpy(plogi, &plogi_tmpl, sizeof(struct fc_logi_s));

	memcpy(plogi, &plogi_tmpl, sizeof(struct fc_logi_s));



	plogi->els_cmd.els_code = els_code;

	if (els_code == FC_ELS_PLOGI)
@@ -221,8 +221,8 @@ fc_plogi_x_build(struct fchs_s *fchs, void *pld, u32 d_id, u32 s_id, 


	plogi->csp.rxsz = plogi->class3.rxsz = bfa_os_htons(pdu_size);



	bfa_os_memcpy(&plogi->port_name, &port_name, sizeof(wwn_t));

	bfa_os_memcpy(&plogi->node_name, &node_name, sizeof(wwn_t));

	memcpy(&plogi->port_name, &port_name, sizeof(wwn_t));

	memcpy(&plogi->node_name, &node_name, sizeof(wwn_t));



	return sizeof(struct fc_logi_s);

}
@@ -235,7 +235,7 @@ fc_flogi_build(struct fchs_s *fchs, struct fc_logi_s *flogi, u32 s_id, 
	u32        d_id = bfa_os_hton3b(FC_FABRIC_PORT);

	u32	*vvl_info;



	bfa_os_memcpy(flogi, &plogi_tmpl, sizeof(struct fc_logi_s));

	memcpy(flogi, &plogi_tmpl, sizeof(struct fc_logi_s));



	flogi->els_cmd.els_code = FC_ELS_FLOGI;

	fc_els_req_build(fchs, d_id, s_id, ox_id);
@@ -272,7 +272,7 @@ fc_flogi_acc_build(struct fchs_s *fchs, struct fc_logi_s *flogi, u32 s_id, 
{

	u32        d_id = 0;



	bfa_os_memcpy(flogi, &plogi_tmpl, sizeof(struct fc_logi_s));

	memcpy(flogi, &plogi_tmpl, sizeof(struct fc_logi_s));

	fc_els_rsp_build(fchs, d_id, s_id, ox_id);



	flogi->els_cmd.els_code = FC_ELS_ACC;
@@ -291,7 +291,7 @@ fc_fdisc_build(struct fchs_s *fchs, struct fc_logi_s *flogi, u32 s_id, 
{

	u32        d_id = bfa_os_hton3b(FC_FABRIC_PORT);



	bfa_os_memcpy(flogi, &plogi_tmpl, sizeof(struct fc_logi_s));

	memcpy(flogi, &plogi_tmpl, sizeof(struct fc_logi_s));



	flogi->els_cmd.els_code = FC_ELS_FDISC;

	fc_els_req_build(fchs, d_id, s_id, ox_id);
@@ -378,7 +378,7 @@ fc_prli_build(struct fchs_s *fchs, void *pld, u32 d_id, u32 s_id, 
	struct fc_prli_s *prli = (struct fc_prli_s *) (pld);



	fc_els_req_build(fchs, d_id, s_id, ox_id);

	bfa_os_memcpy(prli, &prli_tmpl, sizeof(struct fc_prli_s));

	memcpy(prli, &prli_tmpl, sizeof(struct fc_prli_s));



	prli->command = FC_ELS_PRLI;

	prli->parampage.servparams.initiator     = 1;
@@ -397,7 +397,7 @@ fc_prli_acc_build(struct fchs_s *fchs, void *pld, u32 d_id, u32 s_id, 
	struct fc_prli_s *prli = (struct fc_prli_s *) (pld);



	fc_els_rsp_build(fchs, d_id, s_id, ox_id);

	bfa_os_memcpy(prli, &prli_tmpl, sizeof(struct fc_prli_s));

	memcpy(prli, &prli_tmpl, sizeof(struct fc_prli_s));



	prli->command = FC_ELS_ACC;
@@ -448,7 +448,7 @@ fc_logo_build(struct fchs_s *fchs, struct fc_logo_s *logo, u32 d_id, u32 s_id, 
{

	fc_els_req_build(fchs, d_id, s_id, ox_id);



	bfa_os_memset(logo, '\0', sizeof(struct fc_logo_s));

	memset(logo, '\0', sizeof(struct fc_logo_s));

	logo->els_cmd.els_code = FC_ELS_LOGO;

	logo->nport_id = (s_id);

	logo->orig_port_name = port_name;
@@ -461,7 +461,7 @@ fc_adisc_x_build(struct fchs_s *fchs, struct fc_adisc_s *adisc, u32 d_id, 
		 u32 s_id, u16 ox_id, wwn_t port_name,

		 wwn_t node_name, u8 els_code)

{

	bfa_os_memset(adisc, '\0', sizeof(struct fc_adisc_s));

	memset(adisc, '\0', sizeof(struct fc_adisc_s));



	adisc->els_cmd.els_code = els_code;
@@ -554,7 +554,7 @@ fc_pdisc_parse(struct fchs_s *fchs, wwn_t node_name, wwn_t port_name) 
u16

fc_abts_build(struct fchs_s *fchs, u32 d_id, u32 s_id, u16 ox_id)

{

	bfa_os_memcpy(fchs, &fc_bls_req_tmpl, sizeof(struct fchs_s));

	memcpy(fchs, &fc_bls_req_tmpl, sizeof(struct fchs_s));

	fchs->cat_info = FC_CAT_ABTS;

	fchs->d_id = (d_id);

	fchs->s_id = (s_id);
@@ -582,7 +582,7 @@ fc_rrq_build(struct fchs_s *fchs, struct fc_rrq_s *rrq, u32 d_id, u32 s_id, 
	/*

	 * build rrq payload

	 */

	bfa_os_memcpy(rrq, &rrq_tmpl, sizeof(struct fc_rrq_s));

	memcpy(rrq, &rrq_tmpl, sizeof(struct fc_rrq_s));

	rrq->s_id = (s_id);

	rrq->ox_id = bfa_os_htons(rrq_oxid);

	rrq->rx_id = FC_RXID_ANY;
@@ -598,7 +598,7 @@ fc_logo_acc_build(struct fchs_s *fchs, void *pld, u32 d_id, u32 s_id, 


	fc_els_rsp_build(fchs, d_id, s_id, ox_id);



	bfa_os_memset(acc, 0, sizeof(struct fc_els_cmd_s));

	memset(acc, 0, sizeof(struct fc_els_cmd_s));

	acc->els_code = FC_ELS_ACC;



	return sizeof(struct fc_els_cmd_s);
@@ -610,7 +610,7 @@ fc_ls_rjt_build(struct fchs_s *fchs, struct fc_ls_rjt_s *ls_rjt, u32 d_id, 
		u8 reason_code_expl)

{

	fc_els_rsp_build(fchs, d_id, s_id, ox_id);

	bfa_os_memset(ls_rjt, 0, sizeof(struct fc_ls_rjt_s));

	memset(ls_rjt, 0, sizeof(struct fc_ls_rjt_s));



	ls_rjt->els_cmd.els_code = FC_ELS_LS_RJT;

	ls_rjt->reason_code = reason_code;
@@ -626,7 +626,7 @@ fc_ba_acc_build(struct fchs_s *fchs, struct fc_ba_acc_s *ba_acc, u32 d_id, 
{

	fc_bls_rsp_build(fchs, d_id, s_id, ox_id);



	bfa_os_memcpy(ba_acc, &ba_acc_tmpl, sizeof(struct fc_ba_acc_s));

	memcpy(ba_acc, &ba_acc_tmpl, sizeof(struct fc_ba_acc_s));



	fchs->rx_id = rx_id;
@@ -641,7 +641,7 @@ fc_ls_acc_build(struct fchs_s *fchs, struct fc_els_cmd_s *els_cmd, u32 d_id, 
		u32 s_id, u16 ox_id)

{

	fc_els_rsp_build(fchs, d_id, s_id, ox_id);

	bfa_os_memset(els_cmd, 0, sizeof(struct fc_els_cmd_s));

	memset(els_cmd, 0, sizeof(struct fc_els_cmd_s));

	els_cmd->els_code = FC_ELS_ACC;



	return sizeof(struct fc_els_cmd_s);
@@ -672,7 +672,7 @@ fc_tprlo_acc_build(struct fchs_s *fchs, struct fc_tprlo_acc_s *tprlo_acc, 


	fc_els_rsp_build(fchs, d_id, s_id, ox_id);



	bfa_os_memset(tprlo_acc, 0, (num_pages * 16) + 4);

	memset(tprlo_acc, 0, (num_pages * 16) + 4);

	tprlo_acc->command = FC_ELS_ACC;



	tprlo_acc->page_len = 0x10;
@@ -696,7 +696,7 @@ fc_prlo_acc_build(struct fchs_s *fchs, struct fc_prlo_acc_s *prlo_acc, u32 d_id, 


	fc_els_rsp_build(fchs, d_id, s_id, ox_id);



	bfa_os_memset(prlo_acc, 0, (num_pages * 16) + 4);

	memset(prlo_acc, 0, (num_pages * 16) + 4);

	prlo_acc->command = FC_ELS_ACC;

	prlo_acc->page_len = 0x10;

	prlo_acc->payload_len = bfa_os_htons((num_pages * 16) + 4);
@@ -718,7 +718,7 @@ fc_rnid_build(struct fchs_s *fchs, struct fc_rnid_cmd_s *rnid, u32 d_id, 
{

	fc_els_req_build(fchs, d_id, s_id, ox_id);



	bfa_os_memset(rnid, 0, sizeof(struct fc_rnid_cmd_s));

	memset(rnid, 0, sizeof(struct fc_rnid_cmd_s));



	rnid->els_cmd.els_code = FC_ELS_RNID;

	rnid->node_id_data_format = data_format;
@@ -732,7 +732,7 @@ fc_rnid_acc_build(struct fchs_s *fchs, struct fc_rnid_acc_s *rnid_acc, u32 d_id, 
		  struct fc_rnid_common_id_data_s *common_id_data,

		  struct fc_rnid_general_topology_data_s *gen_topo_data)

{

	bfa_os_memset(rnid_acc, 0, sizeof(struct fc_rnid_acc_s));

	memset(rnid_acc, 0, sizeof(struct fc_rnid_acc_s));



	fc_els_rsp_build(fchs, d_id, s_id, ox_id);
@@ -745,7 +745,7 @@ fc_rnid_acc_build(struct fchs_s *fchs, struct fc_rnid_acc_s *rnid_acc, u32 d_id, 
	if (data_format == RNID_NODEID_DATA_FORMAT_DISCOVERY) {

		rnid_acc->specific_id_data_length =

			sizeof(struct fc_rnid_general_topology_data_s);

		bfa_os_assign(rnid_acc->gen_topology_data, *gen_topo_data);

		rnid_acc->gen_topology_data = *gen_topo_data;

		return sizeof(struct fc_rnid_acc_s);

	} else {

		return sizeof(struct fc_rnid_acc_s) -
@@ -760,7 +760,7 @@ fc_rpsc_build(struct fchs_s *fchs, struct fc_rpsc_cmd_s *rpsc, u32 d_id, 
{

	fc_els_req_build(fchs, d_id, s_id, ox_id);



	bfa_os_memset(rpsc, 0, sizeof(struct fc_rpsc_cmd_s));

	memset(rpsc, 0, sizeof(struct fc_rpsc_cmd_s));



	rpsc->els_cmd.els_code = FC_ELS_RPSC;

	return sizeof(struct fc_rpsc_cmd_s);
@@ -775,7 +775,7 @@ fc_rpsc2_build(struct fchs_s *fchs, struct fc_rpsc2_cmd_s *rpsc2, u32 d_id, 


	fc_els_req_build(fchs, bfa_os_hton3b(dctlr_id), s_id, 0);



	bfa_os_memset(rpsc2, 0, sizeof(struct fc_rpsc2_cmd_s));

	memset(rpsc2, 0, sizeof(struct fc_rpsc2_cmd_s));



	rpsc2->els_cmd.els_code = FC_ELS_RPSC;

	rpsc2->token = bfa_os_htonl(FC_BRCD_TOKEN);
@@ -791,7 +791,7 @@ fc_rpsc_acc_build(struct fchs_s *fchs, struct fc_rpsc_acc_s *rpsc_acc, 
		u32 d_id, u32 s_id, u16 ox_id,

		  struct fc_rpsc_speed_info_s *oper_speed)

{

	bfa_os_memset(rpsc_acc, 0, sizeof(struct fc_rpsc_acc_s));

	memset(rpsc_acc, 0, sizeof(struct fc_rpsc_acc_s));



	fc_els_rsp_build(fchs, d_id, s_id, ox_id);
@@ -830,7 +830,7 @@ fc_pdisc_build(struct fchs_s *fchs, u32 d_id, u32 s_id, u16 ox_id, 
{

	struct fc_logi_s *pdisc = (struct fc_logi_s *) (fchs + 1);



	bfa_os_memcpy(pdisc, &plogi_tmpl, sizeof(struct fc_logi_s));

	memcpy(pdisc, &plogi_tmpl, sizeof(struct fc_logi_s));



	pdisc->els_cmd.els_code = FC_ELS_PDISC;

	fc_els_req_build(fchs, d_id, s_id, ox_id);
@@ -873,7 +873,7 @@ fc_prlo_build(struct fchs_s *fchs, u32 d_id, u32 s_id, u16 ox_id, 
	int             page;



	fc_els_req_build(fchs, d_id, s_id, ox_id);

	bfa_os_memset(prlo, 0, (num_pages * 16) + 4);

	memset(prlo, 0, (num_pages * 16) + 4);

	prlo->command = FC_ELS_PRLO;

	prlo->page_len = 0x10;

	prlo->payload_len = bfa_os_htons((num_pages * 16) + 4);
@@ -931,7 +931,7 @@ fc_tprlo_build(struct fchs_s *fchs, u32 d_id, u32 s_id, u16 ox_id, 
	int             page;



	fc_els_req_build(fchs, d_id, s_id, ox_id);

	bfa_os_memset(tprlo, 0, (num_pages * 16) + 4);

	memset(tprlo, 0, (num_pages * 16) + 4);

	tprlo->command = FC_ELS_TPRLO;

	tprlo->page_len = 0x10;

	tprlo->payload_len = bfa_os_htons((num_pages * 16) + 4);
@@ -1011,7 +1011,7 @@ fc_ba_rjt_build(struct fchs_s *fchs, u32 d_id, u32 s_id, u16 ox_id, 
static void

fc_gs_cthdr_build(struct ct_hdr_s *cthdr, u32 s_id, u16 cmd_code)

{

	bfa_os_memset(cthdr, 0, sizeof(struct ct_hdr_s));

	memset(cthdr, 0, sizeof(struct ct_hdr_s));

	cthdr->rev_id = CT_GS3_REVISION;

	cthdr->gs_type = CT_GSTYPE_DIRSERVICE;

	cthdr->gs_sub_type = CT_GSSUBTYPE_NAMESERVER;
@@ -1021,7 +1021,7 @@ fc_gs_cthdr_build(struct ct_hdr_s *cthdr, u32 s_id, u16 cmd_code) 
static void

fc_gs_fdmi_cthdr_build(struct ct_hdr_s *cthdr, u32 s_id, u16 cmd_code)

{

	bfa_os_memset(cthdr, 0, sizeof(struct ct_hdr_s));

	memset(cthdr, 0, sizeof(struct ct_hdr_s));

	cthdr->rev_id = CT_GS3_REVISION;

	cthdr->gs_type = CT_GSTYPE_MGMTSERVICE;

	cthdr->gs_sub_type = CT_GSSUBTYPE_HBA_MGMTSERVER;
@@ -1032,7 +1032,7 @@ static void 
fc_gs_ms_cthdr_build(struct ct_hdr_s *cthdr, u32 s_id, u16 cmd_code,

					 u8 sub_type)

{

	bfa_os_memset(cthdr, 0, sizeof(struct ct_hdr_s));

	memset(cthdr, 0, sizeof(struct ct_hdr_s));

	cthdr->rev_id = CT_GS3_REVISION;

	cthdr->gs_type = CT_GSTYPE_MGMTSERVICE;

	cthdr->gs_sub_type = sub_type;
@@ -1050,7 +1050,7 @@ fc_gidpn_build(struct fchs_s *fchs, void *pyld, u32 s_id, u16 ox_id, 
	fc_gs_fchdr_build(fchs, d_id, s_id, ox_id);

	fc_gs_cthdr_build(cthdr, s_id, GS_GID_PN);



	bfa_os_memset(gidpn, 0, sizeof(struct fcgs_gidpn_req_s));

	memset(gidpn, 0, sizeof(struct fcgs_gidpn_req_s));

	gidpn->port_name = port_name;

	return sizeof(struct fcgs_gidpn_req_s) + sizeof(struct ct_hdr_s);

}
@@ -1066,7 +1066,7 @@ fc_gpnid_build(struct fchs_s *fchs, void *pyld, u32 s_id, u16 ox_id, 
	fc_gs_fchdr_build(fchs, d_id, s_id, ox_id);

	fc_gs_cthdr_build(cthdr, s_id, GS_GPN_ID);



	bfa_os_memset(gpnid, 0, sizeof(fcgs_gpnid_req_t));

	memset(gpnid, 0, sizeof(fcgs_gpnid_req_t));

	gpnid->dap = port_id;

	return sizeof(fcgs_gpnid_req_t) + sizeof(struct ct_hdr_s);

}
@@ -1082,7 +1082,7 @@ fc_gnnid_build(struct fchs_s *fchs, void *pyld, u32 s_id, u16 ox_id, 
	fc_gs_fchdr_build(fchs, d_id, s_id, ox_id);

	fc_gs_cthdr_build(cthdr, s_id, GS_GNN_ID);



	bfa_os_memset(gnnid, 0, sizeof(fcgs_gnnid_req_t));

	memset(gnnid, 0, sizeof(fcgs_gnnid_req_t));

	gnnid->dap = port_id;

	return sizeof(fcgs_gnnid_req_t) + sizeof(struct ct_hdr_s);

}
@@ -1108,7 +1108,7 @@ fc_scr_build(struct fchs_s *fchs, struct fc_scr_s *scr, 


	fc_els_req_build(fchs, d_id, s_id, ox_id);



	bfa_os_memset(scr, 0, sizeof(struct fc_scr_s));

	memset(scr, 0, sizeof(struct fc_scr_s));

	scr->command = FC_ELS_SCR;

	scr->reg_func = FC_SCR_REG_FUNC_FULL;

	if (set_br_reg)
@@ -1149,7 +1149,7 @@ fc_rftid_build(struct fchs_s *fchs, void *pyld, u32 s_id, u16 ox_id, 
	fc_gs_fchdr_build(fchs, d_id, s_id, ox_id);

	fc_gs_cthdr_build(cthdr, s_id, GS_RFT_ID);



	bfa_os_memset(rftid, 0, sizeof(struct fcgs_rftid_req_s));

	memset(rftid, 0, sizeof(struct fcgs_rftid_req_s));



	rftid->dap = s_id;
@@ -1172,10 +1172,10 @@ fc_rftid_build_sol(struct fchs_s *fchs, void *pyld, u32 s_id, u16 ox_id, 
	fc_gs_fchdr_build(fchs, d_id, s_id, ox_id);

	fc_gs_cthdr_build(cthdr, s_id, GS_RFT_ID);



	bfa_os_memset(rftid, 0, sizeof(struct fcgs_rftid_req_s));

	memset(rftid, 0, sizeof(struct fcgs_rftid_req_s));



	rftid->dap = s_id;

	bfa_os_memcpy((void *)rftid->fc4_type, (void *)fc4_bitmap,

	memcpy((void *)rftid->fc4_type, (void *)fc4_bitmap,

		(bitmap_size < 32 ? bitmap_size : 32));



	return sizeof(struct fcgs_rftid_req_s) + sizeof(struct ct_hdr_s);
@@ -1192,7 +1192,7 @@ fc_rffid_build(struct fchs_s *fchs, void *pyld, u32 s_id, u16 ox_id, 
	fc_gs_fchdr_build(fchs, d_id, s_id, ox_id);

	fc_gs_cthdr_build(cthdr, s_id, GS_RFF_ID);



	bfa_os_memset(rffid, 0, sizeof(struct fcgs_rffid_req_s));

	memset(rffid, 0, sizeof(struct fcgs_rffid_req_s));



	rffid->dap	    = s_id;

	rffid->fc4ftr_bits  = fc4_ftrs;
@@ -1214,7 +1214,7 @@ fc_rspnid_build(struct fchs_s *fchs, void *pyld, u32 s_id, u16 ox_id, 
	fc_gs_fchdr_build(fchs, d_id, s_id, ox_id);

	fc_gs_cthdr_build(cthdr, s_id, GS_RSPN_ID);



	bfa_os_memset(rspnid, 0, sizeof(struct fcgs_rspnid_req_s));

	memset(rspnid, 0, sizeof(struct fcgs_rspnid_req_s));



	rspnid->dap = s_id;

	rspnid->spn_len = (u8) strlen((char *)name);
@@ -1235,7 +1235,7 @@ fc_gid_ft_build(struct fchs_s *fchs, void *pyld, u32 s_id, u8 fc4_type) 


	fc_gs_cthdr_build(cthdr, s_id, GS_GID_FT);



	bfa_os_memset(gidft, 0, sizeof(struct fcgs_gidft_req_s));

	memset(gidft, 0, sizeof(struct fcgs_gidft_req_s));

	gidft->fc4_type = fc4_type;

	gidft->domain_id = 0;

	gidft->area_id = 0;
@@ -1254,7 +1254,7 @@ fc_rpnid_build(struct fchs_s *fchs, void *pyld, u32 s_id, u32 port_id, 
	fc_gs_fchdr_build(fchs, d_id, s_id, 0);

	fc_gs_cthdr_build(cthdr, s_id, GS_RPN_ID);



	bfa_os_memset(rpnid, 0, sizeof(struct fcgs_rpnid_req_s));

	memset(rpnid, 0, sizeof(struct fcgs_rpnid_req_s));

	rpnid->port_id = port_id;

	rpnid->port_name = port_name;
@@ -1272,7 +1272,7 @@ fc_rnnid_build(struct fchs_s *fchs, void *pyld, u32 s_id, u32 port_id, 
	fc_gs_fchdr_build(fchs, d_id, s_id, 0);

	fc_gs_cthdr_build(cthdr, s_id, GS_RNN_ID);



	bfa_os_memset(rnnid, 0, sizeof(struct fcgs_rnnid_req_s));

	memset(rnnid, 0, sizeof(struct fcgs_rnnid_req_s));

	rnnid->port_id = port_id;

	rnnid->node_name = node_name;
@@ -1291,7 +1291,7 @@ fc_rcsid_build(struct fchs_s *fchs, void *pyld, u32 s_id, u32 port_id, 
	fc_gs_fchdr_build(fchs, d_id, s_id, 0);

	fc_gs_cthdr_build(cthdr, s_id, GS_RCS_ID);



	bfa_os_memset(rcsid, 0, sizeof(struct fcgs_rcsid_req_s));

	memset(rcsid, 0, sizeof(struct fcgs_rcsid_req_s));

	rcsid->port_id = port_id;

	rcsid->cos = cos;
@@ -1309,7 +1309,7 @@ fc_rptid_build(struct fchs_s *fchs, void *pyld, u32 s_id, u32 port_id, 
	fc_gs_fchdr_build(fchs, d_id, s_id, 0);

	fc_gs_cthdr_build(cthdr, s_id, GS_RPT_ID);



	bfa_os_memset(rptid, 0, sizeof(struct fcgs_rptid_req_s));

	memset(rptid, 0, sizeof(struct fcgs_rptid_req_s));

	rptid->port_id = port_id;

	rptid->port_type = port_type;
@@ -1326,7 +1326,7 @@ fc_ganxt_build(struct fchs_s *fchs, void *pyld, u32 s_id, u32 port_id) 
	fc_gs_fchdr_build(fchs, d_id, s_id, 0);

	fc_gs_cthdr_build(cthdr, s_id, GS_GA_NXT);



	bfa_os_memset(ganxt, 0, sizeof(struct fcgs_ganxt_req_s));

	memset(ganxt, 0, sizeof(struct fcgs_ganxt_req_s));

	ganxt->port_id = port_id;



	return sizeof(struct ct_hdr_s) + sizeof(struct fcgs_ganxt_req_s);
@@ -1383,7 +1383,7 @@ fc_gmal_req_build(struct fchs_s *fchs, void *pyld, u32 s_id, wwn_t wwn) 
	fc_gs_ms_cthdr_build(cthdr, s_id, GS_FC_GMAL_CMD,

			CT_GSSUBTYPE_CFGSERVER);



	bfa_os_memset(gmal, 0, sizeof(fcgs_gmal_req_t));

	memset(gmal, 0, sizeof(fcgs_gmal_req_t));

	gmal->wwn = wwn;



	return sizeof(struct ct_hdr_s) + sizeof(fcgs_gmal_req_t);
@@ -1403,7 +1403,7 @@ fc_gfn_req_build(struct fchs_s *fchs, void *pyld, u32 s_id, wwn_t wwn) 
	fc_gs_ms_cthdr_build(cthdr, s_id, GS_FC_GFN_CMD,

			CT_GSSUBTYPE_CFGSERVER);



	bfa_os_memset(gfn, 0, sizeof(fcgs_gfn_req_t));

	memset(gfn, 0, sizeof(fcgs_gfn_req_t));

	gfn->wwn = wwn;



	return sizeof(struct ct_hdr_s) + sizeof(fcgs_gfn_req_t);

drivers/scsi/bfa/bfa_fcpim.c

+14 −15
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ bfa_fcpim_port_iostats(struct bfa_s *bfa, struct bfa_itnim_iostats_s *stats, 
	struct bfa_itnim_s *itnim;



	/* accumulate IO stats from itnim */

	bfa_os_memset(stats, 0, sizeof(struct bfa_itnim_iostats_s));

	memset(stats, 0, sizeof(struct bfa_itnim_iostats_s));

	list_for_each_safe(qe, qen, &fcpim->itnim_q) {

		itnim = (struct bfa_itnim_s *) qe;

		if (itnim->rport->rport_info.lp_tag != lp_tag)
@@ -480,7 +480,7 @@ bfa_fcpim_get_modstats(struct bfa_s *bfa, struct bfa_itnim_iostats_s *modstats) 
	struct bfa_itnim_s *itnim;



	/* accumulate IO stats from itnim */

	bfa_os_memset(modstats, 0, sizeof(struct bfa_itnim_iostats_s));

	memset(modstats, 0, sizeof(struct bfa_itnim_iostats_s));

	list_for_each_safe(qe, qen, &fcpim->itnim_q) {

		itnim = (struct bfa_itnim_s *) qe;

		bfa_fcpim_add_stats(modstats, &(itnim->stats));
@@ -560,7 +560,7 @@ bfa_fcpim_clr_modstats(struct bfa_s *bfa) 
		itnim = (struct bfa_itnim_s *) qe;

		bfa_itnim_clear_stats(itnim);

	}

	bfa_os_memset(&fcpim->del_itn_stats, 0,

	memset(&fcpim->del_itn_stats, 0,

		sizeof(struct bfa_fcpim_del_itn_stats_s));



	return BFA_STATUS_OK;
@@ -1229,7 +1229,7 @@ bfa_itnim_attach(struct bfa_fcpim_mod_s *fcpim, struct bfa_meminfo_s *minfo) 
	fcpim->itnim_arr = itnim;



	for (i = 0; i < fcpim->num_itnims; i++, itnim++) {

		bfa_os_memset(itnim, 0, sizeof(struct bfa_itnim_s));

		memset(itnim, 0, sizeof(struct bfa_itnim_s));

		itnim->bfa = bfa;

		itnim->fcpim = fcpim;

		itnim->reqq = BFA_REQQ_QOS_LO;
@@ -1597,8 +1597,8 @@ void 
bfa_itnim_clear_stats(struct bfa_itnim_s *itnim)

{

	int j;

	bfa_os_memset(&itnim->stats, 0, sizeof(itnim->stats));

	bfa_os_memset(&itnim->ioprofile, 0, sizeof(itnim->ioprofile));

	memset(&itnim->stats, 0, sizeof(itnim->stats));

	memset(&itnim->ioprofile, 0, sizeof(itnim->ioprofile));

	for (j = 0; j < BFA_IOBUCKET_MAX; j++)

		itnim->ioprofile.io_latency.min[j] = ~0;

}
@@ -2390,11 +2390,10 @@ bfa_ioim_send_ioreq(struct bfa_ioim_s *ioim) 
	/**

	 * set up I/O command parameters

	 */

	bfa_os_assign(m->cmnd, cmnd_z0);

	m->cmnd = cmnd_z0;

	m->cmnd.lun = bfa_cb_ioim_get_lun(ioim->dio);

	m->cmnd.iodir = bfa_cb_ioim_get_iodir(ioim->dio);

	bfa_os_assign(m->cmnd.cdb,

			*(scsi_cdb_t *)bfa_cb_ioim_get_cdb(ioim->dio));

	m->cmnd.cdb = *(scsi_cdb_t *)bfa_cb_ioim_get_cdb(ioim->dio);

	fcp_dl = bfa_cb_ioim_get_size(ioim->dio);

	m->cmnd.fcp_dl = bfa_os_htonl(fcp_dl);
@@ -2433,7 +2432,7 @@ bfa_ioim_send_ioreq(struct bfa_ioim_s *ioim) 
	m->cmnd.addl_cdb_len = (bfa_cb_ioim_get_cdblen(ioim->dio) -

					FCP_CMND_CDB_LEN) / sizeof(u32);

	if (m->cmnd.addl_cdb_len) {

		bfa_os_memcpy(&m->cmnd.cdb + 1, (scsi_cdb_t *)

		memcpy(&m->cmnd.cdb + 1, (scsi_cdb_t *)

				bfa_cb_ioim_get_cdb(ioim->dio) + 1,

				m->cmnd.addl_cdb_len * sizeof(u32));

		fcp_cmnd_fcpdl(&m->cmnd) =
@@ -2706,7 +2705,7 @@ bfa_ioim_attach(struct bfa_fcpim_mod_s *fcpim, struct bfa_meminfo_s *minfo) 
		/*

		 * initialize IOIM

		 */

		bfa_os_memset(ioim, 0, sizeof(struct bfa_ioim_s));

		memset(ioim, 0, sizeof(struct bfa_ioim_s));

		ioim->iotag   = i;

		ioim->bfa     = fcpim->bfa;

		ioim->fcpim   = fcpim;
@@ -2750,7 +2749,7 @@ bfa_ioim_isr(struct bfa_s *bfa, struct bfi_msg_s *m) 
	bfa_trc(ioim->bfa, rsp->reuse_io_tag);



	if (bfa_sm_cmp_state(ioim, bfa_ioim_sm_active))

		bfa_os_assign(ioim->iosp->comp_rspmsg, *m);

		ioim->iosp->comp_rspmsg = *m;



	switch (rsp->io_status) {

	case BFI_IOIM_STS_OK:
@@ -2837,7 +2836,7 @@ bfa_ioim_good_comp_isr(struct bfa_s *bfa, struct bfi_msg_s *m) 
void

bfa_ioim_profile_start(struct bfa_ioim_s *ioim)

{

	ioim->start_time = bfa_os_get_clock();

	ioim->start_time = jiffies;

}



void
@@ -2845,7 +2844,7 @@ bfa_ioim_profile_comp(struct bfa_ioim_s *ioim) 
{

	u32 fcp_dl = bfa_cb_ioim_get_size(ioim->dio);

	u32 index = bfa_ioim_get_index(fcp_dl);

	u64 end_time = bfa_os_get_clock();

	u64 end_time = jiffies;

	struct bfa_itnim_latency_s *io_lat =

			&(ioim->itnim->ioprofile.io_latency);

	u32 val = (u32)(end_time - ioim->start_time);
@@ -3507,7 +3506,7 @@ bfa_tskim_attach(struct bfa_fcpim_mod_s *fcpim, struct bfa_meminfo_s *minfo) 
		/*

		 * initialize TSKIM

		 */

		bfa_os_memset(tskim, 0, sizeof(struct bfa_tskim_s));

		memset(tskim, 0, sizeof(struct bfa_tskim_s));

		tskim->tsk_tag = i;

		tskim->bfa	= fcpim->bfa;

		tskim->fcpim	= fcpim;

drivers/scsi/bfa/bfa_fcs.c

+1 −198
Original line number Diff line number Diff line
@@ -978,7 +978,7 @@ bfa_fcs_fabric_attach(struct bfa_fcs_s *fcs) 
	struct bfa_fcs_fabric_s *fabric;



	fabric = &fcs->fabric;

	bfa_os_memset(fabric, 0, sizeof(struct bfa_fcs_fabric_s));

	memset(fabric, 0, sizeof(struct bfa_fcs_fabric_s));



	/**

	 * Initialize base fabric.
@@ -1417,129 +1417,6 @@ bfa_fcs_fabric_set_fabric_name(struct bfa_fcs_fabric_s *fabric, 
	}

}



/**

 *  fcs_vf_api virtual fabrics API

 */



/**

 * Enable VF mode.

 *

 * @param[in]		fcs		fcs module instance

 * @param[in]		vf_id		default vf_id of port, FC_VF_ID_NULL

 *					to use standard default vf_id of 1.

 *

 * @retval	BFA_STATUS_OK		vf mode is enabled

 * @retval	BFA_STATUS_BUSY		Port is active. Port must be disabled

 *					before VF mode can be enabled.

 */

bfa_status_t

bfa_fcs_vf_mode_enable(struct bfa_fcs_s *fcs, u16 vf_id)

{

	return BFA_STATUS_OK;

}



/**

 * Disable VF mode.

 *

 * @param[in]		fcs		fcs module instance

 *

 * @retval	BFA_STATUS_OK		vf mode is disabled

 * @retval	BFA_STATUS_BUSY		VFs are present and being used. All

 *					VFs must be deleted before disabling

 *					VF mode.

 */

bfa_status_t

bfa_fcs_vf_mode_disable(struct bfa_fcs_s *fcs)

{

	return BFA_STATUS_OK;

}



/**

 *  Create a new VF instance.

 *

 *  A new VF is created using the given VF configuration. A VF is identified

 *  by VF id. No duplicate VF creation is allowed with the same VF id. Once

 *  a VF is created, VF is automatically started after link initialization

 *  and EVFP exchange is completed.

 *

 *	param[in] vf	 -	FCS vf data structure. Memory is

 *				allocated by caller (driver)

 *	param[in] fcs	 -	FCS module

 *	param[in] vf_cfg -	VF configuration

 *	param[in] vf_drv -	Opaque handle back to the driver's

 *				virtual vf structure

 *

 *	retval BFA_STATUS_OK VF creation is successful

 *	retval BFA_STATUS_FAILED VF creation failed

 *	retval BFA_STATUS_EEXIST A VF exists with the given vf_id

 */

bfa_status_t

bfa_fcs_vf_create(bfa_fcs_vf_t *vf, struct bfa_fcs_s *fcs, u16 vf_id,

		  struct bfa_lport_cfg_s *port_cfg, struct bfad_vf_s *vf_drv)

{

	bfa_trc(fcs, vf_id);

	return BFA_STATUS_OK;

}



/**

 *	Use this function to delete a BFA VF object. VF object should

 *	be stopped before this function call.

 *

 *	param[in] vf - pointer to bfa_vf_t.

 *

 *	retval BFA_STATUS_OK	On vf deletion success

 *	retval BFA_STATUS_BUSY VF is not in a stopped state

 *	retval BFA_STATUS_INPROGRESS VF deletion in in progress

 */

bfa_status_t

bfa_fcs_vf_delete(bfa_fcs_vf_t *vf)

{

	bfa_trc(vf->fcs, vf->vf_id);

	return BFA_STATUS_OK;

}





/**

 *	Returns attributes of the given VF.

 *

 *	param[in]	vf	pointer to bfa_vf_t.

 *	param[out] vf_attr	vf attributes returned

 *

 *	return None

 */

void

bfa_fcs_vf_get_attr(bfa_fcs_vf_t *vf, struct bfa_vf_attr_s *vf_attr)

{

	bfa_trc(vf->fcs, vf->vf_id);

}



/**

 *	Return statistics associated with the given vf.

 *

 *	param[in] vf		pointer to bfa_vf_t.

 *	param[out] vf_stats	vf statistics returned

 *

 *	@return None

 */

void

bfa_fcs_vf_get_stats(bfa_fcs_vf_t *vf, struct bfa_vf_stats_s *vf_stats)

{

	bfa_os_memcpy(vf_stats, &vf->stats, sizeof(struct bfa_vf_stats_s));

}



/**

 *	clear statistics associated with the given vf.

 *

 *	param[in]	vf	pointer to bfa_vf_t.

 *

 *	@return None

 */

void

bfa_fcs_vf_clear_stats(bfa_fcs_vf_t *vf)

{

	bfa_os_memset(&vf->stats, 0, sizeof(struct bfa_vf_stats_s));

}



/**

 *	Returns FCS vf structure for a given vf_id.

 *
@@ -1558,80 +1435,6 @@ bfa_fcs_vf_lookup(struct bfa_fcs_s *fcs, u16 vf_id) 
	return NULL;

}



/**

 *	Return the list of VFs configured.

 *

 *	param[in]	fcs	fcs module instance

 *	param[out]	vf_ids	returned list of vf_ids

 *	param[in,out]	nvfs	in:size of vf_ids array,

 *				out:total elements present,

 *				actual elements returned is limited by the size

 *

 *	return Driver VF structure

 */

void

bfa_fcs_vf_list(struct bfa_fcs_s *fcs, u16 *vf_ids, int *nvfs)

{

	bfa_trc(fcs, *nvfs);

}



/**

 *	Return the list of all VFs visible from fabric.

 *

 *	param[in]	fcs	fcs module instance

 *	param[out]	vf_ids	returned list of vf_ids

 *	param[in,out]	nvfs	in:size of vf_ids array,

 *				out:total elements present,

 *				actual elements returned is limited by the size

 *

 *	return Driver VF structure

 */

void

bfa_fcs_vf_list_all(struct bfa_fcs_s *fcs, u16 *vf_ids, int *nvfs)

{

	bfa_trc(fcs, *nvfs);

}



/**

 *	Return the list of local logical ports present in the given VF.

 *

 *	param[in]	vf	vf for which logical ports are returned

 *	param[out]	lpwwn	returned logical port wwn list

 *	param[in,out]	nlports	in:size of lpwwn list;

 *				out:total elements present,

 *				actual elements returned is limited by the size

 */

void

bfa_fcs_vf_get_ports(bfa_fcs_vf_t *vf, wwn_t lpwwn[], int *nlports)

{

	struct list_head	*qe;

	struct bfa_fcs_vport_s *vport;

	int	i;

	struct bfa_fcs_s      *fcs;



	if (vf == NULL || lpwwn == NULL || *nlports == 0)

		return;



	fcs = vf->fcs;



	bfa_trc(fcs, vf->vf_id);

	bfa_trc(fcs, (u32) *nlports);



	i = 0;

	lpwwn[i++] = vf->bport.port_cfg.pwwn;



	list_for_each(qe, &vf->vport_q) {

		if (i >= *nlports)

			break;



		vport = (struct bfa_fcs_vport_s *) qe;

		lpwwn[i++] = vport->lport.port_cfg.pwwn;

	}



	bfa_trc(fcs, i);

	*nlports = i;

}



/**

 * BFA FCS PPORT ( physical port)

 */

drivers/scsi/bfa/bfa_fcs.h

+0 −13
Original line number Diff line number Diff line
@@ -680,19 +680,6 @@ void bfa_fcs_start(struct bfa_fcs_s *fcs); 
/**

 * bfa fcs vf public functions

 */

bfa_status_t bfa_fcs_vf_mode_enable(struct bfa_fcs_s *fcs, u16 vf_id);

bfa_status_t bfa_fcs_vf_mode_disable(struct bfa_fcs_s *fcs);

bfa_status_t bfa_fcs_vf_create(bfa_fcs_vf_t *vf, struct bfa_fcs_s *fcs,

			       u16 vf_id, struct bfa_lport_cfg_s *port_cfg,

			       struct bfad_vf_s *vf_drv);

bfa_status_t bfa_fcs_vf_delete(bfa_fcs_vf_t *vf);

void bfa_fcs_vf_list(struct bfa_fcs_s *fcs, u16 *vf_ids, int *nvfs);

void bfa_fcs_vf_list_all(struct bfa_fcs_s *fcs, u16 *vf_ids, int *nvfs);

void bfa_fcs_vf_get_attr(bfa_fcs_vf_t *vf, struct bfa_vf_attr_s *vf_attr);

void bfa_fcs_vf_get_stats(bfa_fcs_vf_t *vf,

			  struct bfa_vf_stats_s *vf_stats);

void bfa_fcs_vf_clear_stats(bfa_fcs_vf_t *vf);

void bfa_fcs_vf_get_ports(bfa_fcs_vf_t *vf, wwn_t vpwwn[], int *nports);

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);