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

Commit 82794a2e authored by Krishna Gudipati's avatar Krishna Gudipati Committed by James Bottomley
Browse files

[SCSI] bfa: New interface to handle firmware upgrade scenario 



Split bfa_fcs_init() into bfa_fcs_attach() and bfa_fcs_init().

Removed empty function definitions in FCS modules

Modified driver to call bfa_fcs_attach() and bfa_fcs_init() as needed.

Signed-off-by: default avatarKrishna Gudipati <kgudipat@brocade.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 5b098082

drivers/scsi/bfa/bfa_fcs.c

+29 −17
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
 * FCS sub-modules

 */

struct bfa_fcs_mod_s {

	void		(*attach) (struct bfa_fcs_s *fcs);

	void            (*modinit) (struct bfa_fcs_s *fcs);

	void            (*modexit) (struct bfa_fcs_s *fcs);

};
@@ -43,12 +44,10 @@ struct bfa_fcs_mod_s { 
#define BFA_FCS_MODULE(_mod) { _mod ## _modinit, _mod ## _modexit }



static struct bfa_fcs_mod_s fcs_modules[] = {

	BFA_FCS_MODULE(bfa_fcs_pport),

	BFA_FCS_MODULE(bfa_fcs_uf),

	BFA_FCS_MODULE(bfa_fcs_fabric),

	BFA_FCS_MODULE(bfa_fcs_vport),

	BFA_FCS_MODULE(bfa_fcs_rport),

	BFA_FCS_MODULE(bfa_fcs_fcpim),

	{ bfa_fcs_pport_attach, NULL, NULL },

	{ bfa_fcs_uf_attach, NULL, NULL },

	{ bfa_fcs_fabric_attach, bfa_fcs_fabric_modinit,

	 bfa_fcs_fabric_modexit },

};



/**
@@ -71,16 +70,10 @@ bfa_fcs_exit_comp(void *fcs_cbarg) 
 */



/**

 * 		FCS instance initialization.

 *

 * 	param[in]		fcs		FCS instance

 * 	param[in]		bfa		BFA instance

 * 	param[in]		bfad		BFA driver instance

 *

 * 	return None

 * fcs attach -- called once to initialize data structures at driver attach time

 */

void

bfa_fcs_init(struct bfa_fcs_s *fcs, struct bfa_s *bfa, struct bfad_s *bfad,

bfa_fcs_attach(struct bfa_fcs_s *fcs, struct bfa_s *bfa, struct bfad_s *bfad,

			bfa_boolean_t min_cfg)

{

	int             i;
@@ -95,6 +88,23 @@ bfa_fcs_init(struct bfa_fcs_s *fcs, struct bfa_s *bfa, struct bfad_s *bfad, 


	for (i = 0; i < sizeof(fcs_modules) / sizeof(fcs_modules[0]); i++) {

		mod = &fcs_modules[i];

		if (mod->attach)

			mod->attach(fcs);

	}

}



/**

 * fcs initialization, called once after bfa initialization is complete

 */

void

bfa_fcs_init(struct bfa_fcs_s *fcs)

{

	int             i;

	struct bfa_fcs_mod_s  *mod;



	for (i = 0; i < sizeof(fcs_modules) / sizeof(fcs_modules[0]); i++) {

		mod = &fcs_modules[i];

		if (mod->modinit)

			mod->modinit(fcs);

	}

}
@@ -160,11 +170,13 @@ bfa_fcs_exit(struct bfa_fcs_s *fcs) 
	nmods = sizeof(fcs_modules) / sizeof(fcs_modules[0]);



	for (i = 0; i < nmods; i++) {

		bfa_wc_up(&fcs->wc);



		mod = &fcs_modules[i];

		if (mod->modexit) {

			bfa_wc_up(&fcs->wc);

			mod->modexit(fcs);

		}

	}



	bfa_wc_wait(&fcs->wc);

}

drivers/scsi/bfa/bfa_fcs_port.c

+2 −9
Original line number Diff line number Diff line
@@ -55,14 +55,7 @@ bfa_fcs_pport_event_handler(void *cbarg, bfa_pport_event_t event) 
}



void

bfa_fcs_pport_modinit(struct bfa_fcs_s *fcs)

bfa_fcs_pport_attach(struct bfa_fcs_s *fcs)

{

	bfa_pport_event_register(fcs->bfa, bfa_fcs_pport_event_handler,

				     fcs);

}



void

bfa_fcs_pport_modexit(struct bfa_fcs_s *fcs)

{

	bfa_fcs_modexit_comp(fcs);

	bfa_pport_event_register(fcs->bfa, bfa_fcs_pport_event_handler, fcs);

}

drivers/scsi/bfa/bfa_fcs_uf.c

+1 −7
Original line number Diff line number Diff line
@@ -93,13 +93,7 @@ bfa_fcs_uf_recv(void *cbarg, struct bfa_uf_s *uf) 
}



void

bfa_fcs_uf_modinit(struct bfa_fcs_s *fcs)

bfa_fcs_uf_attach(struct bfa_fcs_s *fcs)

{

	bfa_uf_recv_register(fcs->bfa, bfa_fcs_uf_recv, fcs);

}
 


void

bfa_fcs_uf_modexit(struct bfa_fcs_s *fcs)

{

	bfa_fcs_modexit_comp(fcs);

}

drivers/scsi/bfa/bfad.c

+2 −1
Original line number Diff line number Diff line
@@ -748,7 +748,8 @@ bfad_drv_init(struct bfad_s *bfad) 
	bfa_fcs_log_init(&bfad->bfa_fcs, bfad->logmod);

	bfa_fcs_trc_init(&bfad->bfa_fcs, bfad->trcmod);

	bfa_fcs_aen_init(&bfad->bfa_fcs, bfad->aen);

	bfa_fcs_init(&bfad->bfa_fcs, &bfad->bfa, bfad, BFA_FALSE);

	bfa_fcs_attach(&bfad->bfa_fcs, &bfad->bfa, bfad, BFA_FALSE);

	bfa_fcs_init(&bfad->bfa_fcs);

	bfa_fcs_driver_info_init(&bfad->bfa_fcs, &driver_info);

	bfa_fcs_set_fdmi_param(&bfad->bfa_fcs, fdmi_enable);

	spin_unlock_irqrestore(&bfad->bfad_lock, flags);

drivers/scsi/bfa/fabric.c

+8 −3
Original line number Diff line number Diff line
@@ -814,10 +814,10 @@ bfa_fcs_fabric_delete_comp(void *cbarg) 
 */



/**

 *   Module initialization

 *   Attach time initialization

 */

void

bfa_fcs_fabric_modinit(struct bfa_fcs_s *fcs)

bfa_fcs_fabric_attach(struct bfa_fcs_s *fcs)

{

	struct bfa_fcs_fabric_s *fabric;
@@ -841,7 +841,12 @@ bfa_fcs_fabric_modinit(struct bfa_fcs_s *fcs) 
	bfa_wc_up(&fabric->wc);	/* For the base port */



	bfa_sm_set_state(fabric, bfa_fcs_fabric_sm_uninit);

	bfa_sm_send_event(fabric, BFA_FCS_FABRIC_SM_CREATE);

}



void

bfa_fcs_fabric_modinit(struct bfa_fcs_s *fcs)

{

	bfa_sm_send_event(&fcs->fabric, BFA_FCS_FABRIC_SM_CREATE);

	bfa_trc(fcs, 0);

}