Commit ad5afc89 authored by Ariel Elior's avatar Ariel Elior Committed by David S. Miller
Browse files

bnx2x: Separate VF and PF logic 



Generally, the VF driver cannot access the chip, except by the
narrow window its BAR allows. Care had to be taken so the VF driver
will not reach code which accesses the chip elsewhere.
Refactor the nic_load flow into parts so it would be
easier to separate the VF-only logic from the PF-only logic.

Signed-off-by: default avatarAriel Elior <ariele@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4513f925

drivers/net/ethernet/broadcom/bnx2x/bnx2x.h

+1 −0
Original line number Diff line number Diff line
@@ -2221,6 +2221,7 @@ int bnx2x_get_vf_id(struct bnx2x *bp, u32 *vf_id); 
int bnx2x_send_msg2pf(struct bnx2x *bp, u8 *done, dma_addr_t msg_mapping);

int bnx2x_vfpf_acquire(struct bnx2x *bp, u8 tx_count, u8 rx_count);

int bnx2x_vfpf_release(struct bnx2x *bp);

int bnx2x_nic_load_analyze_req(struct bnx2x *bp, u32 load_code);

/* Congestion management fairness mode */

#define CMNG_FNS_NONE		0

#define CMNG_FNS_MINMAX		1

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

+407 −204

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h

+11 −4
Original line number Diff line number Diff line
@@ -1128,11 +1128,18 @@ static inline u8 bnx2x_fp_qzone_id(struct bnx2x_fastpath *fp) 
static inline u32 bnx2x_rx_ustorm_prods_offset(struct bnx2x_fastpath *fp)

{

	struct bnx2x *bp = fp->bp;



	if (!CHIP_IS_E1x(bp))

		return USTORM_RX_PRODS_E2_OFFSET(fp->cl_qzone_id);

	u32 offset = BAR_USTRORM_INTMEM;



	if (IS_VF(bp))

		return PXP_VF_ADDR_USDM_QUEUES_START +

			bp->acquire_resp.resc.hw_qid[fp->index] *

			sizeof(struct ustorm_queue_zone_data);

	else if (!CHIP_IS_E1x(bp))

		offset += USTORM_RX_PRODS_E2_OFFSET(fp->cl_qzone_id);

	else

		return USTORM_RX_PRODS_E1X_OFFSET(BP_PORT(bp), fp->cl_id);

		offset += USTORM_RX_PRODS_E1X_OFFSET(BP_PORT(bp), fp->cl_id);



	return offset;

}



static inline void bnx2x_init_txdata(struct bnx2x *bp,

drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c

+1 −1
Original line number Diff line number Diff line
@@ -890,7 +890,7 @@ static void bnx2x_set_msglevel(struct net_device *dev, u32 level) 


	if (capable(CAP_NET_ADMIN)) {

		/* dump MCP trace */

		if (level & BNX2X_MSG_MCP)

		if (IS_PF(bp) && (level & BNX2X_MSG_MCP))

			bnx2x_fw_dump_lvl(bp, KERN_INFO);

		bp->msg_enable = level;

	}

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+99 −57

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE