mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 22:26:55 +00:00
net: ethernet: mtk_eth_soc: fix PPE hanging issue
[ Upstream commitea80e3ed09
] A patch to resolve an issue was found in MediaTek's GPL-licensed SDK: In the mtk_ppe_stop() function, the PPE scan mode is not disabled before disabling the PPE. This can potentially lead to a hang during the process of disabling the PPE. Without this patch, the PPE may experience a hang during the reboot test. Link:b40da332df
Fixes:ba37b7caf1
("net: ethernet: mtk_eth_soc: add support for initializing the PPE") Suggested-by: Bc-bocun Chen <bc-bocun.chen@mediatek.com> Signed-off-by: Daniel Golle <daniel@makrotopia.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
448cc8b5f7
commit
9fcadd1250
1 changed files with 11 additions and 7 deletions
|
@ -425,7 +425,7 @@ int mtk_ppe_start(struct mtk_ppe *ppe)
|
||||||
MTK_PPE_KEEPALIVE_DISABLE) |
|
MTK_PPE_KEEPALIVE_DISABLE) |
|
||||||
FIELD_PREP(MTK_PPE_TB_CFG_HASH_MODE, 1) |
|
FIELD_PREP(MTK_PPE_TB_CFG_HASH_MODE, 1) |
|
||||||
FIELD_PREP(MTK_PPE_TB_CFG_SCAN_MODE,
|
FIELD_PREP(MTK_PPE_TB_CFG_SCAN_MODE,
|
||||||
MTK_PPE_SCAN_MODE_KEEPALIVE_AGE) |
|
MTK_PPE_SCAN_MODE_CHECK_AGE) |
|
||||||
FIELD_PREP(MTK_PPE_TB_CFG_ENTRY_NUM,
|
FIELD_PREP(MTK_PPE_TB_CFG_ENTRY_NUM,
|
||||||
MTK_PPE_ENTRIES_SHIFT);
|
MTK_PPE_ENTRIES_SHIFT);
|
||||||
ppe_w32(ppe, MTK_PPE_TB_CFG, val);
|
ppe_w32(ppe, MTK_PPE_TB_CFG, val);
|
||||||
|
@ -493,17 +493,21 @@ int mtk_ppe_stop(struct mtk_ppe *ppe)
|
||||||
|
|
||||||
mtk_ppe_cache_enable(ppe, false);
|
mtk_ppe_cache_enable(ppe, false);
|
||||||
|
|
||||||
/* disable offload engine */
|
|
||||||
ppe_clear(ppe, MTK_PPE_GLO_CFG, MTK_PPE_GLO_CFG_EN);
|
|
||||||
ppe_w32(ppe, MTK_PPE_FLOW_CFG, 0);
|
|
||||||
|
|
||||||
/* disable aging */
|
/* disable aging */
|
||||||
val = MTK_PPE_TB_CFG_AGE_NON_L4 |
|
val = MTK_PPE_TB_CFG_AGE_NON_L4 |
|
||||||
MTK_PPE_TB_CFG_AGE_UNBIND |
|
MTK_PPE_TB_CFG_AGE_UNBIND |
|
||||||
MTK_PPE_TB_CFG_AGE_TCP |
|
MTK_PPE_TB_CFG_AGE_TCP |
|
||||||
MTK_PPE_TB_CFG_AGE_UDP |
|
MTK_PPE_TB_CFG_AGE_UDP |
|
||||||
MTK_PPE_TB_CFG_AGE_TCP_FIN;
|
MTK_PPE_TB_CFG_AGE_TCP_FIN |
|
||||||
|
MTK_PPE_TB_CFG_SCAN_MODE;
|
||||||
ppe_clear(ppe, MTK_PPE_TB_CFG, val);
|
ppe_clear(ppe, MTK_PPE_TB_CFG, val);
|
||||||
|
|
||||||
return mtk_ppe_wait_busy(ppe);
|
if (mtk_ppe_wait_busy(ppe))
|
||||||
|
return -ETIMEDOUT;
|
||||||
|
|
||||||
|
/* disable offload engine */
|
||||||
|
ppe_clear(ppe, MTK_PPE_GLO_CFG, MTK_PPE_GLO_CFG_EN);
|
||||||
|
ppe_w32(ppe, MTK_PPE_FLOW_CFG, 0);
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue