Commit 0cf731f9 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Paolo Abeni
Browse files

net: ethernet: mtk_eth_soc: fix hw hash reporting for MTK_NETSYS_V2 



Properly report hw rx hash for mt7986 chipset accroding to the new dma
descriptor layout.

Fixes: 197c9e9b ("net: ethernet: mtk_eth_soc: introduce support for mt7986 chipset")
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Link: https://lore.kernel.org/r/091394ea4e705fbb35f828011d98d0ba33808f69.1661257293.git.lorenzo@kernel.org


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 24c7a64e

drivers/net/ethernet/mediatek/mtk_eth_soc.c

+12 −10
Original line number Diff line number Diff line
@@ -1891,10 +1891,19 @@ static int mtk_poll_rx(struct napi_struct *napi, int budget, 
		skb->dev = netdev;

		bytes += skb->len;



		if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2))

		if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2)) {

			hash = trxd.rxd5 & MTK_RXD5_FOE_ENTRY;

			if (hash != MTK_RXD5_FOE_ENTRY)

				skb_set_hash(skb, jhash_1word(hash, 0),

					     PKT_HASH_TYPE_L4);

			rxdcsum = &trxd.rxd3;

		else

		} else {

			hash = trxd.rxd4 & MTK_RXD4_FOE_ENTRY;

			if (hash != MTK_RXD4_FOE_ENTRY)

				skb_set_hash(skb, jhash_1word(hash, 0),

					     PKT_HASH_TYPE_L4);

			rxdcsum = &trxd.rxd4;

		}



		if (*rxdcsum & eth->soc->txrx.rx_dma_l4_valid)

			skb->ip_summed = CHECKSUM_UNNECESSARY;
@@ -1902,16 +1911,9 @@ static int mtk_poll_rx(struct napi_struct *napi, int budget, 
			skb_checksum_none_assert(skb);

		skb->protocol = eth_type_trans(skb, netdev);



		hash = trxd.rxd4 & MTK_RXD4_FOE_ENTRY;

		if (hash != MTK_RXD4_FOE_ENTRY) {

			hash = jhash_1word(hash, 0);

			skb_set_hash(skb, hash, PKT_HASH_TYPE_L4);

		}



		reason = FIELD_GET(MTK_RXD4_PPE_CPU_REASON, trxd.rxd4);

		if (reason == MTK_PPE_CPU_REASON_HIT_UNBIND_RATE_REACHED)

			mtk_ppe_check_skb(eth->ppe, skb,

					  trxd.rxd4 & MTK_RXD4_FOE_ENTRY);

			mtk_ppe_check_skb(eth->ppe, skb, hash);



		if (netdev->features & NETIF_F_HW_VLAN_CTAG_RX) {

			if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2)) {

drivers/net/ethernet/mediatek/mtk_eth_soc.h

+5 −0
Original line number Diff line number Diff line
@@ -314,6 +314,11 @@ 
#define RX_DMA_L4_VALID_PDMA	BIT(30)		/* when PDMA is used */

#define RX_DMA_SPECIAL_TAG	BIT(22)



/* PDMA descriptor rxd5 */

#define MTK_RXD5_FOE_ENTRY	GENMASK(14, 0)

#define MTK_RXD5_PPE_CPU_REASON	GENMASK(22, 18)

#define MTK_RXD5_SRC_PORT	GENMASK(29, 26)



#define RX_DMA_GET_SPORT(x)	(((x) >> 19) & 0xf)

#define RX_DMA_GET_SPORT_V2(x)	(((x) >> 26) & 0x7)