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

Merge branch 'prestera-next' 



Volodymyr Mytnyk says:

====================
net: prestera: acl: migrate to new vTcam/counter api

This patch series aims to use new vTcam and Counter API
provided by latest fw version. The advantage of using
this API is the following:

- provides a way to have a rule with desired Tcam size (improves
  Tcam memory utilization).
- batch support for acl counters gathering (improves performance)
- gives more control over HW ACL engine (actions/matches/bindings)
  to be able to support more features in the future driver
  versions

Note: the feature set left the same as was before this patch.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4c897cfc adefefe5

drivers/net/ethernet/marvell/prestera/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,6 +3,6 @@ obj-$(CONFIG_PRESTERA) += prestera.o 
prestera-objs		:= prestera_main.o prestera_hw.o prestera_dsa.o \

			   prestera_rxtx.o prestera_devlink.o prestera_ethtool.o \

			   prestera_switchdev.o prestera_acl.o prestera_flow.o \

			   prestera_flower.o prestera_span.o

			   prestera_flower.o prestera_span.o prestera_counter.o



obj-$(CONFIG_PRESTERA_PCI)	+= prestera_pci.o

drivers/net/ethernet/marvell/prestera/prestera.h

+1 −0
Original line number Diff line number Diff line
@@ -248,6 +248,7 @@ struct prestera_switch { 
	u32 mtu_max;

	u8 id;

	struct prestera_lag *lags;

	struct prestera_counter *counter;

	u8 lag_member_max;

	u8 lag_max;

};

drivers/net/ethernet/marvell/prestera/prestera_acl.c

+496 −182

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/marvell/prestera/prestera_acl.h

+129 −84

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/marvell/prestera/prestera_counter.c

0 → 100644
+475 −0

File added.

Preview size limit exceeded, changes collapsed.