Commit 23044d77 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue 



Tony Nguyen says:

====================
40GbE Intel Wired LAN Driver Updates 2021-12-17

Brett Creeley says:

This patch series adds support in the iavf driver for communicating and
using VIRTCHNL_VF_OFFLOAD_VLAN_V2. The current VIRTCHNL_VF_OFFLOAD_VLAN
is very limited and covers all 802.1Q VLAN offloads and filtering with
no granularity.

The new VIRTCHNL_VF_OFFLOAD_VLAN_V2 adds more granularity, flexibility,
and support for 802.1ad offloads and filtering. This includes the VF
negotiating which VLAN offloads/filtering it's allowed, where VLAN tags
should be inserted and/or stripped into and from descriptors, and the
supported VLAN protocols.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7e1c5d7b 92fc5085

drivers/net/ethernet/intel/iavf/iavf.h

+72 −33
Original line number Diff line number Diff line
@@ -55,7 +55,8 @@ enum iavf_vsi_state_t { 
struct iavf_vsi {

	struct iavf_adapter *back;

	struct net_device *netdev;

	unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];

	unsigned long active_cvlans[BITS_TO_LONGS(VLAN_N_VID)];

	unsigned long active_svlans[BITS_TO_LONGS(VLAN_N_VID)];

	u16 seid;

	u16 id;

	DECLARE_BITMAP(state, __IAVF_VSI_STATE_SIZE__);
@@ -146,9 +147,15 @@ struct iavf_mac_filter { 
	};

};



#define IAVF_VLAN(vid, tpid) ((struct iavf_vlan){ vid, tpid })

struct iavf_vlan {

	u16 vid;

	u16 tpid;

};



struct iavf_vlan_filter {

	struct list_head list;

	u16 vlan;

	struct iavf_vlan vlan;

	bool remove;		/* filter needs to be removed */

