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

Merge branch 'sfc-tc-offload' 



Edward Cree says:

====================
sfc: bare bones TC offload

This series begins the work of supporting TC flower offload on EF100 NICs.
This is the absolute minimum viable TC implementation to get traffic to
 VFs and allow them to be tested; it supports no match fields besides
 ingress port, no actions besides mirred and drop, and no stats.
More matches, actions, and counters will be added in subsequent patches.

Changed in v2:
 - Add missing 'static' on declarations (kernel test robot, sparse)
====================

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

drivers/net/ethernet/sfc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ sfc-y += efx.o efx_common.o efx_channels.o nic.o \ 
			   ef100_ethtool.o ef100_rx.o ef100_tx.o

sfc-$(CONFIG_SFC_MTD)	+= mtd.o

sfc-$(CONFIG_SFC_SRIOV)	+= sriov.o ef10_sriov.o ef100_sriov.o ef100_rep.o \

                           mae.o tc.o

                           mae.o tc.o tc_bindings.o



obj-$(CONFIG_SFC)	+= sfc.o

drivers/net/ethernet/sfc/ef100_ethtool.c

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ const struct ethtool_ops ef100_ethtool_ops = { 
	.get_pauseparam         = efx_ethtool_get_pauseparam,

	.set_pauseparam         = efx_ethtool_set_pauseparam,

	.get_sset_count		= efx_ethtool_get_sset_count,

	.get_priv_flags		= efx_ethtool_get_priv_flags,

	.set_priv_flags		= efx_ethtool_set_priv_flags,

	.self_test		= efx_ethtool_self_test,

	.get_strings		= efx_ethtool_get_strings,

	.get_link_ksettings	= efx_ethtool_get_link_ksettings,

drivers/net/ethernet/sfc/ef100_netdev.c

+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include "mcdi_filters.h"

#include "rx_common.h"

#include "ef100_sriov.h"

#include "tc_bindings.h"



static void ef100_update_name(struct efx_nic *efx)

{
@@ -246,6 +247,9 @@ static const struct net_device_ops ef100_netdev_ops = { 
#ifdef CONFIG_RFS_ACCEL

	.ndo_rx_flow_steer      = efx_filter_rfs,

#endif

#ifdef CONFIG_SFC_SRIOV

	.ndo_setup_tc		= efx_tc_setup,

#endif

};



/*	Netdev registration

drivers/net/ethernet/sfc/ef100_nic.c

+3 −0
Original line number Diff line number Diff line
@@ -1137,6 +1137,9 @@ int ef100_probe_netdev_pf(struct efx_nic *efx) 
		 */

		netif_warn(efx, probe, net_dev, "Failed to probe MAE rc %d\n",

			   rc);

	} else {

		net_dev->features |= NETIF_F_HW_TC;

		efx->fixed_features |= NETIF_F_HW_TC;

	}

#endif

	return 0;

drivers/net/ethernet/sfc/ef100_rep.c

+17 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include "ef100_nic.h"

#include "mae.h"

#include "rx_common.h"

#include "tc_bindings.h"



#define EFX_EF100_REP_DRIVER	"efx_ef100_rep"
@@ -107,6 +108,20 @@ static int efx_ef100_rep_get_phys_port_name(struct net_device *dev, 
	return 0;

}



static int efx_ef100_rep_setup_tc(struct net_device *net_dev,

				  enum tc_setup_type type, void *type_data)

{

	struct efx_rep *efv = netdev_priv(net_dev);

	struct efx_nic *efx = efv->parent;



	if (type == TC_SETUP_CLSFLOWER)

		return efx_tc_flower(efx, net_dev, type_data, efv);

	if (type == TC_SETUP_BLOCK)

		return efx_tc_setup_block(net_dev, efx, type_data, efv);



	return -EOPNOTSUPP;

}



static void efx_ef100_rep_get_stats64(struct net_device *dev,

				      struct rtnl_link_stats64 *stats)

{
@@ -120,13 +135,14 @@ static void efx_ef100_rep_get_stats64(struct net_device *dev, 
	stats->tx_errors = atomic64_read(&efv->stats.tx_errors);

}



static const struct net_device_ops efx_ef100_rep_netdev_ops = {

const struct net_device_ops efx_ef100_rep_netdev_ops = {

	.ndo_open		= efx_ef100_rep_open,

	.ndo_stop		= efx_ef100_rep_close,

	.ndo_start_xmit		= efx_ef100_rep_xmit,

	.ndo_get_port_parent_id	= efx_ef100_rep_get_port_parent_id,

	.ndo_get_phys_port_name	= efx_ef100_rep_get_phys_port_name,

	.ndo_get_stats64	= efx_ef100_rep_get_stats64,

	.ndo_setup_tc		= efx_ef100_rep_setup_tc,

};



static void efx_ef100_rep_get_drvinfo(struct net_device *dev,