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

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

[SCSI] bfa: replace endian swap macros with the ones provided by linux 



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

drivers/scsi/bfa/bfa_cb_ioim.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ bfad_int_to_lun(u32 luno) 
	} lun;



	lun.bfa_lun     = 0;

	lun.scsi_lun[0] = bfa_os_htons(luno);

	lun.scsi_lun[0] = cpu_to_be16(luno);



	return lun.bfa_lun;

}

drivers/scsi/bfa/bfa_core.c

+13 −13
Original line number Diff line number Diff line
@@ -400,14 +400,14 @@ bfa_iocfc_send_cfg(void *bfa_arg) 
		bfa_dma_be_addr_set(cfg_info->req_shadow_ci[i],

				    iocfc->req_cq_shadow_ci[i].pa);

		cfg_info->req_cq_elems[i] =

			bfa_os_htons(cfg->drvcfg.num_reqq_elems);

			cpu_to_be16(cfg->drvcfg.num_reqq_elems);



		bfa_dma_be_addr_set(cfg_info->rsp_cq_ba[i],

				    iocfc->rsp_cq_ba[i].pa);

		bfa_dma_be_addr_set(cfg_info->rsp_shadow_pi[i],

				    iocfc->rsp_cq_shadow_pi[i].pa);

		cfg_info->rsp_cq_elems[i] =

			bfa_os_htons(cfg->drvcfg.num_rspq_elems);

			cpu_to_be16(cfg->drvcfg.num_rspq_elems);

	}



	/**
@@ -634,11 +634,11 @@ bfa_iocfc_cfgrsp(struct bfa_s *bfa) 
	struct bfa_iocfc_fwcfg_s	*fwcfg	 = &cfgrsp->fwcfg;



	fwcfg->num_cqs	      = fwcfg->num_cqs;

	fwcfg->num_ioim_reqs  = bfa_os_ntohs(fwcfg->num_ioim_reqs);

	fwcfg->num_tskim_reqs = bfa_os_ntohs(fwcfg->num_tskim_reqs);

	fwcfg->num_fcxp_reqs  = bfa_os_ntohs(fwcfg->num_fcxp_reqs);

	fwcfg->num_uf_bufs    = bfa_os_ntohs(fwcfg->num_uf_bufs);

	fwcfg->num_rports     = bfa_os_ntohs(fwcfg->num_rports);

	fwcfg->num_ioim_reqs  = be16_to_cpu(fwcfg->num_ioim_reqs);

	fwcfg->num_tskim_reqs = be16_to_cpu(fwcfg->num_tskim_reqs);

	fwcfg->num_fcxp_reqs  = be16_to_cpu(fwcfg->num_fcxp_reqs);

	fwcfg->num_uf_bufs    = be16_to_cpu(fwcfg->num_uf_bufs);

	fwcfg->num_rports     = be16_to_cpu(fwcfg->num_rports);



	iocfc->cfgdone = BFA_TRUE;
@@ -876,12 +876,12 @@ bfa_iocfc_get_attr(struct bfa_s *bfa, struct bfa_iocfc_attr_s *attr) 
	attr->intr_attr.coalesce = iocfc->cfginfo->intr_attr.coalesce;



	attr->intr_attr.delay = iocfc->cfginfo->intr_attr.delay ?

				bfa_os_ntohs(iocfc->cfginfo->intr_attr.delay) :

				bfa_os_ntohs(iocfc->cfgrsp->intr_attr.delay);

				be16_to_cpu(iocfc->cfginfo->intr_attr.delay) :

				be16_to_cpu(iocfc->cfgrsp->intr_attr.delay);



	attr->intr_attr.latency = iocfc->cfginfo->intr_attr.latency ?

			bfa_os_ntohs(iocfc->cfginfo->intr_attr.latency) :

			bfa_os_ntohs(iocfc->cfgrsp->intr_attr.latency);

			be16_to_cpu(iocfc->cfginfo->intr_attr.latency) :

			be16_to_cpu(iocfc->cfgrsp->intr_attr.latency);



	attr->config	= iocfc->cfg;

}
@@ -893,8 +893,8 @@ bfa_iocfc_israttr_set(struct bfa_s *bfa, struct bfa_iocfc_intr_attr_s *attr) 
	struct bfi_iocfc_set_intr_req_s *m;



	iocfc->cfginfo->intr_attr.coalesce = attr->coalesce;

	iocfc->cfginfo->intr_attr.delay = bfa_os_htons(attr->delay);

	iocfc->cfginfo->intr_attr.latency = bfa_os_htons(attr->latency);

	iocfc->cfginfo->intr_attr.delay = cpu_to_be16(attr->delay);

	iocfc->cfginfo->intr_attr.latency = cpu_to_be16(attr->latency);



	if (!bfa_iocfc_is_operational(bfa))

		return BFA_STATUS_OK;

drivers/scsi/bfa/bfa_fcbuild.c

+46 −46
Original line number Diff line number Diff line
@@ -94,13 +94,13 @@ fcbuild_init(void) 
	 */

	plogi_tmpl.csp.verhi = FC_PH_VER_PH_3;

	plogi_tmpl.csp.verlo = FC_PH_VER_4_3;

	plogi_tmpl.csp.bbcred = bfa_os_htons(0x0004);

	plogi_tmpl.csp.bbcred = cpu_to_be16(0x0004);

	plogi_tmpl.csp.ciro = 0x1;

	plogi_tmpl.csp.cisc = 0x0;

	plogi_tmpl.csp.altbbcred = 0x0;

	plogi_tmpl.csp.conseq = bfa_os_htons(0x00FF);

	plogi_tmpl.csp.ro_bitmap = bfa_os_htons(0x0002);

	plogi_tmpl.csp.e_d_tov = bfa_os_htonl(2000);

	plogi_tmpl.csp.conseq = cpu_to_be16(0x00FF);

	plogi_tmpl.csp.ro_bitmap = cpu_to_be16(0x0002);

	plogi_tmpl.csp.e_d_tov = cpu_to_be32(2000);



	plogi_tmpl.class3.class_valid = 1;

	plogi_tmpl.class3.sequential = 1;