	bool add;		/* filter needs to be added */

};
@@ -181,6 +188,8 @@ enum iavf_state_t { 
	__IAVF_REMOVE,		/* driver is being unloaded */

	__IAVF_INIT_VERSION_CHECK,	/* aq msg sent, awaiting reply */

	__IAVF_INIT_GET_RESOURCES,	/* aq msg sent, awaiting reply */

	__IAVF_INIT_GET_OFFLOAD_VLAN_V2_CAPS,

	__IAVF_INIT_CONFIG_ADAPTER,

	__IAVF_INIT_SW,		/* got resources, setting up structs */

	__IAVF_INIT_FAILED,	/* init failed, restarting procedure */

	__IAVF_RESETTING,		/* in reset */
@@ -278,38 +287,47 @@ struct iavf_adapter { 
/* duplicates for common code */

#define IAVF_FLAG_DCB_ENABLED			0

	/* flags for admin queue service task */

	u32 aq_required;

#define IAVF_FLAG_AQ_ENABLE_QUEUES		BIT(0)

#define IAVF_FLAG_AQ_DISABLE_QUEUES		BIT(1)

#define IAVF_FLAG_AQ_ADD_MAC_FILTER		BIT(2)

#define IAVF_FLAG_AQ_ADD_VLAN_FILTER		BIT(3)

#define IAVF_FLAG_AQ_DEL_MAC_FILTER		BIT(4)

#define IAVF_FLAG_AQ_DEL_VLAN_FILTER		BIT(5)

#define IAVF_FLAG_AQ_CONFIGURE_QUEUES		BIT(6)

#define IAVF_FLAG_AQ_MAP_VECTORS		BIT(7)

#define IAVF_FLAG_AQ_HANDLE_RESET		BIT(8)

#define IAVF_FLAG_AQ_CONFIGURE_RSS		BIT(9) /* direct AQ config */

#define IAVF_FLAG_AQ_GET_CONFIG		BIT(10)

	u64 aq_required;

#define IAVF_FLAG_AQ_ENABLE_QUEUES		BIT_ULL(0)

#define IAVF_FLAG_AQ_DISABLE_QUEUES		BIT_ULL(1)

#define IAVF_FLAG_AQ_ADD_MAC_FILTER		BIT_ULL(2)

#define IAVF_FLAG_AQ_ADD_VLAN_FILTER		BIT_ULL(3)

#define IAVF_FLAG_AQ_DEL_MAC_FILTER		BIT_ULL(4)

#define IAVF_FLAG_AQ_DEL_VLAN_FILTER		BIT_ULL(5)

#define IAVF_FLAG_AQ_CONFIGURE_QUEUES		BIT_ULL(6)

#define IAVF_FLAG_AQ_MAP_VECTORS		BIT_ULL(7)

#define IAVF_FLAG_AQ_HANDLE_RESET		BIT_ULL(8)

#define IAVF_FLAG_AQ_CONFIGURE_RSS		BIT_ULL(9) /* direct AQ config */

#define IAVF_FLAG_AQ_GET_CONFIG			BIT_ULL(10)

/* Newer style, RSS done by the PF so we can ignore hardware vagaries. */

#define IAVF_FLAG_AQ_GET_HENA			BIT(11)

#define IAVF_FLAG_AQ_SET_HENA			BIT(12)

#define IAVF_FLAG_AQ_SET_RSS_KEY		BIT(13)

#define IAVF_FLAG_AQ_SET_RSS_LUT		BIT(14)

#define IAVF_FLAG_AQ_REQUEST_PROMISC		BIT(15)

#define IAVF_FLAG_AQ_RELEASE_PROMISC		BIT(16)

#define IAVF_FLAG_AQ_REQUEST_ALLMULTI		BIT(17)

#define IAVF_FLAG_AQ_RELEASE_ALLMULTI		BIT(18)

#define IAVF_FLAG_AQ_ENABLE_VLAN_STRIPPING	BIT(19)

#define IAVF_FLAG_AQ_DISABLE_VLAN_STRIPPING	BIT(20)

#define IAVF_FLAG_AQ_ENABLE_CHANNELS		BIT(21)

#define IAVF_FLAG_AQ_DISABLE_CHANNELS		BIT(22)

#define IAVF_FLAG_AQ_ADD_CLOUD_FILTER		BIT(23)

#define IAVF_FLAG_AQ_DEL_CLOUD_FILTER		BIT(24)

#define IAVF_FLAG_AQ_ADD_FDIR_FILTER		BIT(25)

#define IAVF_FLAG_AQ_DEL_FDIR_FILTER		BIT(26)

#define IAVF_FLAG_AQ_ADD_ADV_RSS_CFG		BIT(27)

#define IAVF_FLAG_AQ_DEL_ADV_RSS_CFG		BIT(28)

#define IAVF_FLAG_AQ_REQUEST_STATS		BIT(29)

#define IAVF_FLAG_AQ_GET_HENA			BIT_ULL(11)

#define IAVF_FLAG_AQ_SET_HENA			BIT_ULL(12)

#define IAVF_FLAG_AQ_SET_RSS_KEY		BIT_ULL(13)

#define IAVF_FLAG_AQ_SET_RSS_LUT		BIT_ULL(14)

#define IAVF_FLAG_AQ_REQUEST_PROMISC		BIT_ULL(15)

#define IAVF_FLAG_AQ_RELEASE_PROMISC		BIT_ULL(16)

#define IAVF_FLAG_AQ_REQUEST_ALLMULTI		BIT_ULL(17)

#define IAVF_FLAG_AQ_RELEASE_ALLMULTI		BIT_ULL(18)

#define IAVF_FLAG_AQ_ENABLE_VLAN_STRIPPING	BIT_ULL(19)

#define IAVF_FLAG_AQ_DISABLE_VLAN_STRIPPING	BIT_ULL(20)

#define IAVF_FLAG_AQ_ENABLE_CHANNELS		BIT_ULL(21)

#define IAVF_FLAG_AQ_DISABLE_CHANNELS		BIT_ULL(22)

#define IAVF_FLAG_AQ_ADD_CLOUD_FILTER		BIT_ULL(23)

#define IAVF_FLAG_AQ_DEL_CLOUD_FILTER		BIT_ULL(24)

#define IAVF_FLAG_AQ_ADD_FDIR_FILTER		BIT_ULL(25)

#define IAVF_FLAG_AQ_DEL_FDIR_FILTER		BIT_ULL(26)

#define IAVF_FLAG_AQ_ADD_ADV_RSS_CFG		BIT_ULL(27)

#define IAVF_FLAG_AQ_DEL_ADV_RSS_CFG		BIT_ULL(28)

#define IAVF_FLAG_AQ_REQUEST_STATS		BIT_ULL(29)

#define IAVF_FLAG_AQ_GET_OFFLOAD_VLAN_V2_CAPS	BIT_ULL(30)

#define IAVF_FLAG_AQ_ENABLE_CTAG_VLAN_STRIPPING		BIT_ULL(31)

#define IAVF_FLAG_AQ_DISABLE_CTAG_VLAN_STRIPPING	BIT_ULL(32)

#define IAVF_FLAG_AQ_ENABLE_STAG_VLAN_STRIPPING		BIT_ULL(33)

#define IAVF_FLAG_AQ_DISABLE_STAG_VLAN_STRIPPING	BIT_ULL(34)

#define IAVF_FLAG_AQ_ENABLE_CTAG_VLAN_INSERTION		BIT_ULL(35)

#define IAVF_FLAG_AQ_DISABLE_CTAG_VLAN_INSERTION	BIT_ULL(36)

#define IAVF_FLAG_AQ_ENABLE_STAG_VLAN_INSERTION		BIT_ULL(37)

#define IAVF_FLAG_AQ_DISABLE_STAG_VLAN_INSERTION	BIT_ULL(38)



	/* OS defined structs */

	struct net_device *netdev;
@@ -349,6 +367,14 @@ struct iavf_adapter { 
			VIRTCHNL_VF_OFFLOAD_RSS_PF)))

