1673b7dca3
Backport patches from net-next which fix possible memory and resource leaks in the error codepaths of WED initialization. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
38 lines
1.6 KiB
Diff
38 lines
1.6 KiB
Diff
From ae3ed15da5889263de372ff9df2e83e16acca4cb Mon Sep 17 00:00:00 2001
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
Date: Fri, 30 Sep 2022 01:56:53 +0100
|
|
Subject: [PATCH 1/1] net: ethernet: mtk_eth_soc: fix state in
|
|
__mtk_foe_entry_clear
|
|
|
|
Setting ib1 state to MTK_FOE_STATE_UNBIND in __mtk_foe_entry_clear
|
|
routine as done by commit 0e80707d94e4c8 ("net: ethernet: mtk_eth_soc:
|
|
fix typo in __mtk_foe_entry_clear") breaks flow offloading, at least
|
|
on older MTK_NETSYS_V1 SoCs, OpenWrt users have confirmed the bug on
|
|
MT7622 and MT7621 systems.
|
|
Felix Fietkau suggested to use MTK_FOE_STATE_INVALID instead which
|
|
works well on both, MTK_NETSYS_V1 and MTK_NETSYS_V2.
|
|
|
|
Tested on MT7622 (Linksys E8450) and MT7986 (BananaPi BPI-R3).
|
|
|
|
Suggested-by: Felix Fietkau <nbd@nbd.name>
|
|
Fixes: 0e80707d94e4c8 ("net: ethernet: mtk_eth_soc: fix typo in __mtk_foe_entry_clear")
|
|
Fixes: 33fc42de33278b ("net: ethernet: mtk_eth_soc: support creating mac address based offload entries")
|
|
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
Link: https://lore.kernel.org/r/YzY+1Yg0FBXcnrtc@makrotopia.org
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/mediatek/mtk_ppe.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_ppe.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_ppe.c
|
|
@@ -442,7 +442,7 @@ __mtk_foe_entry_clear(struct mtk_ppe *pp
|
|
struct mtk_foe_entry *hwe = mtk_foe_get_entry(ppe, entry->hash);
|
|
|
|
hwe->ib1 &= ~MTK_FOE_IB1_STATE;
|
|
- hwe->ib1 |= FIELD_PREP(MTK_FOE_IB1_STATE, MTK_FOE_STATE_UNBIND);
|
|
+ hwe->ib1 |= FIELD_PREP(MTK_FOE_IB1_STATE, MTK_FOE_STATE_INVALID);
|
|
dma_wmb();
|
|
}
|
|
entry->hash = 0xffff;
|