Commit 2bfefa2d authored by Brett Creeley's avatar Brett Creeley Committed by Tony Nguyen
Browse files

ice: Use the proto argument for VLAN ops 



Currently the proto argument is unused. This is because the driver only
supports 802.1Q VLAN filtering. This policy is enforced via netdev
features that the driver sets up when configuring the netdev, so the
proto argument won't ever be anything other than 802.1Q. However, this
will allow for future iterations of the driver to seemlessly support
802.1ad filtering. Begin using the proto argument and extend the related
structures to support its use.

Signed-off-by: default avatarBrett Creeley <brett.creeley@intel.com>
Tested-by: default avatarGurucharan G <gurucharanx.g@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent a19d7f7f

drivers/net/ethernet/intel/ice/ice_fltr.c

+2 −0
Original line number Diff line number Diff line
@@ -217,6 +217,8 @@ ice_fltr_add_vlan_to_list(struct ice_vsi *vsi, struct list_head *list, 
	info.fltr_act = ICE_FWD_TO_VSI;

	info.vsi_handle = vsi->idx;

	info.l_data.vlan.vlan_id = vlan->vid;

	info.l_data.vlan.tpid = vlan->tpid;

	info.l_data.vlan.tpid_valid = true;



	return ice_fltr_add_entry_to_list(ice_pf_to_dev(vsi->back), &info,

					  list);

drivers/net/ethernet/intel/ice/ice_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -3923,7 +3923,7 @@ int ice_vsi_add_vlan_zero(struct ice_vsi *vsi) 
{

	struct ice_vlan vlan;



	vlan = ICE_VLAN(0, 0);

	vlan = ICE_VLAN(0, 0, 0);

	return vsi->vlan_ops.add_vlan(vsi, &vlan);

}

drivers/net/ethernet/intel/ice/ice_main.c

+10 −12
Original line number Diff line number Diff line
@@ -3402,14 +3402,13 @@ ice_lb_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi) 
/**

 * ice_vlan_rx_add_vid - Add a VLAN ID filter to HW offload

 * @netdev: network interface to be adjusted

 * @proto: unused protocol

 * @proto: VLAN TPID

 * @vid: VLAN ID to be added

 *

 * net_device_ops implementation for adding VLAN IDs

 */

static int

ice_vlan_rx_add_vid(struct net_device *netdev, __always_unused __be16 proto,

		    u16 vid)

ice_vlan_rx_add_vid(struct net_device *netdev, __be16 proto, u16 vid)

