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

Commit 723a6c7a authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bnx2x' 



Yuval Mintz says:

====================
bnx2x: Bug fixes patch series

Most of what this parch series contains is SR-IOV related bug fixes.
Additionally, it contains some small fixes for legacy devices/modes.

Please consider applying these patches to `net'.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a02bdd42 e8379c79

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

+6 −1
Original line number Diff line number Diff line
@@ -1250,7 +1250,10 @@ struct bnx2x_slowpath { 
	 * Therefore, if they would have been defined in the same union,

	 * data can get corrupted.

	 */

	struct afex_vif_list_ramrod_data func_afex_rdata;

	union {

		struct afex_vif_list_ramrod_data	viflist_data;

		struct function_update_data		func_update;

	} func_afex_rdata;



	/* used by dmae command executer */

	struct dmae_command		dmae[MAX_DMAE_C];
@@ -2499,4 +2502,6 @@ void bnx2x_set_local_cmng(struct bnx2x *bp); 
#define MCPR_SCRATCH_BASE(bp) \

	(CHIP_IS_E1x(bp) ? MCP_REG_MCPR_SCRATCH : MCP_A_REG_MCPR_SCRATCH)



#define E1H_MAX_MF_SB_COUNT (HC_SB_MAX_SB_E1X/(E1HVN_MAX * PORT_MAX))



#endif /* bnx2x.h */

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

+3 −3
Original line number Diff line number Diff line
@@ -11447,9 +11447,9 @@ static int bnx2x_get_hwinfo(struct bnx2x *bp) 
		}

	}



	/* adjust igu_sb_cnt to MF for E1x */

	if (CHIP_IS_E1x(bp) && IS_MF(bp))

		bp->igu_sb_cnt /= E1HVN_MAX;

	/* adjust igu_sb_cnt to MF for E1H */

	if (CHIP_IS_E1H(bp) && IS_MF(bp))

		bp->igu_sb_cnt = min_t(u8, bp->igu_sb_cnt, E1H_MAX_MF_SB_COUNT);



	/* port info */

	bnx2x_get_port_hwinfo(bp);

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

+11 −4
Original line number Diff line number Diff line
@@ -2038,6 +2038,7 @@ static int bnx2x_vlan_mac_del_all(struct bnx2x *bp, 
	struct bnx2x_vlan_mac_ramrod_params p;

	struct bnx2x_exe_queue_obj *exeq = &o->exe_queue;

	struct bnx2x_exeq_elem *exeq_pos, *exeq_pos_n;

	unsigned long flags;

	int read_lock;

	int rc = 0;
@@ -2046,8 +2047,9 @@ static int bnx2x_vlan_mac_del_all(struct bnx2x *bp, 
	spin_lock_bh(&exeq->lock);



	list_for_each_entry_safe(exeq_pos, exeq_pos_n, &exeq->exe_queue, link) {

		if (exeq_pos->cmd_data.vlan_mac.vlan_mac_flags ==

		    *vlan_mac_flags) {

		flags = exeq_pos->cmd_data.vlan_mac.vlan_mac_flags;

		if (BNX2X_VLAN_MAC_CMP_FLAGS(flags) ==

		    BNX2X_VLAN_MAC_CMP_FLAGS(*vlan_mac_flags)) {

			rc = exeq->remove(bp, exeq->owner, exeq_pos);

			if (rc) {

				BNX2X_ERR("Failed to remove command\n");
@@ -2080,7 +2082,9 @@ static int bnx2x_vlan_mac_del_all(struct bnx2x *bp, 
		return read_lock;



	list_for_each_entry(pos, &o->head, link) {

		if (pos->vlan_mac_flags == *vlan_mac_flags) {

		flags = pos->vlan_mac_flags;

		if (BNX2X_VLAN_MAC_CMP_FLAGS(flags) ==

		    BNX2X_VLAN_MAC_CMP_FLAGS(*vlan_mac_flags)) {

			p.user_req.vlan_mac_flags = pos->vlan_mac_flags;

			memcpy(&p.user_req.u, &pos->u, sizeof(pos->u));

			rc = bnx2x_config_vlan_mac(bp, &p);
@@ -4382,8 +4386,11 @@ int bnx2x_config_rss(struct bnx2x *bp, 
	struct bnx2x_raw_obj *r = &o->raw;



	/* Do nothing if only driver cleanup was requested */

	if (test_bit(RAMROD_DRV_CLR_ONLY, &p->ramrod_flags))

	if (test_bit(RAMROD_DRV_CLR_ONLY, &p->ramrod_flags)) {

		DP(BNX2X_MSG_SP, "Not configuring RSS ramrod_flags=%lx\n",

		   p->ramrod_flags);

		return 0;

	}



	r->set_pending(r);

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

+7 −0
Original line number Diff line number Diff line
@@ -266,6 +266,13 @@ enum { 
	BNX2X_DONT_CONSUME_CAM_CREDIT,

	BNX2X_DONT_CONSUME_CAM_CREDIT_DEST,

};

/* When looking for matching filters, some flags are not interesting */

#define BNX2X_VLAN_MAC_CMP_MASK	(1 << BNX2X_UC_LIST_MAC | \

				 1 << BNX2X_ETH_MAC | \

				 1 << BNX2X_ISCSI_ETH_MAC | \

				 1 << BNX2X_NETQ_ETH_MAC)

#define BNX2X_VLAN_MAC_CMP_FLAGS(flags) \

	((flags) & BNX2X_VLAN_MAC_CMP_MASK)



struct bnx2x_vlan_mac_ramrod_params {

	/* Object to run the command from */

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

+144 −110
Original line number Diff line number Diff line
@@ -1209,6 +1209,11 @@ static void bnx2x_vfop_rxmode(struct bnx2x *bp, struct bnx2x_virtf *vf) 
		/* next state */

		vfop->state = BNX2X_VFOP_RXMODE_DONE;



		/* record the accept flags in vfdb so hypervisor can modify them

		 * if necessary

		 */

		bnx2x_vfq(vf, ramrod->cl_id - vf->igu_base_id, accept_flags) =

			ramrod->rx_accept_flags;

		vfop->rc = bnx2x_config_rx_mode(bp, ramrod);

		bnx2x_vfop_finalize(vf, vfop->rc, VFOP_DONE);

op_err:
@@ -1224,26 +1229,18 @@ static void bnx2x_vfop_rxmode(struct bnx2x *bp, struct bnx2x_virtf *vf) 
	return;

}



int bnx2x_vfop_rxmode_cmd(struct bnx2x *bp,

static void bnx2x_vf_prep_rx_mode(struct bnx2x *bp, u8 qid,

				  struct bnx2x_rx_mode_ramrod_params *ramrod,

				  struct bnx2x_virtf *vf,

			  struct bnx2x_vfop_cmd *cmd,

			  int qid, unsigned long accept_flags)

				  unsigned long accept_flags)

{

	struct bnx2x_vf_queue *vfq = vfq_get(vf, qid);

	struct bnx2x_vfop *vfop = bnx2x_vfop_add(bp, vf);



	if (vfop) {

		struct bnx2x_rx_mode_ramrod_params *ramrod =

			&vf->op_params.rx_mode;



	memset(ramrod, 0, sizeof(*ramrod));



		/* Prepare ramrod parameters */

	ramrod->cid = vfq->cid;

	ramrod->cl_id = vfq_cl_id(vf, vfq);

	ramrod->rx_mode_obj = &bp->rx_mode_obj;

	ramrod->func_id = FW_VF_HANDLE(vf->abs_vfid);



	ramrod->rx_accept_flags = accept_flags;

	ramrod->tx_accept_flags = accept_flags;

	ramrod->pstate = &vf->filter_state;
@@ -1253,10 +1250,22 @@ int bnx2x_vfop_rxmode_cmd(struct bnx2x *bp, 
	set_bit(RAMROD_RX, &ramrod->ramrod_flags);

	set_bit(RAMROD_TX, &ramrod->ramrod_flags);



		ramrod->rdata =

			bnx2x_vf_sp(bp, vf, rx_mode_rdata.e2);

		ramrod->rdata_mapping =

			bnx2x_vf_sp_map(bp, vf, rx_mode_rdata.e2);

	ramrod->rdata = bnx2x_vf_sp(bp, vf, rx_mode_rdata.e2);

	ramrod->rdata_mapping = bnx2x_vf_sp_map(bp, vf, rx_mode_rdata.e2);

}



int bnx2x_vfop_rxmode_cmd(struct bnx2x *bp,

			  struct bnx2x_virtf *vf,

			  struct bnx2x_vfop_cmd *cmd,

			  int qid, unsigned long accept_flags)

{

	struct bnx2x_vfop *vfop = bnx2x_vfop_add(bp, vf);



	if (vfop) {

		struct bnx2x_rx_mode_ramrod_params *ramrod =

			&vf->op_params.rx_mode;



		bnx2x_vf_prep_rx_mode(bp, qid, ramrod, vf, accept_flags);



		bnx2x_vfop_opset(BNX2X_VFOP_RXMODE_CONFIG,

				 bnx2x_vfop_rxmode, cmd->done);
@@ -3202,13 +3211,16 @@ int bnx2x_enable_sriov(struct bnx2x *bp) 
		bnx2x_iov_static_resc(bp, vf);

	}



	/* prepare msix vectors in VF configuration space */

	/* prepare msix vectors in VF configuration space - the value in the

	 * PCI configuration space should be the index of the last entry,

	 * namely one less than the actual size of the table

	 */

	for (vf_idx = first_vf; vf_idx < first_vf + req_vfs; vf_idx++) {

		bnx2x_pretend_func(bp, HW_VF_HANDLE(bp, vf_idx));

		REG_WR(bp, PCICFG_OFFSET + GRC_CONFIG_REG_VF_MSIX_CONTROL,

		       num_vf_queues);

		       num_vf_queues - 1);

		DP(BNX2X_MSG_IOV, "set msix vec num in VF %d cfg space to %d\n",

		   vf_idx, num_vf_queues);

		   vf_idx, num_vf_queues - 1);

	}

	bnx2x_pretend_func(bp, BP_ABS_FUNC(bp));
@@ -3436,10 +3448,18 @@ int bnx2x_set_vf_mac(struct net_device *dev, int vfidx, u8 *mac) 


int bnx2x_set_vf_vlan(struct net_device *dev, int vfidx, u16 vlan, u8 qos)

{

	struct bnx2x_queue_state_params q_params = {NULL};

	struct bnx2x_vlan_mac_ramrod_params ramrod_param;

	struct bnx2x_queue_update_params *update_params;

	struct pf_vf_bulletin_content *bulletin = NULL;

	struct bnx2x_rx_mode_ramrod_params rx_ramrod;

	struct bnx2x *bp = netdev_priv(dev);

	int rc, q_logical_state;

	struct bnx2x_vlan_mac_obj *vlan_obj;

	unsigned long vlan_mac_flags = 0;

	unsigned long ramrod_flags = 0;

	struct bnx2x_virtf *vf = NULL;

	struct pf_vf_bulletin_content *bulletin = NULL;

	unsigned long accept_flags;

	int rc;



	/* sanity and init */

	rc = bnx2x_vf_ndo_prep(bp, vfidx, &vf, &bulletin);
@@ -3457,29 +3477,26 @@ int bnx2x_set_vf_vlan(struct net_device *dev, int vfidx, u16 vlan, u8 qos) 
	/* update PF's copy of the VF's bulletin. No point in posting the vlan

	 * to the VF since it doesn't have anything to do with it. But it useful

	 * to store it here in case the VF is not up yet and we can only

	 * configure the vlan later when it does.

	 * configure the vlan later when it does. Treat vlan id 0 as remove the

	 * Host tag.

	 */

	if (vlan > 0)

		bulletin->valid_bitmap |= 1 << VLAN_VALID;

	else

		bulletin->valid_bitmap &= ~(1 << VLAN_VALID);

	bulletin->vlan = vlan;



	/* is vf initialized and queue set up? */

	q_logical_state =

		bnx2x_get_q_logical_state(bp, &bnx2x_leading_vfq(vf, sp_obj));

	if (vf->state == VF_ENABLED &&

	    q_logical_state == BNX2X_Q_LOGICAL_STATE_ACTIVE) {

		/* configure the vlan in device on this vf's queue */

		unsigned long ramrod_flags = 0;

		unsigned long vlan_mac_flags = 0;

		struct bnx2x_vlan_mac_obj *vlan_obj =

			&bnx2x_leading_vfq(vf, vlan_obj);

		struct bnx2x_vlan_mac_ramrod_params ramrod_param;

		struct bnx2x_queue_state_params q_params = {NULL};

		struct bnx2x_queue_update_params *update_params;

	if (vf->state != VF_ENABLED ||

	    bnx2x_get_q_logical_state(bp, &bnx2x_leading_vfq(vf, sp_obj)) !=

	    BNX2X_Q_LOGICAL_STATE_ACTIVE)

		return rc;



	/* configure the vlan in device on this vf's queue */

	vlan_obj = &bnx2x_leading_vfq(vf, vlan_obj);

	rc = validate_vlan_mac(bp, &bnx2x_leading_vfq(vf, mac_obj));

	if (rc)

		return rc;

		memset(&ramrod_param, 0, sizeof(ramrod_param));



	/* must lock vfpf channel to protect against vf flows */

	bnx2x_lock_vf_pf_channel(bp, vf, CHANNEL_TLV_PF_SET_VLAN);
@@ -3494,6 +3511,34 @@ int bnx2x_set_vf_vlan(struct net_device *dev, int vfidx, u16 vlan, u8 qos) 
		goto out;

	}



	/* need to remove/add the VF's accept_any_vlan bit */

	accept_flags = bnx2x_leading_vfq(vf, accept_flags);

	if (vlan)

		clear_bit(BNX2X_ACCEPT_ANY_VLAN, &accept_flags);

	else

		set_bit(BNX2X_ACCEPT_ANY_VLAN, &accept_flags);



	bnx2x_vf_prep_rx_mode(bp, LEADING_IDX, &rx_ramrod, vf,

			      accept_flags);

	bnx2x_leading_vfq(vf, accept_flags) = accept_flags;

	bnx2x_config_rx_mode(bp, &rx_ramrod);



	/* configure the new vlan to device */

	memset(&ramrod_param, 0, sizeof(ramrod_param));

	__set_bit(RAMROD_COMP_WAIT, &ramrod_flags);

	ramrod_param.vlan_mac_obj = vlan_obj;

	ramrod_param.ramrod_flags = ramrod_flags;

	set_bit(BNX2X_DONT_CONSUME_CAM_CREDIT,

		&ramrod_param.user_req.vlan_mac_flags);

	ramrod_param.user_req.u.vlan.vlan = vlan;

	ramrod_param.user_req.cmd = BNX2X_VLAN_MAC_ADD;

	rc = bnx2x_config_vlan_mac(bp, &ramrod_param);

	if (rc) {

		BNX2X_ERR("failed to configure vlan\n");

		rc =  -EINVAL;

		goto out;

	}



	/* send queue update ramrod to configure default vlan and silent

	 * vlan removal

	 */
@@ -3505,7 +3550,6 @@ int bnx2x_set_vf_vlan(struct net_device *dev, int vfidx, u16 vlan, u8 qos) 
		  &update_params->update_flags);

	__set_bit(BNX2X_Q_UPDATE_SILENT_VLAN_REM_CHNG,

		  &update_params->update_flags);



	if (vlan == 0) {

		/* if vlan is 0 then we want to leave the VF traffic

		 * untagged, and leave the incoming traffic untouched
@@ -3516,28 +3560,17 @@ int bnx2x_set_vf_vlan(struct net_device *dev, int vfidx, u16 vlan, u8 qos) 
		__clear_bit(BNX2X_Q_UPDATE_SILENT_VLAN_REM,

			    &update_params->update_flags);

	} else {

			/* configure the new vlan to device */

			__set_bit(RAMROD_COMP_WAIT, &ramrod_flags);

			ramrod_param.vlan_mac_obj = vlan_obj;

			ramrod_param.ramrod_flags = ramrod_flags;

			ramrod_param.user_req.u.vlan.vlan = vlan;

			ramrod_param.user_req.cmd = BNX2X_VLAN_MAC_ADD;

			rc = bnx2x_config_vlan_mac(bp, &ramrod_param);

			if (rc) {

				BNX2X_ERR("failed to configure vlan\n");

				rc =  -EINVAL;

				goto out;

			}



		/* configure default vlan to vf queue and set silent

		 * vlan removal (the vf remains unaware of this vlan).

		 */

			update_params = &q_params.params.update;

		__set_bit(BNX2X_Q_UPDATE_DEF_VLAN_EN,

			  &update_params->update_flags);

		__set_bit(BNX2X_Q_UPDATE_SILENT_VLAN_REM,

			  &update_params->update_flags);

		update_params->def_vlan = vlan;

		update_params->silent_removal_value =

			vlan & VLAN_VID_MASK;

		update_params->silent_removal_mask = VLAN_VID_MASK;

	}



	/* Update the Queue state */
@@ -3547,6 +3580,7 @@ int bnx2x_set_vf_vlan(struct net_device *dev, int vfidx, u16 vlan, u8 qos) 
		goto out;

	}





	/* clear the flag indicating that this VF needs its vlan

	 * (will only be set if the HV configured the Vlan before vf was

	 * up and we were called because the VF came up later
@@ -3554,7 +3588,7 @@ int bnx2x_set_vf_vlan(struct net_device *dev, int vfidx, u16 vlan, u8 qos) 
out:

	vf->cfg_flags &= ~VF_CFG_VLAN;

	bnx2x_unlock_vf_pf_channel(bp, vf, CHANNEL_TLV_PF_SET_VLAN);

	}



	return rc;

}