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

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

bnx2x: Add iproute2 support for vfs 



This patch adds support for iproute2 callbacks allowing querying a physical
function as to its child virtual functions, and setting the macs and vlans
of said virtual functions.

Signed-off-by: default avatarAriel Elior <ariele@broadcom.com>
Signed-off-by: default avatarYuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3786b942

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

+1 −0
Original line number Diff line number Diff line
@@ -1214,6 +1214,7 @@ enum { 
	BNX2X_SP_RTNL_ENABLE_SRIOV,

	BNX2X_SP_RTNL_VFPF_MCAST,

	BNX2X_SP_RTNL_VFPF_STORM_RX_MODE,

	BNX2X_SP_RTNL_HYPERVISOR_VLAN,

};

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

+3 −0
Original line number Diff line number Diff line
@@ -496,7 +496,10 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev); 
/* setup_tc callback */

int bnx2x_setup_tc(struct net_device *dev, u8 num_tc);



int bnx2x_get_vf_config(struct net_device *dev, int vf,

			struct ifla_vf_info *ivi);

int bnx2x_set_vf_mac(struct net_device *dev, int queue, u8 *mac);

int bnx2x_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan, u8 qos);



/* select_queue callback */

u16 bnx2x_select_queue(struct net_device *dev, struct sk_buff *skb);

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

+27 −11
Original line number Diff line number Diff line
@@ -75,8 +75,6 @@ 
#define FW_FILE_NAME_E1H	"bnx2x/bnx2x-e1h-" FW_FILE_VERSION ".fw"

#define FW_FILE_NAME_E2		"bnx2x/bnx2x-e2-" FW_FILE_VERSION ".fw"



#define MAC_LEADING_ZERO_CNT (ALIGN(ETH_ALEN, sizeof(u32)) - ETH_ALEN)



/* Time in jiffies before concluding the transmitter is hung */

#define TX_TIMEOUT		(5*HZ)
@@ -3227,16 +3225,29 @@ static void bnx2x_drv_info_ether_stat(struct bnx2x *bp) 
{

	struct eth_stats_info *ether_stat =

		&bp->slowpath->drv_info_to_mcp.ether_stat;

	struct bnx2x_vlan_mac_obj *mac_obj =

		&bp->sp_objs->mac_obj;

	int i;



	strlcpy(ether_stat->version, DRV_MODULE_VERSION,

		ETH_STAT_INFO_VERSION_LEN);



	bp->sp_objs[0].mac_obj.get_n_elements(bp, &bp->sp_objs[0].mac_obj,

	/* get DRV_INFO_ETH_STAT_NUM_MACS_REQUIRED macs, placing them in the

	 * mac_local field in ether_stat struct. The base address is offset by 2

	 * bytes to account for the field being 8 bytes but a mac address is

	 * only 6 bytes. Likewise, the stride for the get_n_elements function is

	 * 2 bytes to compensate from the 6 bytes of a mac to the 8 bytes

	 * allocated by the ether_stat struct, so the macs will land in their

	 * proper positions.

	 */

	for (i = 0; i < DRV_INFO_ETH_STAT_NUM_MACS_REQUIRED; i++)

		memset(ether_stat->mac_local + i, 0,

		       sizeof(ether_stat->mac_local[0]));

	mac_obj->get_n_elements(bp, &bp->sp_objs[0].mac_obj,

				DRV_INFO_ETH_STAT_NUM_MACS_REQUIRED,

					ether_stat->mac_local);



				ether_stat->mac_local + MAC_PAD, MAC_PAD,

				ETH_ALEN);

	ether_stat->mtu_size = bp->dev->mtu;



	if (bp->dev->features & NETIF_F_RXCSUM)

		ether_stat->feature_flags |= FEATURE_ETH_CHKSUM_OFFLOAD_MASK;

	if (bp->dev->features & NETIF_F_TSO)
@@ -3258,8 +3269,7 @@ static void bnx2x_drv_info_fcoe_stat(struct bnx2x *bp) 
	if (!CNIC_LOADED(bp))

		return;



	memcpy(fcoe_stat->mac_local + MAC_LEADING_ZERO_CNT,

	       bp->fip_mac, ETH_ALEN);

	memcpy(fcoe_stat->mac_local + MAC_PAD, bp->fip_mac, ETH_ALEN);



	fcoe_stat->qos_priority =

		app->traffic_type_priority[LLFC_TRAFFIC_TYPE_FCOE];
@@ -3361,8 +3371,8 @@ static void bnx2x_drv_info_iscsi_stat(struct bnx2x *bp) 
	if (!CNIC_LOADED(bp))

		return;



	memcpy(iscsi_stat->mac_local + MAC_LEADING_ZERO_CNT,

	       bp->cnic_eth_dev.iscsi_mac, ETH_ALEN);

	memcpy(iscsi_stat->mac_local + MAC_PAD, bp->cnic_eth_dev.iscsi_mac,

	       ETH_ALEN);



	iscsi_stat->qos_priority =

		app->traffic_type_priority[LLFC_TRAFFIC_TYPE_ISCSI];
@@ -9525,6 +9535,10 @@ static void bnx2x_sp_rtnl_task(struct work_struct *work) 
		bnx2x_vfpf_storm_rx_mode(bp);

	}



	if (test_and_clear_bit(BNX2X_SP_RTNL_HYPERVISOR_VLAN,

			       &bp->sp_rtnl_state))

		bnx2x_pf_set_vfs_vlan(bp);



	/* work which needs rtnl lock not-taken (as it takes the lock itself and

	 * can be called from other contexts as well)

	 */
