d59d69f9e1
Manually rebased:
backport-5.15/704-15-v5.19-net-mtk_eth_soc-move-MAC_MCR-setting-to-mac_finish.patch
Removed upstreamed:
backport-5.15/060-v6.0-01-tools-build-Add-feature-test-for-init_disassemble_in.patch[1]
backport-5.15/060-v6.0-02-tools-include-add-dis-asm-compat.h-to-handle-version.patch[2]
backport-5.15/060-v6.0-03-tools-perf-Fix-compilation-error-with-new-binutils.patch[3]
backport-5.15/060-v6.0-04-tools-bpf_jit_disasm-Fix-compilation-error-with-new-.patch[4]
backport-5.15/060-v6.0-05-tools-bpftool-Fix-compilation-error-with-new-binutil.patch[5]
pending-5.15/733-02-net-ethernet-mtk_eth_soc-fix-RX-data-corruption-issu.patch[6]
bcm47xx/patches-5.15/170-bgmac-fix-initial-chip-reset-to-support-BCM5358.patch[7]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=51b99dc38c1a053e2e732d7f9e2740e343ae7eae
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=451c9d7b16169645ed291ebb2ca9844caa088f2d
3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=97f005c0bdbaf656a7808586d234965385a06c58
4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=1c27fab243333821375e4d63128d60093fdbe149
5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=4441a90091931fd81607567961dc122f24f735bb
6. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=2adc29350a5b4669544566f71f208d2abaec60ab
7. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=04bfc5bcdfc0fdb73587487c71b04d63807ae15a
Build system: x86_64
Build-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod
Run-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod
Signed-off-by: John Audia <therealgraysky@proton.me>
75 lines
2.7 KiB
Diff
75 lines
2.7 KiB
Diff
From 0cf731f9ebb5bf6f252055bebf4463a5c0bd490b Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Tue, 23 Aug 2022 14:24:07 +0200
|
|
Subject: [PATCH] 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: 197c9e9b17b11 ("net: ethernet: mtk_eth_soc: introduce support for mt7986 chipset")
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Link: https://lore.kernel.org/r/091394ea4e705fbb35f828011d98d0ba33808f69.1661257293.git.lorenzo@kernel.org
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
---
|
|
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 22 +++++++++++----------
|
|
drivers/net/ethernet/mediatek/mtk_eth_soc.h | 5 +++++
|
|
2 files changed, 17 insertions(+), 10 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
@@ -1846,10 +1846,19 @@ static int mtk_poll_rx(struct napi_struc
|
|
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;
|
|
@@ -1857,16 +1866,9 @@ static int mtk_poll_rx(struct napi_struc
|
|
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)) {
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
|
|
@@ -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)
|
|
|