424210b7be
Manually rebased: backport-5.15/715-v6.0-net-ethernet-mtk_eth_soc-add-the-capability-to-run-m.patch hack-5.15/645-netfilter-connmark-introduce-set-dscpmark.patch[1] Removed upstreamed: pending-5.15/701-netfilter-nf_flow_table-add-missing-locking.patch[2] All other patches automatically rebased 1. Rebase by Kevin 'ldir' Darbyshire-Bryant<ldir@darbyshire-bryant.me.uk> 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.81&id=8db9e60cdfdae5b049e32e82323da8f0f989066a Build system: x86_64 Build-tested: bcm2711/RPi4B, filogic/xiaomi_redmi-router-ax6000-stock Run-tested: bcm2711/RPi4B, filogic/xiaomi_redmi-router-ax6000-stock Signed-off-by: John Audia <therealgraysky@proton.me>
47 lines
1.5 KiB
Diff
47 lines
1.5 KiB
Diff
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Mon, 6 Jun 2022 21:49:00 +0200
|
|
Subject: [PATCH] net: ethernet: mtk_eth_soc: enable rx cksum offload for
|
|
MTK_NETSYS_V2
|
|
|
|
Enable rx checksum offload for mt7986 chipset.
|
|
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Link: https://lore.kernel.org/r/c8699805c18f7fd38315fcb8da2787676d83a32c.1654544585.git.lorenzo@kernel.org
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
@@ -1462,8 +1462,8 @@ static int mtk_poll_rx(struct napi_struc
|
|
int done = 0, bytes = 0;
|
|
|
|
while (done < budget) {
|
|
+ unsigned int pktlen, *rxdcsum;
|
|
struct net_device *netdev;
|
|
- unsigned int pktlen;
|
|
dma_addr_t dma_addr;
|
|
u32 hash, reason;
|
|
int mac = 0;
|
|
@@ -1530,7 +1530,13 @@ static int mtk_poll_rx(struct napi_struc
|
|
pktlen = RX_DMA_GET_PLEN0(trxd.rxd2);
|
|
skb->dev = netdev;
|
|
skb_put(skb, pktlen);
|
|
- if (trxd.rxd4 & eth->soc->txrx.rx_dma_l4_valid)
|
|
+
|
|
+ if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2))
|
|
+ rxdcsum = &trxd.rxd3;
|
|
+ else
|
|
+ rxdcsum = &trxd.rxd4;
|
|
+
|
|
+ if (*rxdcsum & eth->soc->txrx.rx_dma_l4_valid)
|
|
skb->ip_summed = CHECKSUM_UNNECESSARY;
|
|
else
|
|
skb_checksum_none_assert(skb);
|
|
@@ -3758,6 +3764,7 @@ static const struct mtk_soc_data mt7986_
|
|
.txd_size = sizeof(struct mtk_tx_dma_v2),
|
|
.rxd_size = sizeof(struct mtk_rx_dma_v2),
|
|
.rx_irq_done_mask = MTK_RX_DONE_INT_V2,
|
|
+ .rx_dma_l4_valid = RX_DMA_L4_VALID_V2,
|
|
.dma_max_len = MTK_TX_DMA_BUF_LEN_V2,
|
|
.dma_len_offset = 8,
|
|
},
|