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

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

[SCSI] bfa: remove a file with small size 



Removed bfa_drv.c, merged it to bfa_core.c and modified Makefile.

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 f7f73812

drivers/scsi/bfa/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,6 +3,6 @@ obj-$(CONFIG_SCSI_BFA_FC) := bfa.o 
bfa-y := bfad.o bfad_im.o bfad_attr.o bfad_debugfs.o

bfa-y += bfa_ioc.o bfa_ioc_cb.o bfa_ioc_ct.o bfa_hw_cb.o bfa_hw_ct.o

bfa-y += bfa_fcs.o bfa_fcs_lport.o bfa_fcs_rport.o bfa_fcs_fcpim.o bfa_fcbuild.o

bfa-y += bfa_port.o bfa_fcpim.o bfa_core.o bfa_drv.o bfa_svc.o

bfa-y += bfa_port.o bfa_fcpim.o bfa_core.o bfa_svc.o



ccflags-y := -DBFA_PERF_BUILD

drivers/scsi/bfa/bfa.h

+0 −1
Original line number Diff line number Diff line
@@ -331,7 +331,6 @@ void bfa_hwct_msix_getvecs(struct bfa_s *bfa, u32 *vecmap, u32 *nvecs, 
			   u32 *maxvec);

void bfa_hwct_msix_get_rme_range(struct bfa_s *bfa, u32 *start,

				 u32 *end);

void bfa_com_port_attach(struct bfa_s *bfa, struct bfa_meminfo_s *mi);

void bfa_iocfc_get_bootwwns(struct bfa_s *bfa, u8 *nwwns, wwn_t *wwns);

wwn_t bfa_iocfc_get_pwwn(struct bfa_s *bfa);

wwn_t bfa_iocfc_get_nwwn(struct bfa_s *bfa);

drivers/scsi/bfa/bfa_core.c

+87 −0
Original line number Diff line number Diff line
@@ -21,6 +21,93 @@ 


BFA_TRC_FILE(HAL, CORE);



/*

 * BFA module list terminated by NULL

 */

static struct bfa_module_s *hal_mods[] = {

	&hal_mod_sgpg,

	&hal_mod_fcport,

	&hal_mod_fcxp,

	&hal_mod_lps,

	&hal_mod_uf,

	&hal_mod_rport,

	&hal_mod_fcpim,

	NULL

};



/*

 * Message handlers for various modules.

 */

static bfa_isr_func_t  bfa_isrs[BFI_MC_MAX] = {

	bfa_isr_unhandled,	/* NONE */

	bfa_isr_unhandled,	/* BFI_MC_IOC */

	bfa_isr_unhandled,	/* BFI_MC_DIAG */

	bfa_isr_unhandled,	/* BFI_MC_FLASH */

	bfa_isr_unhandled,	/* BFI_MC_CEE */

	bfa_fcport_isr,		/* BFI_MC_FCPORT */

	bfa_isr_unhandled,	/* BFI_MC_IOCFC */

	bfa_isr_unhandled,	/* BFI_MC_LL */

	bfa_uf_isr,		/* BFI_MC_UF */

	bfa_fcxp_isr,		/* BFI_MC_FCXP */

	bfa_lps_isr,		/* BFI_MC_LPS */

	bfa_rport_isr,		/* BFI_MC_RPORT */

	bfa_itnim_isr,		/* BFI_MC_ITNIM */

	bfa_isr_unhandled,	/* BFI_MC_IOIM_READ */

	bfa_isr_unhandled,	/* BFI_MC_IOIM_WRITE */

	bfa_isr_unhandled,	/* BFI_MC_IOIM_IO */

	bfa_ioim_isr,		/* BFI_MC_IOIM */

	bfa_ioim_good_comp_isr,	/* BFI_MC_IOIM_IOCOM */

	bfa_tskim_isr,		/* BFI_MC_TSKIM */

	bfa_isr_unhandled,	/* BFI_MC_SBOOT */

	bfa_isr_unhandled,	/* BFI_MC_IPFC */

	bfa_isr_unhandled,	/* BFI_MC_PORT */

	bfa_isr_unhandled,	/* --------- */

	bfa_isr_unhandled,	/* --------- */

	bfa_isr_unhandled,	/* --------- */

	bfa_isr_unhandled,	/* --------- */

	bfa_isr_unhandled,	/* --------- */

	bfa_isr_unhandled,	/* --------- */

	bfa_isr_unhandled,	/* --------- */

	bfa_isr_unhandled,	/* --------- */

	bfa_isr_unhandled,	/* --------- */

	bfa_isr_unhandled,	/* --------- */

};

/*

 * Message handlers for mailbox command classes

 */

static bfa_ioc_mbox_mcfunc_t  bfa_mbox_isrs[BFI_MC_MAX] = {

	NULL,

	NULL,		/* BFI_MC_IOC   */

	NULL,		/* BFI_MC_DIAG  */

	NULL,		/* BFI_MC_FLASH */

	NULL,		/* BFI_MC_CEE   */

	NULL,		/* BFI_MC_PORT  */

	bfa_iocfc_isr,	/* BFI_MC_IOCFC */

	NULL,

};







static void

bfa_com_port_attach(struct bfa_s *bfa, struct bfa_meminfo_s *mi)

