Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4dbbe8dd authored by Jose Abreu's avatar Jose Abreu Committed by David S. Miller
Browse files

net: stmmac: Add support for U32 TC filter using Flexible RX Parser 



This adds support for U32 filter by using an HW only feature called
Flexible RX Parser. This allow us to match any given packet field with a
pattern and accept/reject or even route the packet to a specific DMA
channel.

Right now we only support acception or rejection of frame and we only
support simple rules. Though, the Parser has the flexibility of jumping to
specific rules as an if condition so complex rules can be established.

This is only supported in GMAC5.10+.

The following commands can be used to test this code:

	1) Setup an ingress qdisk:
	# tc qdisc add dev eth0 handle ffff: ingress

	2) Setup a filter (e.g. filter by IP):
	# tc filter add dev eth0 parent ffff: protocol ip u32 match ip \
		src 192.168.0.3 skip_sw action drop

In every tests performed we always used the "skip_sw" flag to make sure
only the RX Parser was involved.

Signed-off-by: default avatarJose Abreu <joabreu@synopsys.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Joao Pinto <jpinto@synopsys.com>
Cc: Vitor Soares <soares@synopsys.com>
Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Jakub Kicinski <kubakici@wp.pl>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b2641e2a

drivers/net/ethernet/stmicro/stmmac/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ stmmac-objs:= stmmac_main.o stmmac_ethtool.o stmmac_mdio.o ring_mode.o \ 
	      dwmac100_core.o dwmac100_dma.o enh_desc.o norm_desc.o	\

	      mmc_core.o stmmac_hwtstamp.o stmmac_ptp.o dwmac4_descs.o	\

	      dwmac4_dma.o dwmac4_lib.o dwmac4_core.o dwmac5.o hwif.o \

	      $(stmmac-y)

	      stmmac_tc.o $(stmmac-y)



# Ordering matters. Generic driver must be last.

obj-$(CONFIG_STMMAC_PLATFORM)	+= stmmac-platform.o

drivers/net/ethernet/stmicro/stmmac/common.h

+5 −0
Original line number Diff line number Diff line
@@ -353,6 +353,10 @@ struct dma_features { 
	unsigned int rx_fifo_size;

	/* Automotive Safety Package */

	unsigned int asp;

	/* RX Parser */

	unsigned int frpsel;

	unsigned int frpbs;

	unsigned int frpes;

};



/* GMAC TX FIFO is 8K, Rx FIFO is 16K */
@@ -412,6 +416,7 @@ struct mac_device_info { 
	const struct stmmac_dma_ops *dma;

	const struct stmmac_mode_ops *mode;

	const struct stmmac_hwtimestamp *ptp;

	const struct stmmac_tc_ops *tc;

	struct mii_regs mii;	/* MII register Addresses */

	struct mac_link link;

	void __iomem *pcsr;     /* vpointer to device CSRs */

drivers/net/ethernet/stmicro/stmmac/dwmac4.h

+4 −0
Original line number Diff line number Diff line
@@ -194,6 +194,9 @@ enum power_event { 


/* MAC HW features3 bitmap */

#define GMAC_HW_FEAT_ASP		GENMASK(29, 28)

#define GMAC_HW_FEAT_FRPES		GENMASK(14, 13)

#define GMAC_HW_FEAT_FRPBS		GENMASK(12, 11)

#define GMAC_HW_FEAT_FRPSEL		BIT(10)



/* MAC HW ADDR regs */

#define GMAC_HI_DCS			GENMASK(18, 16)
@@ -202,6 +205,7 @@ enum power_event { 


/*  MTL registers */

#define MTL_OPERATION_MODE		0x00000c00

#define MTL_FRPE			BIT(15)

#define MTL_OPERATION_SCHALG_MASK	GENMASK(6, 5)

#define MTL_OPERATION_SCHALG_WRR	(0x0 << 5)

#define MTL_OPERATION_SCHALG_WFQ	(0x1 << 5)

drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c

+1 −0
Original line number Diff line number Diff line
@@ -795,6 +795,7 @@ const struct stmmac_ops dwmac510_ops = { 
	.safety_feat_config = dwmac5_safety_feat_config,

	.safety_feat_irq_status = dwmac5_safety_feat_irq_status,

	.safety_feat_dump = dwmac5_safety_feat_dump,

	.rxp_config = dwmac5_rxp_config,

};



int dwmac4_setup(struct stmmac_priv *priv)

drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c

+3 −0
Original line number Diff line number Diff line
@@ -379,6 +379,9 @@ static void dwmac4_get_hw_feature(void __iomem *ioaddr, 


	/* 5.10 Features */

	dma_cap->asp = (hw_cap & GMAC_HW_FEAT_ASP) >> 28;

	dma_cap->frpes = (hw_cap & GMAC_HW_FEAT_FRPES) >> 13;

	dma_cap->frpbs = (hw_cap & GMAC_HW_FEAT_FRPBS) >> 11;

	dma_cap->frpsel = (hw_cap & GMAC_HW_FEAT_FRPSEL) >> 10;

}



/* Enable/disable TSO feature and set MSS */