git.openwrt.org Git - openwrt/staging/stintel.git/blob

   1 From ae3ed15da5889263de372ff9df2e83e16acca4cb Mon Sep 17 00:00:00 2001
   2 From: Daniel Golle <daniel@makrotopia.org>
   3 Date: Fri, 30 Sep 2022 01:56:53 +0100
   4 Subject: [PATCH 1/1] net: ethernet: mtk_eth_soc: fix state in
   5  __mtk_foe_entry_clear
   6
   7 Setting ib1 state to MTK_FOE_STATE_UNBIND in __mtk_foe_entry_clear
   8 routine as done by commit 0e80707d94e4c8 ("net: ethernet: mtk_eth_soc:
   9 fix typo in __mtk_foe_entry_clear") breaks flow offloading, at least
  10 on older MTK_NETSYS_V1 SoCs, OpenWrt users have confirmed the bug on
  11 MT7622 and MT7621 systems.
  12 Felix Fietkau suggested to use MTK_FOE_STATE_INVALID instead which
  13 works well on both, MTK_NETSYS_V1 and MTK_NETSYS_V2.
  14
  15 Tested on MT7622 (Linksys E8450) and MT7986 (BananaPi BPI-R3).
  16
  17 Suggested-by: Felix Fietkau <nbd@nbd.name>
  18 Fixes: 0e80707d94e4c8 ("net: ethernet: mtk_eth_soc: fix typo in __mtk_foe_entry_clear")
  19 Fixes: 33fc42de33278b ("net: ethernet: mtk_eth_soc: support creating mac address based offload entries")
  20 Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  21 Link: https://lore.kernel.org/r/YzY+1Yg0FBXcnrtc@makrotopia.org
  22 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  23 ---
  24  drivers/net/ethernet/mediatek/mtk_ppe.c | 2 +-
  25  1 file changed, 1 insertion(+), 1 deletion(-)
  26
  27 --- a/drivers/net/ethernet/mediatek/mtk_ppe.c
  28 +++ b/drivers/net/ethernet/mediatek/mtk_ppe.c
  29 @@ -442,7 +442,7 @@ __mtk_foe_entry_clear(struct mtk_ppe *pp
  30                 struct mtk_foe_entry *hwe = mtk_foe_get_entry(ppe, entry->hash);
  31
  32                 hwe->ib1 &= ~MTK_FOE_IB1_STATE;
  33 -               hwe->ib1 |= FIELD_PREP(MTK_FOE_IB1_STATE, MTK_FOE_STATE_UNBIND);
  34 +               hwe->ib1 |= FIELD_PREP(MTK_FOE_IB1_STATE, MTK_FOE_STATE_INVALID);
  35                 dma_wmb();
  36         }
  37         entry->hash = 0xffff;