#define VLAN_ALLOWED(_a) ((_a)->vf_res->vf_cap_flags & \

			  VIRTCHNL_VF_OFFLOAD_VLAN)

#define VLAN_V2_ALLOWED(_a) ((_a)->vf_res->vf_cap_flags & \

			     VIRTCHNL_VF_OFFLOAD_VLAN_V2)

#define VLAN_V2_FILTERING_ALLOWED(_a) \

	(VLAN_V2_ALLOWED((_a)) && \

	 ((_a)->vlan_v2_caps.filtering.filtering_support.outer || \

	  (_a)->vlan_v2_caps.filtering.filtering_support.inner))

#define VLAN_FILTERING_ALLOWED(_a) \

	(VLAN_ALLOWED((_a)) || VLAN_V2_FILTERING_ALLOWED((_a)))

#define ADV_LINK_SUPPORT(_a) ((_a)->vf_res->vf_cap_flags & \

			      VIRTCHNL_VF_CAP_ADV_LINK_SPEED)

#define FDIR_FLTR_SUPPORT(_a) ((_a)->vf_res->vf_cap_flags & \
@@ -360,6 +386,7 @@ struct iavf_adapter { 
	struct virtchnl_version_info pf_version;

#define PF_IS_V11(_a) (((_a)->pf_version.major == 1) && \

		       ((_a)->pf_version.minor == 1))

	struct virtchnl_vlan_caps vlan_v2_caps;

	u16 msg_enable;

	struct iavf_eth_stats current_stats;

	struct iavf_vsi vsi;
@@ -448,6 +475,7 @@ static inline void iavf_change_state(struct iavf_adapter *adapter, 
int iavf_up(struct iavf_adapter *adapter);

void iavf_down(struct iavf_adapter *adapter);

int iavf_process_config(struct iavf_adapter *adapter);

int iavf_parse_vf_resource_msg(struct iavf_adapter *adapter);

void iavf_schedule_reset(struct iavf_adapter *adapter);

void iavf_schedule_request_stats(struct iavf_adapter *adapter);

void iavf_reset(struct iavf_adapter *adapter);
@@ -466,6 +494,9 @@ int iavf_send_api_ver(struct iavf_adapter *adapter); 
int iavf_verify_api_ver(struct iavf_adapter *adapter);

int iavf_send_vf_config_msg(struct iavf_adapter *adapter);

int iavf_get_vf_config(struct iavf_adapter *adapter);

int iavf_get_vf_vlan_v2_caps(struct iavf_adapter *adapter);

int iavf_send_vf_offload_vlan_v2_msg(struct iavf_adapter *adapter);

void iavf_set_queue_vlan_tag_loc(struct iavf_adapter *adapter);

void iavf_irq_enable(struct iavf_adapter *adapter, bool flush);

void iavf_configure_queues(struct iavf_adapter *adapter);

void iavf_deconfigure_queues(struct iavf_adapter *adapter);
@@ -501,6 +532,14 @@ void iavf_enable_channels(struct iavf_adapter *adapter); 
void iavf_disable_channels(struct iavf_adapter *adapter);

void iavf_add_cloud_filter(struct iavf_adapter *adapter);

void iavf_del_cloud_filter(struct iavf_adapter *adapter);

void iavf_enable_vlan_stripping_v2(struct iavf_adapter *adapter, u16 tpid);

void iavf_disable_vlan_stripping_v2(struct iavf_adapter *adapter, u16 tpid);

void iavf_enable_vlan_insertion_v2(struct iavf_adapter *adapter, u16 tpid);

void iavf_disable_vlan_insertion_v2(struct iavf_adapter *adapter, u16 tpid);

void

iavf_set_vlan_offload_features(struct iavf_adapter *adapter,

			       netdev_features_t prev_features,

			       netdev_features_t features);

void iavf_add_fdir_filter(struct iavf_adapter *adapter);

void iavf_del_fdir_filter(struct iavf_adapter *adapter);

void iavf_add_adv_rss_cfg(struct iavf_adapter *adapter);