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

Merge branch 'Offload-tc-flower-to-mscc_ocelot-switch-using-VCAP-chains' 

Vladimir Oltean says:

====================
Offload tc-flower to mscc_ocelot switch using VCAP chains

The purpose of this patch is to add more comprehensive support for flow
offloading in the mscc_ocelot library and switch drivers.

The design (with chains) is the result of this discussion:
https://lkml.org/lkml/2020/6/2/203



I have tested it on Seville VSC9953 and Felix VSC9959, but it should
also work on Ocelot-1 VSC7514.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 26d0a8ed 8cd6b020

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -12542,6 +12542,7 @@ F: drivers/net/dsa/ocelot/* 
F:	drivers/net/ethernet/mscc/

F:	include/soc/mscc/ocelot*

F:	net/dsa/tag_ocelot.c

F:	tools/testing/selftests/drivers/net/ocelot/*









OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER









M:	Frederic Barrat <fbarrat@linux.ibm.com>
































drivers/net/dsa/ocelot/felix.c



+22
−0






























Original line number
Diff line number
Diff line







@@ -810,3 +810,25 @@ const struct dsa_switch_ops felix_switch_ops = {







	.cls_flower_stats	= felix_cls_flower_stats,









	.port_setup_tc		= felix_port_setup_tc,









};



















struct net_device *felix_port_to_netdev(struct ocelot *ocelot, int port)









{









	struct felix *felix = ocelot_to_felix(ocelot);









	struct dsa_switch *ds = felix->ds;



















	if (!dsa_is_user_port(ds, port))









		return NULL;



















	return dsa_to_port(ds, port)->slave;









}



















int felix_netdev_to_port(struct net_device *dev)









{









	struct dsa_port *dp;



















	dp = dsa_port_from_netdev(dev);









	if (IS_ERR(dp))









		return -EINVAL;



















	return dp->index;









}
























drivers/net/dsa/ocelot/felix.h



+3
−0






























Original line number
Diff line number
Diff line







@@ -52,4 +52,7 @@ struct felix {







	resource_size_t			imdio_base;









};



















struct net_device *felix_port_to_netdev(struct ocelot *ocelot, int port);









int felix_netdev_to_port(struct net_device *dev);



















#endif
























drivers/net/dsa/ocelot/felix_vsc9959.c



+3
−0






























Original line number
Diff line number
Diff line







@@ -711,6 +711,7 @@ static const struct vcap_field vsc9959_vcap_is1_actions[] = {







	[VCAP_IS1_ACT_PAG_OVERRIDE_MASK]	= { 13,  8},









	[VCAP_IS1_ACT_PAG_VAL]			= { 21,  8},









	[VCAP_IS1_ACT_RSV]			= { 29,  9},









	/* The fields below are incorrectly shifted by 2 in the manual */









	[VCAP_IS1_ACT_VID_REPLACE_ENA]		= { 38,  1},









	[VCAP_IS1_ACT_VID_ADD_VAL]		= { 39, 12},









	[VCAP_IS1_ACT_FID_SEL]			= { 51,  2},








@@ -1006,6 +1007,8 @@ static u16 vsc9959_wm_enc(u16 value)







static const struct ocelot_ops vsc9959_ops = {









	.reset			= vsc9959_reset,









	.wm_enc			= vsc9959_wm_enc,









	.port_to_netdev		= felix_port_to_netdev,









	.netdev_to_port		= felix_netdev_to_port,









};



















static int vsc9959_mdio_bus_alloc(struct ocelot *ocelot)
































drivers/net/dsa/ocelot/seville_vsc9953.c



+2
−0






























Original line number
Diff line number
Diff line







@@ -1058,6 +1058,8 @@ static u16 vsc9953_wm_enc(u16 value)







static const struct ocelot_ops vsc9953_ops = {









	.reset			= vsc9953_reset,









	.wm_enc			= vsc9953_wm_enc,









	.port_to_netdev		= felix_port_to_netdev,









	.netdev_to_port		= felix_netdev_to_port,









};



















static int vsc9953_mdio_bus_alloc(struct ocelot *ocelot)








































































CRA Git | Maintained and supported by SUSTech CRA and CCSE