{

	struct ice_netdev_priv *np = netdev_priv(netdev);

	struct ice_vsi *vsi = np->vsi;
@@ -3430,7 +3429,7 @@ ice_vlan_rx_add_vid(struct net_device *netdev, __always_unused __be16 proto, 
	/* Add a switch rule for this VLAN ID so its corresponding VLAN tagged

	 * packets aren't pruned by the device's internal switch on Rx

	 */

	vlan = ICE_VLAN(vid, 0);

	vlan = ICE_VLAN(be16_to_cpu(proto), vid, 0);

	ret = vsi->vlan_ops.add_vlan(vsi, &vlan);

	if (!ret)

		set_bit(ICE_VSI_VLAN_FLTR_CHANGED, vsi->state);
@@ -3441,14 +3440,13 @@ ice_vlan_rx_add_vid(struct net_device *netdev, __always_unused __be16 proto, 
/**

 * ice_vlan_rx_kill_vid - Remove a VLAN ID filter from HW offload

 * @netdev: network interface to be adjusted

 * @proto: unused protocol

 * @proto: VLAN TPID

 * @vid: VLAN ID to be removed

 *

 * net_device_ops implementation for removing VLAN IDs

 */

static int

ice_vlan_rx_kill_vid(struct net_device *netdev, __always_unused __be16 proto,

		     u16 vid)

ice_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto, u16 vid)

{

	struct ice_netdev_priv *np = netdev_priv(netdev);

	struct ice_vsi *vsi = np->vsi;
@@ -3462,7 +3460,7 @@ ice_vlan_rx_kill_vid(struct net_device *netdev, __always_unused __be16 proto, 
	/* Make sure VLAN delete is successful before updating VLAN

	 * information

	 */

	vlan = ICE_VLAN(vid, 0);

	vlan = ICE_VLAN(be16_to_cpu(proto), vid, 0);

	ret = vsi->vlan_ops.del_vlan(vsi, &vlan);

	if (ret)

		return ret;
@@ -5608,14 +5606,14 @@ ice_set_features(struct net_device *netdev, netdev_features_t features) 


	if ((features & NETIF_F_HW_VLAN_CTAG_RX) &&

	    !(netdev->features & NETIF_F_HW_VLAN_CTAG_RX))

		ret = vsi->vlan_ops.ena_stripping(vsi);

		ret = vsi->vlan_ops.ena_stripping(vsi, ETH_P_8021Q);

	else if (!(features & NETIF_F_HW_VLAN_CTAG_RX) &&

		 (netdev->features & NETIF_F_HW_VLAN_CTAG_RX))

		ret = vsi->vlan_ops.dis_stripping(vsi);



	if ((features & NETIF_F_HW_VLAN_CTAG_TX) &&

	    !(netdev->features & NETIF_F_HW_VLAN_CTAG_TX))

		ret = vsi->vlan_ops.ena_insertion(vsi);

		ret = vsi->vlan_ops.ena_insertion(vsi, ETH_P_8021Q);

	else if (!(features & NETIF_F_HW_VLAN_CTAG_TX) &&

		 (netdev->features & NETIF_F_HW_VLAN_CTAG_TX))

		ret = vsi->vlan_ops.dis_insertion(vsi);
@@ -5661,9 +5659,9 @@ static int ice_vsi_vlan_setup(struct ice_vsi *vsi) 
	int ret = 0;



	if (vsi->netdev->features & NETIF_F_HW_VLAN_CTAG_RX)

		ret = vsi->vlan_ops.ena_stripping(vsi);

		ret = vsi->vlan_ops.ena_stripping(vsi, ETH_P_8021Q);

	if (vsi->netdev->features & NETIF_F_HW_VLAN_CTAG_TX)

		ret = vsi->vlan_ops.ena_insertion(vsi);

		ret = vsi->vlan_ops.ena_insertion(vsi, ETH_P_8021Q);



	return ret;

}

drivers/net/ethernet/intel/ice/ice_switch.c

+5 −0
Original line number Diff line number Diff line
@@ -1539,6 +1539,7 @@ ice_fill_sw_rule(struct ice_hw *hw, struct ice_fltr_info *f_info, 
		 struct ice_aqc_sw_rules_elem *s_rule, enum ice_adminq_opc opc)

{

	u16 vlan_id = ICE_MAX_VLAN_ID + 1;

	u16 vlan_tpid = ETH_P_8021Q;

	void *daddr = NULL;

	u16 eth_hdr_sz;

	u8 *eth_hdr;
@@ -1611,6 +1612,8 @@ ice_fill_sw_rule(struct ice_hw *hw, struct ice_fltr_info *f_info, 
		break;

	case ICE_SW_LKUP_VLAN:

		vlan_id = f_info->l_data.vlan.vlan_id;

		if (f_info->l_data.vlan.tpid_valid)

			vlan_tpid = f_info->l_data.vlan.tpid;

		if (f_info->fltr_act == ICE_FWD_TO_VSI ||

		    f_info->fltr_act == ICE_FWD_TO_VSI_LIST) {

			act |= ICE_SINGLE_ACT_PRUNE;
@@ -1653,6 +1656,8 @@ ice_fill_sw_rule(struct ice_hw *hw, struct ice_fltr_info *f_info, 
	if (!(vlan_id > ICE_MAX_VLAN_ID)) {

		off = (__force __be16 *)(eth_hdr + ICE_ETH_VLAN_TCI_OFFSET);

		*off = cpu_to_be16(vlan_id);

		off = (__force __be16 *)(eth_hdr + ICE_ETH_ETHTYPE_OFFSET);

		*off = cpu_to_be16(vlan_tpid);

	}



	/* Create the switch rule with the final dummy Ethernet header */

drivers/net/ethernet/intel/ice/ice_switch.h

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ struct ice_fltr_info { 
		} mac_vlan;

		struct {

			u16 vlan_id;

			u16 tpid;

			u8 tpid_valid;

		} vlan;

		/* Set lkup_type as ICE_SW_LKUP_ETHERTYPE

		 * if just using ethertype as filter. Set lkup_type as