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

Commit 70f14381 authored by Rasesh Mody's avatar Rasesh Mody Committed by David S. Miller
Browse files

bna: Multiple Definition and Interface Setup Fix 



drivers/net/built-in.o: In function `bfa_ioc_ct2_poweron':
(.text+0xcdc90): multiple definition of `bfa_ioc_ct2_poweron'
drivers/scsi/built-in.o:(.text+0x17f9a0): first defined here

This patch renames bfa_ioc_ct2_poweron() to bfa_nw_ioc_ct2_poweron() to avoid
multiple definition with Brocade scsi driver. It also modifies asic specific
interface setup to allocate MSIX resources at power on in case of 1860 HW with
no asic block and warns if the asic gen is neither BFI_ASIC_GEN_CT nor
BFI_ASIC_GEN_CT2.

Reported-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
Signed-off-by: default avatarRasesh Mody <rmody@brocade.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 83e1b918

drivers/net/ethernet/brocade/bna/bfa_ioc.c

+4 −1
Original line number Diff line number Diff line
@@ -2006,8 +2006,11 @@ bfa_nw_ioc_pci_init(struct bfa_ioc *ioc, struct bfa_pcidev *pcidev, 
	 */

	if (ioc->asic_gen == BFI_ASIC_GEN_CT)

		bfa_nw_ioc_set_ct_hwif(ioc);

	else

	else {

		WARN_ON(ioc->asic_gen != BFI_ASIC_GEN_CT2);

		bfa_nw_ioc_set_ct2_hwif(ioc);

		bfa_nw_ioc_ct2_poweron(ioc);

	}



	bfa_ioc_map_port(ioc);

	bfa_ioc_reg_init(ioc);

drivers/net/ethernet/brocade/bna/bfa_ioc.h

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ void bfa_nw_ioc_mbox_regisr(struct bfa_ioc *ioc, enum bfi_mclass mc, 


void bfa_nw_ioc_set_ct_hwif(struct bfa_ioc *ioc);

void bfa_nw_ioc_set_ct2_hwif(struct bfa_ioc *ioc);

void bfa_ioc_ct2_poweron(struct bfa_ioc *ioc);

void bfa_nw_ioc_ct2_poweron(struct bfa_ioc *ioc);



void bfa_nw_ioc_attach(struct bfa_ioc *ioc, void *bfa,

		struct bfa_ioc_cbfn *cbfn);

drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c

+1 −1
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ bfa_ioc_ct2_lpu_read_stat(struct bfa_ioc *ioc) 
#define __MSIX_VT_NUMVT_(_v)		((_v) << __MSIX_VT_NUMVT__SH)

#define __MSIX_VT_OFST_			0x000007ff

void

bfa_ioc_ct2_poweron(struct bfa_ioc *ioc)

bfa_nw_ioc_ct2_poweron(struct bfa_ioc *ioc)

{

	void __iomem *rb = ioc->pcidev.pci_bar_kva;

	u32 r32;