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

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

[SCSI] bfa: enable basic PBC support 



The patch includes the driver side changes to enable basic PBC (PreBoot
Configuration) feature.
- Data structure changes and new definitions for PBC.
- APIs to access PBC info.
- Remove unused code.

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

drivers/scsi/bfa/bfa_fcpim.c

+0 −5
Original line number Diff line number Diff line
@@ -79,11 +79,6 @@ bfa_fcpim_attach(struct bfa_s *bfa, void *bfad, struct bfa_iocfc_cfg_s *cfg, 
	bfa_ioim_attach(fcpim, meminfo);

}



static void

bfa_fcpim_initdone(struct bfa_s *bfa)

{

}



static void

bfa_fcpim_detach(struct bfa_s *bfa)

{

drivers/scsi/bfa/bfa_fcport.c

+23 −19
Original line number Diff line number Diff line
@@ -911,25 +911,6 @@ bfa_fcport_attach(struct bfa_s *bfa, void *bfad, struct bfa_iocfc_cfg_s *cfg, 
	bfa_reqq_winit(&fcport->reqq_wait, bfa_fcport_qresume, fcport);

}



static void

bfa_fcport_initdone(struct bfa_s *bfa)

{

	struct bfa_fcport_s *fcport = BFA_FCPORT_MOD(bfa);



	/**

	 * Initialize port attributes from IOC hardware data.

	 */

	bfa_fcport_set_wwns(fcport);

	if (fcport->cfg.maxfrsize == 0)

		fcport->cfg.maxfrsize = bfa_ioc_maxfrsize(&bfa->ioc);

	fcport->cfg.rx_bbcredit = bfa_ioc_rx_bbcredit(&bfa->ioc);

	fcport->speed_sup = bfa_ioc_speed_sup(&bfa->ioc);



	bfa_assert(fcport->cfg.maxfrsize);

	bfa_assert(fcport->cfg.rx_bbcredit);

	bfa_assert(fcport->speed_sup);

}



static void

bfa_fcport_detach(struct bfa_s *bfa)

{
@@ -1262,6 +1243,29 @@ bfa_fcport_send_stats_clear(void *cbarg) 
 *  bfa_pport_public

 */



/**

 * Called to initialize port attributes

 */

void

bfa_fcport_init(struct bfa_s *bfa)

{

	struct bfa_fcport_s *fcport = BFA_FCPORT_MOD(bfa);



	/**

	 * Initialize port attributes from IOC hardware data.

	 */

	bfa_fcport_set_wwns(fcport);

	if (fcport->cfg.maxfrsize == 0)

		fcport->cfg.maxfrsize = bfa_ioc_maxfrsize(&bfa->ioc);

	fcport->cfg.rx_bbcredit = bfa_ioc_rx_bbcredit(&bfa->ioc);

	fcport->speed_sup = bfa_ioc_speed_sup(&bfa->ioc);



	bfa_assert(fcport->cfg.maxfrsize);

	bfa_assert(fcport->cfg.rx_bbcredit);

	bfa_assert(fcport->speed_sup);

}





/**

 * Firmware message handler.

 */

drivers/scsi/bfa/bfa_fcxp.c

+3 −11
Original line number Diff line number Diff line
@@ -148,11 +148,6 @@ bfa_fcxp_attach(struct bfa_s *bfa, void *bfad, struct bfa_iocfc_cfg_s *cfg, 
	claim_fcxps_mem(mod, meminfo);

}



static void

bfa_fcxp_initdone(struct bfa_s *bfa)

{

}



static void

bfa_fcxp_detach(struct bfa_s *bfa)

{
@@ -225,7 +220,7 @@ bfa_fcxp_null_comp(void *bfad_fcxp, struct bfa_fcxp_s *fcxp, void *cbarg, 
		       bfa_status_t req_status, u32 rsp_len,

		       u32 resid_len, struct fchs_s *rsp_fchs)

{

	/**discarded fcxp completion */

	/* discarded fcxp completion */

}



static void
@@ -527,11 +522,8 @@ bfa_fcxp_alloc(void *caller, struct bfa_s *bfa, int nreq_sgles, 
		if (nreq_sgles > BFI_SGE_INLINE) {

			nreq_sgpg = BFA_SGPG_NPAGE(nreq_sgles);



			if (bfa_sgpg_malloc

			    (bfa, &fcxp->req_sgpg_q, nreq_sgpg)

			if (bfa_sgpg_malloc(bfa, &fcxp->req_sgpg_q, nreq_sgpg)

			    != BFA_STATUS_OK) {

				/* bfa_sgpg_wait(bfa, &fcxp->req_sgpg_wqe,

				nreq_sgpg); */

				/*

				 * TODO

				 */
@@ -685,7 +677,7 @@ bfa_fcxp_send(struct bfa_fcxp_s *fcxp, struct bfa_rport_s *rport, 
	fcxp->send_cbarg = cbarg;



	/**

	 * If no room in CPE queue, wait for

	 * If no room in CPE queue, wait for space in request queue

	 */

	send_req = bfa_reqq_next(bfa, BFA_REQQ_FCXP);

	if (!send_req) {

drivers/scsi/bfa/bfa_ioc.c

+10 −31
Original line number Diff line number Diff line
@@ -1608,6 +1608,13 @@ bfa_ioc_error_isr(struct bfa_ioc_s *ioc) 
	bfa_fsm_send_event(ioc, IOC_E_HWERROR);

}



void

bfa_ioc_set_fcmode(struct bfa_ioc_s *ioc)

{

	ioc->fcmode  = BFA_TRUE;

	ioc->port_id = bfa_ioc_pcifn(ioc);

}



#ifndef BFA_BIOS_BUILD



/**
@@ -1697,6 +1704,9 @@ bfa_ioc_get_adapter_attr(struct bfa_ioc_s *ioc, 
	/* For now, model descr uses same model string */

	bfa_ioc_get_adapter_model(ioc, ad_attr->model_descr);



	ad_attr->card_type = ioc_attr->card_type;

	ad_attr->is_mezz = bfa_mfg_is_mezz(ioc_attr->card_type);



	if (BFI_ADAPTER_IS_SPECIAL(ioc_attr->adapter_prop))

		ad_attr->prototype = 1;

	else
@@ -1866,30 +1876,6 @@ bfa_ioc_get_nwwn(struct bfa_ioc_s *ioc) 
	return w.wwn;

}



wwn_t

bfa_ioc_get_wwn_naa5(struct bfa_ioc_s *ioc, u16 inst)

{

	union {

		wwn_t           wwn;

		u8         byte[sizeof(wwn_t)];

	}

	w              , w5;



	bfa_trc(ioc, inst);



	w.wwn = ioc->attr->mfg_wwn;

	w5.byte[0] = 0x50 | w.byte[2] >> 4;

	w5.byte[1] = w.byte[2] << 4 | w.byte[3] >> 4;

	w5.byte[2] = w.byte[3] << 4 | w.byte[4] >> 4;

	w5.byte[3] = w.byte[4] << 4 | w.byte[5] >> 4;

	w5.byte[4] = w.byte[5] << 4 | w.byte[6] >> 4;

	w5.byte[5] = w.byte[6] << 4 | w.byte[7] >> 4;

	w5.byte[6] = w.byte[7] << 4 | (inst & 0x0f00) >> 8;

	w5.byte[7] = (inst & 0xff);



	return w5.wwn;

}



u64

bfa_ioc_get_adid(struct bfa_ioc_s *ioc)

{
@@ -1907,13 +1893,6 @@ bfa_ioc_get_mac(struct bfa_ioc_s *ioc) 
	return mac;

}



void

bfa_ioc_set_fcmode(struct bfa_ioc_s *ioc)

{

	ioc->fcmode = BFA_TRUE;

	ioc->port_id = bfa_ioc_pcifn(ioc);

}



bfa_boolean_t

bfa_ioc_get_fcmode(struct bfa_ioc_s *ioc)

{

drivers/scsi/bfa/bfa_ioc.h

+0 −1
Original line number Diff line number Diff line
@@ -303,7 +303,6 @@ bfa_boolean_t bfa_ioc_fwver_cmp(struct bfa_ioc_s *ioc, 
 */

wwn_t bfa_ioc_get_pwwn(struct bfa_ioc_s *ioc);

wwn_t bfa_ioc_get_nwwn(struct bfa_ioc_s *ioc);

wwn_t bfa_ioc_get_wwn_naa5(struct bfa_ioc_s *ioc, u16 inst);

mac_t bfa_ioc_get_mac(struct bfa_ioc_s *ioc);

u64 bfa_ioc_get_adid(struct bfa_ioc_s *ioc);