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

Commit 1ad0751d authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlx4-vf-vlan-802.1ad' 



Tariq Toukan says:

====================
mlx4 VF vlan protocol 802.1ad support

This patchset adds VF VLAN protocol 802.1ad support to the
mlx4 driver.
We extended the VF VLAN API with an additional parameter
for VLAN protocol, and kept 802.1Q as drivers' default.

We prepared a userspace support (ip link tool).
The patch will be submitted to the iproute2 mailing list.

The ip link tool VF VLAN protocol parameter is optional (default: 802.1Q).
A configuration command of VF VLAN that is used prior to this patchset
will result in same functionality as today's (VST with VLAN protocol 802.1Q).

The series generated against net-next commit:
688dc536 "Merge branch 'mlx4-next'"

All maintainers of the modified modules are in cc.

v3:
  Expand the UAPI to a nested list to support future use-cases.
  Use a more formal feature name.

v2:
  Drop patch 4 ("net/mlx4_core: Add an option to configure SVLAN TPID").
  Patch 1/5: Update commit log.
  2-3/5: Split patch 2 into two patches, to separate between changes
         done in mlx4_core and the ones done in mlx4_en.
  4-5/5: Split patch 3 into two patches, to separate between the
         addition of a protocol parameter and the actual implementation
	 in mlx4_en.
	 In addition, we implement a handshake mechanism so PF and VF
	 exchange their VST QinQ support capability.
====================

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

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

+2 −1
Original line number Diff line number Diff line
@@ -492,7 +492,8 @@ int __bnx2x_setup_tc(struct net_device *dev, u32 handle, __be16 proto, 
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);

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

		      __be16 vlan_proto);



/* select_queue callback */

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

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

+7 −2
Original line number Diff line number Diff line
@@ -2521,7 +2521,8 @@ void bnx2x_pf_set_vfs_vlan(struct bnx2x *bp) 
	for_each_vf(bp, vfidx) {

		bulletin = BP_VF_BULLETIN(bp, vfidx);

		if (bulletin->valid_bitmap & (1 << VLAN_VALID))

			bnx2x_set_vf_vlan(bp->dev, vfidx, bulletin->vlan, 0);

			bnx2x_set_vf_vlan(bp->dev, vfidx, bulletin->vlan, 0,

					  htons(ETH_P_8021Q));

	}

}
@@ -2781,7 +2782,8 @@ static int bnx2x_set_vf_vlan_filter(struct bnx2x *bp, struct bnx2x_virtf *vf, 
	return 0;

}



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

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

		      __be16 vlan_proto)

{

	struct pf_vf_bulletin_content *bulletin = NULL;

	struct bnx2x *bp = netdev_priv(dev);
@@ -2796,6 +2798,9 @@ int bnx2x_set_vf_vlan(struct net_device *dev, int vfidx, u16 vlan, u8 qos) 
		return -EINVAL;

	}



	if (vlan_proto != htons(ETH_P_8021Q))

		return -EPROTONOSUPPORT;



	DP(BNX2X_MSG_IOV, "configuring VF %d with VLAN %d qos %d\n",

	   vfidx, vlan, 0);

drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c

+5 −1
Original line number Diff line number Diff line
@@ -174,7 +174,8 @@ int bnxt_set_vf_mac(struct net_device *dev, int vf_id, u8 *mac) 
	return hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);

}



int bnxt_set_vf_vlan(struct net_device *dev, int vf_id, u16 vlan_id, u8 qos)

int bnxt_set_vf_vlan(struct net_device *dev, int vf_id, u16 vlan_id, u8 qos,

		     __be16 vlan_proto)

{

	struct hwrm_func_cfg_input req = {0};

	struct bnxt *bp = netdev_priv(dev);
@@ -185,6 +186,9 @@ int bnxt_set_vf_vlan(struct net_device *dev, int vf_id, u16 vlan_id, u8 qos) 
	if (bp->hwrm_spec_code < 0x10201)

		return -ENOTSUPP;



	if (vlan_proto != htons(ETH_P_8021Q))

		return -EPROTONOSUPPORT;



	rc = bnxt_vf_ndo_prep(bp, vf_id);

	if (rc)

		return rc;

drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 


int bnxt_get_vf_config(struct net_device *, int, struct ifla_vf_info *);

int bnxt_set_vf_mac(struct net_device *, int, u8 *);

int bnxt_set_vf_vlan(struct net_device *, int, u16, u8);

int bnxt_set_vf_vlan(struct net_device *, int, u16, u8, __be16);

int bnxt_set_vf_bw(struct net_device *, int, int, int);

int bnxt_set_vf_link_state(struct net_device *, int, int);

int bnxt_set_vf_spoofchk(struct net_device *, int, bool);

drivers/net/ethernet/emulex/benet/be_main.c

+5 −1
Original line number Diff line number Diff line
@@ -1895,7 +1895,8 @@ static int be_clear_vf_tvt(struct be_adapter *adapter, int vf) 
	return 0;

}



static int be_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan, u8 qos)

static int be_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan, u8 qos,

			  __be16 vlan_proto)

{

	struct be_adapter *adapter = netdev_priv(netdev);

	struct be_vf_cfg *vf_cfg = &adapter->vf_cfg[vf];
@@ -1907,6 +1908,9 @@ static int be_set_vf_vlan(struct net_device *netdev, int vf, u16 vlan, u8 qos) 
	if (vf >= adapter->num_vfs || vlan > 4095 || qos > 7)

		return -EINVAL;



	if (vlan_proto != htons(ETH_P_8021Q))

		return -EPROTONOSUPPORT;



	if (vlan || qos) {

		vlan |= qos << VLAN_PRIO_SHIFT;

		status = be_set_vf_tvt(adapter, vf, vlan);