Commit 9dc0cad2 authored by Edward Cree's avatar Edward Cree Committed by David S. Miller
Browse files

sfc: bind blocks for TC offload on EF100 



Bind direct blocks for the MAE-admin PF and each VF representor.
Currently these connect to a stub efx_tc_flower() that only returns
 -EOPNOTSUPP; subsequent patches will implement flower offloads to the
 Match-Action Engine.

Signed-off-by: default avatarEdward Cree <ecree.xilinx@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c87e4ad1

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_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

+16 −0
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)

{
@@ -127,6 +142,7 @@ static const struct net_device_ops efx_ef100_rep_netdev_ops = { 
	.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,

drivers/net/ethernet/sfc/tc.c

+13 −1
Original line number Diff line number Diff line
@@ -58,6 +58,12 @@ static void efx_tc_delete_rule(struct efx_nic *efx, struct efx_tc_flow_rule *rul 
	rule->fw_id = MC_CMD_MAE_ACTION_RULE_INSERT_OUT_ACTION_RULE_ID_NULL;

}



int efx_tc_flower(struct efx_nic *efx, struct net_device *net_dev,

		  struct flow_cls_offload *tc, struct efx_rep *efv)

{

	return -EOPNOTSUPP;

}



static int efx_tc_configure_default_rule(struct efx_nic *efx, u32 ing_port,

					 u32 eg_port, struct efx_tc_flow_rule *rule)

{
@@ -207,7 +213,11 @@ int efx_init_tc(struct efx_nic *efx) 
	rc = efx_tc_configure_default_rule_wire(efx);

	if (rc)

		return rc;

	return efx_tc_configure_rep_mport(efx);

	rc = efx_tc_configure_rep_mport(efx);

	if (rc)

		return rc;

	efx->tc->up = true;

	return 0;

}



void efx_fini_tc(struct efx_nic *efx)
@@ -218,6 +228,7 @@ void efx_fini_tc(struct efx_nic *efx) 
	efx_tc_deconfigure_rep_mport(efx);

	efx_tc_deconfigure_default_rule(efx, &efx->tc->dflt.pf);

	efx_tc_deconfigure_default_rule(efx, &efx->tc->dflt.wire);

	efx->tc->up = false;

}



int efx_init_struct_tc(struct efx_nic *efx)
@@ -228,6 +239,7 @@ int efx_init_struct_tc(struct efx_nic *efx) 
	efx->tc = kzalloc(sizeof(*efx->tc), GFP_KERNEL);

	if (!efx->tc)

		return -ENOMEM;

	INIT_LIST_HEAD(&efx->tc->block_list);



	efx->tc->reps_filter_uc = -1;

	efx->tc->reps_filter_mc = -1;