{

	struct bfa_port_s	*port = &bfa->modules.port;

	u32			dm_len;

	u8			*dm_kva;

	u64			dm_pa;



	dm_len = bfa_port_meminfo();

	dm_kva = bfa_meminfo_dma_virt(mi);

	dm_pa  = bfa_meminfo_dma_phys(mi);



	memset(port, 0, sizeof(struct bfa_port_s));

	bfa_port_attach(port, &bfa->ioc, bfa, bfa->trcmod);

	bfa_port_mem_claim(port, dm_kva, dm_pa);



	bfa_meminfo_dma_virt(mi) = dm_kva + dm_len;

	bfa_meminfo_dma_phys(mi) = dm_pa + dm_len;

}



/*

 * BFA IOC FC related definitions

 */

drivers/scsi/bfa/bfa_drv.c

deleted100644 → 0
+0 −107
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2005-2010 Brocade Communications Systems, Inc.

 * All rights reserved

 * www.brocade.com

 *

 * Linux driver for Brocade Fibre Channel Host Bus Adapter.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License (GPL) Version 2 as

 * published by the Free Software Foundation

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License for more details.

 */



#include "bfa_modules.h"



/*

 * BFA module list terminated by NULL

 */

struct bfa_module_s *hal_mods[] = {

	&hal_mod_sgpg,

	&hal_mod_fcport,

	&hal_mod_fcxp,

	&hal_mod_lps,

	&hal_mod_uf,

	&hal_mod_rport,

	&hal_mod_fcpim,

	NULL

};



/*

 * Message handlers for various modules.

 */

bfa_isr_func_t  bfa_isrs[BFI_MC_MAX] = {

	bfa_isr_unhandled,	/* NONE */

	bfa_isr_unhandled,	/* BFI_MC_IOC */

	bfa_isr_unhandled,	/* BFI_MC_DIAG */

	bfa_isr_unhandled,	/* BFI_MC_FLASH */

	bfa_isr_unhandled,	/* BFI_MC_CEE */

	bfa_fcport_isr,		/* BFI_MC_FCPORT */

	bfa_isr_unhandled,	/* BFI_MC_IOCFC */

	bfa_isr_unhandled,	/* BFI_MC_LL */

	bfa_uf_isr,		/* BFI_MC_UF */

	bfa_fcxp_isr,		/* BFI_MC_FCXP */

	bfa_lps_isr,		/* BFI_MC_LPS */

	bfa_rport_isr,		/* BFI_MC_RPORT */

	bfa_itnim_isr,		/* BFI_MC_ITNIM */

	bfa_isr_unhandled,	/* BFI_MC_IOIM_READ */

	bfa_isr_unhandled,	/* BFI_MC_IOIM_WRITE */

	bfa_isr_unhandled,	/* BFI_MC_IOIM_IO */

	bfa_ioim_isr,		/* BFI_MC_IOIM */

	bfa_ioim_good_comp_isr,	/* BFI_MC_IOIM_IOCOM */

	bfa_tskim_isr,		/* BFI_MC_TSKIM */

	bfa_isr_unhandled,	/* BFI_MC_SBOOT */

	bfa_isr_unhandled,	/* BFI_MC_IPFC */

	bfa_isr_unhandled,	/* BFI_MC_PORT */

	bfa_isr_unhandled,	/* --------- */

	bfa_isr_unhandled,	/* --------- */

	bfa_isr_unhandled,	/* --------- */

	bfa_isr_unhandled,	/* --------- */

	bfa_isr_unhandled,	/* --------- */

	bfa_isr_unhandled,	/* --------- */

	bfa_isr_unhandled,	/* --------- */

	bfa_isr_unhandled,	/* --------- */

	bfa_isr_unhandled,	/* --------- */

	bfa_isr_unhandled,	/* --------- */

};





/*

 * Message handlers for mailbox command classes

 */

bfa_ioc_mbox_mcfunc_t  bfa_mbox_isrs[BFI_MC_MAX] = {

	NULL,

	NULL,			/* BFI_MC_IOC   */

	NULL,			/* BFI_MC_DIAG  */

	NULL,		/* BFI_MC_FLASH */

	NULL,			/* BFI_MC_CEE   */

	NULL,			/* BFI_MC_PORT  */

	bfa_iocfc_isr,		/* BFI_MC_IOCFC */

	NULL,

};







void

bfa_com_port_attach(struct bfa_s *bfa, struct bfa_meminfo_s *mi)

{

	struct bfa_port_s	*port = &bfa->modules.port;

	u32		dm_len;

	u8			*dm_kva;

	u64		dm_pa;



	dm_len = bfa_port_meminfo();

	dm_kva = bfa_meminfo_dma_virt(mi);

	dm_pa  = bfa_meminfo_dma_phys(mi);



	memset(port, 0, sizeof(struct bfa_port_s));

	bfa_port_attach(port, &bfa->ioc, bfa, bfa->trcmod);

	bfa_port_mem_claim(port, dm_kva, dm_pa);



	bfa_meminfo_dma_virt(mi) = dm_kva + dm_len;

	bfa_meminfo_dma_phys(mi) = dm_pa + dm_len;

}

drivers/scsi/bfa/bfa_modules.h

+0 −3
Original line number Diff line number Diff line
@@ -99,7 +99,6 @@ struct bfa_module_s { 
	void (*iocdisable) (struct bfa_s *bfa);

};



extern struct bfa_module_s *hal_mods[];



struct bfa_s {

	void			*bfad;		/*  BFA driver instance    */
@@ -116,8 +115,6 @@ struct bfa_s { 
	struct bfa_msix_s	msix;

};



extern bfa_isr_func_t bfa_isrs[BFI_MC_MAX];

extern bfa_ioc_mbox_mcfunc_t  bfa_mbox_isrs[];

extern bfa_boolean_t bfa_auto_recover;

extern struct bfa_module_s hal_mod_sgpg;

extern struct bfa_module_s hal_mod_fcport;