@@ -112,7 +112,7 @@ fcbuild_init(void) 
	 */

	prli_tmpl.command = FC_ELS_PRLI;

	prli_tmpl.pglen = 0x10;

	prli_tmpl.pagebytes = bfa_os_htons(0x0014);

	prli_tmpl.pagebytes = cpu_to_be16(0x0014);

	prli_tmpl.parampage.type = FC_TYPE_FCP;

	prli_tmpl.parampage.imagepair = 1;

	prli_tmpl.parampage.servparams.rxrdisab = 1;
@@ -148,7 +148,7 @@ fc_gs_fchdr_build(struct fchs_s *fchs, u32 d_id, u32 s_id, u32 ox_id) 
	fchs->rx_id = FC_RXID_ANY;

	fchs->d_id = (d_id);

	fchs->s_id = (s_id);

	fchs->ox_id = bfa_os_htons(ox_id);

	fchs->ox_id = cpu_to_be16(ox_id);



	/**

	 * @todo no need to set ox_id for request
@@ -162,7 +162,7 @@ fc_els_req_build(struct fchs_s *fchs, u32 d_id, u32 s_id, u16 ox_id) 
	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);

	fchs->ox_id = cpu_to_be16(ox_id);

}



static void
@@ -219,7 +219,7 @@ fc_plogi_x_build(struct fchs_s *fchs, void *pld, u32 d_id, u32 s_id, 
	else

		fc_els_rsp_build(fchs, d_id, s_id, ox_id);



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

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



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

	memcpy(&plogi->node_name, &node_name, sizeof(wwn_t));
@@ -240,7 +240,7 @@ fc_flogi_build(struct fchs_s *fchs, struct fc_logi_s *flogi, u32 s_id, 
	flogi->els_cmd.els_code = FC_ELS_FLOGI;

	fc_els_req_build(fchs, d_id, s_id, ox_id);



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

	flogi->csp.rxsz = flogi->class3.rxsz = cpu_to_be16(pdu_size);

	flogi->port_name = port_name;

	flogi->node_name = node_name;
@@ -253,14 +253,14 @@ fc_flogi_build(struct fchs_s *fchs, struct fc_logi_s *flogi, u32 s_id, 
	/* set AUTH capability */

	flogi->csp.security = set_auth;



	flogi->csp.bbcred = bfa_os_htons(local_bb_credits);

	flogi->csp.bbcred = cpu_to_be16(local_bb_credits);



	/* Set brcd token in VVL */

	vvl_info = (u32 *)&flogi->vvl[0];



	/* set the flag to indicate the presence of VVL */

	flogi->csp.npiv_supp    = 1; /* @todo. field name is not correct */

	vvl_info[0]	= bfa_os_htonl(FLOGI_VVL_BRCD);

	vvl_info[0]	= cpu_to_be32(FLOGI_VVL_BRCD);



	return sizeof(struct fc_logi_s);

}
@@ -276,11 +276,11 @@ fc_flogi_acc_build(struct fchs_s *fchs, struct fc_logi_s *flogi, u32 s_id, 
	fc_els_rsp_build(fchs, d_id, s_id, ox_id);



	flogi->els_cmd.els_code = FC_ELS_ACC;

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

	flogi->csp.rxsz = flogi->class3.rxsz = cpu_to_be16(pdu_size);

	flogi->port_name = port_name;

	flogi->node_name = node_name;



	flogi->csp.bbcred = bfa_os_htons(local_bb_credits);

	flogi->csp.bbcred = cpu_to_be16(local_bb_credits);



	return sizeof(struct fc_logi_s);

}
@@ -296,7 +296,7 @@ fc_fdisc_build(struct fchs_s *fchs, struct fc_logi_s *flogi, u32 s_id, 
	flogi->els_cmd.els_code = FC_ELS_FDISC;

	fc_els_req_build(fchs, d_id, s_id, ox_id);



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

	flogi->csp.rxsz = flogi->class3.rxsz = cpu_to_be16(pdu_size);

	flogi->port_name = port_name;

	flogi->node_name = node_name;
@@ -346,7 +346,7 @@ fc_plogi_rsp_parse(struct fchs_s *fchs, int len, wwn_t port_name) 
		if (!plogi->class3.class_valid)

			return FC_PARSE_FAILURE;



		if (bfa_os_ntohs(plogi->class3.rxsz) < (FC_MIN_PDUSZ))

		if (be16_to_cpu(plogi->class3.rxsz) < (FC_MIN_PDUSZ))

			return FC_PARSE_FAILURE;



		return FC_PARSE_OK;
@@ -363,8 +363,8 @@ fc_plogi_parse(struct fchs_s *fchs) 
	if (plogi->class3.class_valid != 1)

		return FC_PARSE_FAILURE;



	if ((bfa_os_ntohs(plogi->class3.rxsz) < FC_MIN_PDUSZ)

	    || (bfa_os_ntohs(plogi->class3.rxsz) > FC_MAX_PDUSZ)

	if ((be16_to_cpu(plogi->class3.rxsz) < FC_MIN_PDUSZ)

	    || (be16_to_cpu(plogi->class3.rxsz) > FC_MAX_PDUSZ)

	    || (plogi->class3.rxsz == 0))

		return FC_PARSE_FAILURE;
@@ -537,7 +537,7 @@ fc_pdisc_parse(struct fchs_s *fchs, wwn_t node_name, wwn_t port_name) 
	if (pdisc->class3.class_valid != 1)

		return FC_PARSE_FAILURE;



	if ((bfa_os_ntohs(pdisc->class3.rxsz) <

	if ((be16_to_cpu(pdisc->class3.rxsz) <

		(FC_MIN_PDUSZ - sizeof(struct fchs_s)))

	    || (pdisc->class3.rxsz == 0))

		return FC_PARSE_FAILURE;
@@ -558,7 +558,7 @@ fc_abts_build(struct fchs_s *fchs, u32 d_id, u32 s_id, u16 ox_id) 
	fchs->cat_info = FC_CAT_ABTS;

	fchs->d_id = (d_id);

	fchs->s_id = (s_id);

	fchs->ox_id = bfa_os_htons(ox_id);

	fchs->ox_id = cpu_to_be16(ox_id);



	return sizeof(struct fchs_s);

}
@@ -584,7 +584,7 @@ fc_rrq_build(struct fchs_s *fchs, struct fc_rrq_s *rrq, u32 d_id, u32 s_id, 
	 */

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

	rrq->s_id = (s_id);

	rrq->ox_id = bfa_os_htons(rrq_oxid);

	rrq->ox_id = cpu_to_be16(rrq_oxid);

	rrq->rx_id = FC_RXID_ANY;



	return sizeof(struct fc_rrq_s);
@@ -656,10 +656,10 @@ fc_logout_params_pages(struct fchs_s *fc_frame, u8 els_code) 


	if (els_code == FC_ELS_PRLO) {

		prlo = (struct fc_prlo_s *) (fc_frame + 1);

		num_pages = (bfa_os_ntohs(prlo->payload_len) - 4) / 16;

		num_pages = (be16_to_cpu(prlo->payload_len) - 4) / 16;

	} else {

		tprlo = (struct fc_tprlo_s *) (fc_frame + 1);

		num_pages = (bfa_os_ntohs(tprlo->payload_len) - 4) / 16;

		num_pages = (be16_to_cpu(tprlo->payload_len) - 4) / 16;

	}

	return num_pages;

}
@@ -676,7 +676,7 @@ fc_tprlo_acc_build(struct fchs_s *fchs, struct fc_tprlo_acc_s *tprlo_acc, 
	tprlo_acc->command = FC_ELS_ACC;



	tprlo_acc->page_len = 0x10;

	tprlo_acc->payload_len = bfa_os_htons((num_pages * 16) + 4);

	tprlo_acc->payload_len = cpu_to_be16((num_pages * 16) + 4);



	for (page = 0; page < num_pages; page++) {

		tprlo_acc->tprlo_acc_params[page].opa_valid = 0;
@@ -685,7 +685,7 @@ fc_tprlo_acc_build(struct fchs_s *fchs, struct fc_tprlo_acc_s *tprlo_acc, 
		tprlo_acc->tprlo_acc_params[page].orig_process_assc = 0;

		tprlo_acc->tprlo_acc_params[page].resp_process_assc = 0;

	}

	return bfa_os_ntohs(tprlo_acc->payload_len);

	return be16_to_cpu(tprlo_acc->payload_len);

}



u16
@@ -699,7 +699,7 @@ fc_prlo_acc_build(struct fchs_s *fchs, struct fc_prlo_acc_s *prlo_acc, u32 d_id, 
	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);

	prlo_acc->payload_len = cpu_to_be16((num_pages * 16) + 4);



	for (page = 0; page < num_pages; page++) {

		prlo_acc->prlo_acc_params[page].opa_valid = 0;
@@ -709,7 +709,7 @@ fc_prlo_acc_build(struct fchs_s *fchs, struct fc_prlo_acc_s *prlo_acc, u32 d_id, 
		prlo_acc->prlo_acc_params[page].resp_process_assc = 0;

	}



	return bfa_os_ntohs(prlo_acc->payload_len);

	return be16_to_cpu(prlo_acc->payload_len);

}



u16
@@ -778,8 +778,8 @@ fc_rpsc2_build(struct fchs_s *fchs, struct fc_rpsc2_cmd_s *rpsc2, u32 d_id, 
	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);

	rpsc2->num_pids  = bfa_os_htons(npids);

	rpsc2->token = cpu_to_be32(FC_BRCD_TOKEN);

	rpsc2->num_pids  = cpu_to_be16(npids);

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

		rpsc2->pid_list[i].pid = pid_list[i];
@@ -796,13 +796,13 @@ fc_rpsc_acc_build(struct fchs_s *fchs, struct fc_rpsc_acc_s *rpsc_acc, 
	fc_els_rsp_build(fchs, d_id, s_id, ox_id);



	rpsc_acc->command = FC_ELS_ACC;

	rpsc_acc->num_entries = bfa_os_htons(1);

	rpsc_acc->num_entries = cpu_to_be16(1);



	rpsc_acc->speed_info[0].port_speed_cap =

		bfa_os_htons(oper_speed->port_speed_cap);

		cpu_to_be16(oper_speed->port_speed_cap);



	rpsc_acc->speed_info[0].port_op_speed =

		bfa_os_htons(oper_speed->port_op_speed);

		cpu_to_be16(oper_speed->port_op_speed);



	return sizeof(struct fc_rpsc_acc_s);

}
@@ -835,7 +835,7 @@ fc_pdisc_build(struct fchs_s *fchs, u32 d_id, u32 s_id, u16 ox_id, 
	pdisc->els_cmd.els_code = FC_ELS_PDISC;

	fc_els_req_build(fchs, d_id, s_id, ox_id);



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

	pdisc->csp.rxsz = pdisc->class3.rxsz = cpu_to_be16(pdu_size);

	pdisc->port_name = port_name;

	pdisc->node_name = node_name;
@@ -859,7 +859,7 @@ fc_pdisc_rsp_parse(struct fchs_s *fchs, int len, wwn_t port_name) 
	if (!pdisc->class3.class_valid)

		return FC_PARSE_NWWN_NOT_EQUAL;



	if (bfa_os_ntohs(pdisc->class3.rxsz) < (FC_MIN_PDUSZ))

	if (be16_to_cpu(pdisc->class3.rxsz) < (FC_MIN_PDUSZ))

		return FC_PARSE_RXSZ_INVAL;



	return FC_PARSE_OK;
@@ -876,7 +876,7 @@ fc_prlo_build(struct fchs_s *fchs, u32 d_id, u32 s_id, u16 ox_id, 
	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);

	prlo->payload_len = cpu_to_be16((num_pages * 16) + 4);



	for (page = 0; page < num_pages; page++) {

		prlo->prlo_params[page].type = FC_TYPE_FCP;
@@ -886,7 +886,7 @@ fc_prlo_build(struct fchs_s *fchs, u32 d_id, u32 s_id, u16 ox_id, 
		prlo->prlo_params[page].resp_process_assc = 0;

	}



	return bfa_os_ntohs(prlo->payload_len);

	return be16_to_cpu(prlo->payload_len);

}



u16
@@ -901,7 +901,7 @@ fc_prlo_rsp_parse(struct fchs_s *fchs, int len) 
	if (prlo->command != FC_ELS_ACC)

		return FC_PARSE_FAILURE;



	num_pages = ((bfa_os_ntohs(prlo->payload_len)) - 4) / 16;

	num_pages = ((be16_to_cpu(prlo->payload_len)) - 4) / 16;



	for (page = 0; page < num_pages; page++) {

		if (prlo->prlo_acc_params[page].type != FC_TYPE_FCP)
@@ -934,7 +934,7 @@ fc_tprlo_build(struct fchs_s *fchs, u32 d_id, u32 s_id, u16 ox_id, 
	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);

	tprlo->payload_len = cpu_to_be16((num_pages * 16) + 4);



	for (page = 0; page < num_pages; page++) {

		tprlo->tprlo_params[page].type = FC_TYPE_FCP;
@@ -950,7 +950,7 @@ fc_tprlo_build(struct fchs_s *fchs, u32 d_id, u32 s_id, u16 ox_id, 
		}

	}



	return bfa_os_ntohs(tprlo->payload_len);

	return be16_to_cpu(tprlo->payload_len);

}



u16
@@ -965,7 +965,7 @@ fc_tprlo_rsp_parse(struct fchs_s *fchs, int len) 
	if (tprlo->command != FC_ELS_ACC)

		return FC_PARSE_ACC_INVAL;



	num_pages = (bfa_os_ntohs(tprlo->payload_len) - 4) / 16;

	num_pages = (be16_to_cpu(tprlo->payload_len) - 4) / 16;



	for (page = 0; page < num_pages; page++) {

		if (tprlo->tprlo_acc_params[page].type != FC_TYPE_FCP)
@@ -1015,7 +1015,7 @@ fc_gs_cthdr_build(struct ct_hdr_s *cthdr, u32 s_id, u16 cmd_code) 
	cthdr->rev_id = CT_GS3_REVISION;

	cthdr->gs_type = CT_GSTYPE_DIRSERVICE;

	cthdr->gs_sub_type = CT_GSSUBTYPE_NAMESERVER;

	cthdr->cmd_rsp_code = bfa_os_htons(cmd_code);

	cthdr->cmd_rsp_code = cpu_to_be16(cmd_code);

}



static void
@@ -1025,7 +1025,7 @@ fc_gs_fdmi_cthdr_build(struct ct_hdr_s *cthdr, u32 s_id, u16 cmd_code) 
	cthdr->rev_id = CT_GS3_REVISION;

	cthdr->gs_type = CT_GSTYPE_MGMTSERVICE;

	cthdr->gs_sub_type = CT_GSSUBTYPE_HBA_MGMTSERVER;

	cthdr->cmd_rsp_code = bfa_os_htons(cmd_code);

	cthdr->cmd_rsp_code = cpu_to_be16(cmd_code);

}



static void
@@ -1036,7 +1036,7 @@ fc_gs_ms_cthdr_build(struct ct_hdr_s *cthdr, u32 s_id, u16 cmd_code, 
	cthdr->rev_id = CT_GS3_REVISION;

	cthdr->gs_type = CT_GSTYPE_MGMTSERVICE;

	cthdr->gs_sub_type = sub_type;

	cthdr->cmd_rsp_code = bfa_os_htons(cmd_code);

	cthdr->cmd_rsp_code = cpu_to_be16(cmd_code);

}



u16
@@ -1090,7 +1090,7 @@ fc_gnnid_build(struct fchs_s *fchs, void *pyld, u32 s_id, u16 ox_id, 
u16

fc_ct_rsp_parse(struct ct_hdr_s *cthdr)

{

	if (bfa_os_ntohs(cthdr->cmd_rsp_code) != CT_RSP_ACCEPT) {

	if (be16_to_cpu(cthdr->cmd_rsp_code) != CT_RSP_ACCEPT) {

		if (cthdr->reason_code == CT_RSN_LOGICAL_BUSY)

			return FC_PARSE_BUSY;

		else
@@ -1129,7 +1129,7 @@ fc_rscn_build(struct fchs_s *fchs, struct fc_rscn_pl_s *rscn, 
	rscn->pagelen = sizeof(rscn->event[0]);



	payldlen = sizeof(u32) + rscn->pagelen;

	rscn->payldlen = bfa_os_htons(payldlen);

	rscn->payldlen = cpu_to_be16(payldlen);



	rscn->event[0].format = FC_RSCN_FORMAT_PORTID;

	rscn->event[0].portid = s_id;
@@ -1156,7 +1156,7 @@ fc_rftid_build(struct fchs_s *fchs, void *pyld, u32 s_id, u16 ox_id, 
	/* By default, FCP FC4 Type is registered */

	index = FC_TYPE_FCP >> 5;

	type_value = 1 << (FC_TYPE_FCP % 32);

	rftid->fc4_type[index] = bfa_os_htonl(type_value);

	rftid->fc4_type[index] = cpu_to_be32(type_value);



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

}
@@ -1365,7 +1365,7 @@ fc_get_fc4type_bitmask(u8 fc4_type, u8 *bit_mask) 


	index = fc4_type >> 5;

	type_value = 1 << (fc4_type % 32);

	ptr[index] = bfa_os_htonl(type_value);

	ptr[index] = cpu_to_be32(type_value);



}

drivers/scsi/bfa/bfa_fcpim.c

+11 −11
Original line number Diff line number Diff line
@@ -2260,11 +2260,11 @@ __bfa_cb_ioim_comp(void *cbarg, bfa_boolean_t complete) 
		 * setup residue value correctly for normal completions

		 */

		if (m->resid_flags == FCP_RESID_UNDER) {

			residue = bfa_os_ntohl(m->residue);

			residue = be32_to_cpu(m->residue);

			bfa_stats(ioim->itnim, iocomp_underrun);

		}

		if (m->resid_flags == FCP_RESID_OVER) {

			residue = bfa_os_ntohl(m->residue);

			residue = be32_to_cpu(m->residue);

			residue = -residue;

			bfa_stats(ioim->itnim, iocomp_overrun);

		}
@@ -2357,7 +2357,7 @@ bfa_ioim_send_ioreq(struct bfa_ioim_s *ioim) 
	/**

	 * build i/o request message next

	 */

	m->io_tag = bfa_os_htons(ioim->iotag);

	m->io_tag = cpu_to_be16(ioim->iotag);

	m->rport_hdl = ioim->itnim->rport->fw_handle;

	m->io_timeout = bfa_cb_ioim_get_timeout(ioim->dio);
@@ -2395,7 +2395,7 @@ bfa_ioim_send_ioreq(struct bfa_ioim_s *ioim) 
	m->cmnd.iodir = bfa_cb_ioim_get_iodir(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);

	m->cmnd.fcp_dl = cpu_to_be32(fcp_dl);



	/**

	 * set up I/O message header
@@ -2436,7 +2436,7 @@ bfa_ioim_send_ioreq(struct bfa_ioim_s *ioim) 
				bfa_cb_ioim_get_cdb(ioim->dio) + 1,

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

		fcp_cmnd_fcpdl(&m->cmnd) =

				bfa_os_htonl(bfa_cb_ioim_get_size(ioim->dio));

				cpu_to_be32(bfa_cb_ioim_get_size(ioim->dio));

	}

#endif
@@ -2564,7 +2564,7 @@ bfa_ioim_send_abort(struct bfa_ioim_s *ioim) 
		msgop = BFI_IOIM_H2I_IOCLEANUP_REQ;



	bfi_h2i_set(m->mh, BFI_MC_IOIM, msgop, bfa_lpuid(ioim->bfa));

	m->io_tag    = bfa_os_htons(ioim->iotag);

	m->io_tag    = cpu_to_be16(ioim->iotag);

	m->abort_tag = ++ioim->abort_tag;



	/**
@@ -2739,7 +2739,7 @@ bfa_ioim_isr(struct bfa_s *bfa, struct bfi_msg_s *m) 
	u16	iotag;

	enum bfa_ioim_event evt = BFA_IOIM_SM_COMP;



	iotag = bfa_os_ntohs(rsp->io_tag);

	iotag = be16_to_cpu(rsp->io_tag);



	ioim = BFA_IOIM_FROM_TAG(fcpim, iotag);

	bfa_assert(ioim->iotag == iotag);
@@ -2822,7 +2822,7 @@ bfa_ioim_good_comp_isr(struct bfa_s *bfa, struct bfi_msg_s *m) 
	struct bfa_ioim_s *ioim;

	u16	iotag;



	iotag = bfa_os_ntohs(rsp->io_tag);

	iotag = be16_to_cpu(rsp->io_tag);



	ioim = BFA_IOIM_FROM_TAG(fcpim, iotag);

	bfa_assert(ioim->iotag == iotag);
@@ -3380,7 +3380,7 @@ bfa_tskim_send(struct bfa_tskim_s *tskim) 
	bfi_h2i_set(m->mh, BFI_MC_TSKIM, BFI_TSKIM_H2I_TM_REQ,

			bfa_lpuid(tskim->bfa));



	m->tsk_tag = bfa_os_htons(tskim->tsk_tag);

	m->tsk_tag = cpu_to_be16(tskim->tsk_tag);

	m->itn_fhdl = tskim->itnim->rport->fw_handle;

	m->t_secs = tskim->tsecs;

	m->lun = tskim->lun;
@@ -3415,7 +3415,7 @@ bfa_tskim_send_abort(struct bfa_tskim_s *tskim) 
	bfi_h2i_set(m->mh, BFI_MC_TSKIM, BFI_TSKIM_H2I_ABORT_REQ,

			bfa_lpuid(tskim->bfa));



	m->tsk_tag  = bfa_os_htons(tskim->tsk_tag);

	m->tsk_tag  = cpu_to_be16(tskim->tsk_tag);



	/**

	 * queue I/O message to firmware
@@ -3535,7 +3535,7 @@ bfa_tskim_isr(struct bfa_s *bfa, struct bfi_msg_s *m) 
	struct bfa_fcpim_mod_s *fcpim = BFA_FCPIM_MOD(bfa);

	struct bfi_tskim_rsp_s *rsp = (struct bfi_tskim_rsp_s *) m;

	struct bfa_tskim_s *tskim;

	u16	tsk_tag = bfa_os_ntohs(rsp->tsk_tag);

	u16	tsk_tag = be16_to_cpu(rsp->tsk_tag);



	tskim = BFA_TSKIM_FROM_TAG(fcpim, tsk_tag);

	bfa_assert(tskim->tsk_tag == tsk_tag);

drivers/scsi/bfa/bfa_fcs.c

+1 −1
Original line number Diff line number Diff line
@@ -1329,7 +1329,7 @@ bfa_fcs_fabric_process_flogi(struct bfa_fcs_fabric_s *fabric, 
		return;

	}



	fabric->bb_credit = bfa_os_ntohs(flogi->csp.bbcred);

	fabric->bb_credit = be16_to_cpu(flogi->csp.bbcred);

	bport->port_topo.pn2n.rem_port_wwn = flogi->port_name;

	bport->port_topo.pn2n.reply_oxid = fchs->ox_id;