@@ -11798,6 +11812,8 @@ static const struct net_device_ops bnx2x_netdev_ops = { 
	.ndo_setup_tc		= bnx2x_setup_tc,

#ifdef CONFIG_BNX2X_SRIOV

	.ndo_set_vf_mac		= bnx2x_set_vf_mac,

	.ndo_set_vf_vlan        = bnx2x_set_vf_vlan,

	.ndo_get_vf_config	= bnx2x_get_vf_config,

#endif

#ifdef NETDEV_FCOE_WWNN

	.ndo_fcoe_get_wwn	= bnx2x_fcoe_get_wwn,

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

+7 −17
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ 


#define BNX2X_MAX_EMUL_MULTI		16



#define MAC_LEADING_ZERO_CNT (ALIGN(ETH_ALEN, sizeof(u32)) - ETH_ALEN)



/**** Exe Queue interfaces ****/



/**
@@ -444,30 +442,21 @@ static bool bnx2x_put_credit_vlan_mac(struct bnx2x_vlan_mac_obj *o) 
}



static int bnx2x_get_n_elements(struct bnx2x *bp, struct bnx2x_vlan_mac_obj *o,

				int n, u8 *buf)

				int n, u8 *base, u8 stride, u8 size)

{

	struct bnx2x_vlan_mac_registry_elem *pos;

	u8 *next = buf;

	u8 *next = base;

	int counter = 0;



	/* traverse list */

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

		if (counter < n) {

			/* place leading zeroes in buffer */

			memset(next, 0, MAC_LEADING_ZERO_CNT);



			/* place mac after leading zeroes*/

			memcpy(next + MAC_LEADING_ZERO_CNT, pos->u.mac.mac,

			       ETH_ALEN);



			/* calculate address of next element and

			 * advance counter

			 */

			memcpy(next, &pos->u, size);

			counter++;

			next = buf + counter * ALIGN(ETH_ALEN, sizeof(u32));

			DP(BNX2X_MSG_SP, "copied element number %d to address %p element was:\n",

			   counter, next);

			next += stride + size;



			DP(BNX2X_MSG_SP, "copied element number %d to address %p element was %pM\n",

			   counter, next, pos->u.mac.mac);

		}

	}

	return counter * ETH_ALEN;
@@ -2013,6 +2002,7 @@ void bnx2x_init_vlan_obj(struct bnx2x *bp, 
		vlan_obj->check_move        = bnx2x_check_move;

		vlan_obj->ramrod_cmd        =

			RAMROD_CMD_ID_ETH_CLASSIFICATION_RULES;

		vlan_obj->get_n_elements    = bnx2x_get_n_elements;



		/* Exe Queue */

		bnx2x_exe_queue_init(bp,

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

+4 −2
Original line number Diff line number Diff line
@@ -313,8 +313,9 @@ struct bnx2x_vlan_mac_obj { 
	 *

	 * @return number of copied bytes

	 */

	int (*get_n_elements)(struct bnx2x *bp, struct bnx2x_vlan_mac_obj *o,

			      int n, u8 *buf);

	int (*get_n_elements)(struct bnx2x *bp,

			      struct bnx2x_vlan_mac_obj *o, int n, u8 *base,

			      u8 stride, u8 size);



	/**

	 * Checks if ADD-ramrod with the given params may be performed.
@@ -842,6 +843,7 @@ enum bnx2x_q_type { 
#define BNX2X_MULTI_TX_COS_E3B0			3

#define BNX2X_MULTI_TX_COS			3 /* Maximum possible */



#define MAC_PAD (ALIGN(ETH_ALEN, sizeof(u32)) - ETH_ALEN)



struct bnx2x_queue_init_params {

	struct {