net: ethernet: ti: cpsw: fix cpts irq after suspend
Subsystems (3)
PATCH 1/1 net: ethernet: ti: cpsw: fix cpts irq after suspend
Depending on the SoC/platform the CPSW can completely lose context after a suspend/resume cycle, including CPSW wrapper (WR) which will cause reset of WR_C0_MISC_EN register, so CPTS IRQ will became disabled.
Fix it by moving CPTS IRQ enabling in cpsw_ndo_open() where CPTS is actually started.
--- drivers/net/ethernet/ti/cpsw.c | 10 ++++++---- drivers/net/ethernet/ti/cpsw_new.c | 9 ++++++--- 2 files changed, 12 insertions(+), 7 deletions(-)
drivers/net/ethernet/ti/cpsw.c +6 -4
@@ -838,9 +838,12 @@ static int cpsw_ndo_open(struct net_device *ndev)if (ret <0 ) goto err_cleanup; -if (cpts_register (cpsw->cpts)) -dev_err (priv->dev,"error registering cpts device\n" ); - +if (cpsw->cpts) { +if (cpts_register (cpsw->cpts)) +dev_err (priv->dev,"error registering cpts device\n" ); +else +writel (0x10 , &cpsw->wr_regs->misc_en); + } }cpsw_restore (priv);
@@ -1716,7 +1719,6 @@ static int cpsw_probe(struct platform_device *pdev)/* Enable misc CPTS evnt_pend IRQ */ cpts_set_irqpoll (cpsw->cpts, false); -writel (0x10 , &cpsw->wr_regs->misc_en); skip_cpts: cpsw_notice(priv, probe,
drivers/net/ethernet/ti/cpsw_new.c +6 -3
@@ -873,8 +873,12 @@ static int cpsw_ndo_open(struct net_device *ndev)if (ret <0 ) goto err_cleanup; -if (cpts_register (cpsw->cpts)) -dev_err (priv->dev,"error registering cpts device\n" ); +if (cpsw->cpts) { +if (cpts_register (cpsw->cpts)) +dev_err (priv->dev,"error registering cpts device\n" ); +else +writel (0x10 , &cpsw->wr_regs->misc_en); + }napi_enable (&cpsw->napi_rx);napi_enable (&cpsw->napi_tx);
@@ -2006,7 +2010,6 @@ static int cpsw_probe(struct platform_device *pdev)/* Enable misc CPTS evnt_pend IRQ */ cpts_set_irqpoll (cpsw->cpts, false); -writel (0x10 , &cpsw->wr_regs->misc_en); skip_cpts: ret =cpsw_register_notifiers (cpsw);
Signature · 1 line
2.17.1
Quoted 10 lines · Grygorii Strashko
Depending on the SoC/platform the CPSW can completely lose context after a suspend/resume cycle, including CPSW wrapper (WR) which will cause reset of
WR_C0_MISC_ENregister, so CPTS IRQ will became disabled.Fix it by moving CPTS IRQ enabling in
cpsw_ndo_open()where CPTS is actually started.Fixes 84ea9c0a95d7 ("net: ethernet: ti: cpsw: enable cpts irq")Reported-by Tony Lindgren <[email protected]>Signed-off-by Grygorii Strashko <[email protected]>
Thanks this works for me:
This patch was applied to netdev/net.git (refs/heads/master):
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
Quoted 8 lines · On Thu, 12 Nov 2020 13:15:46 +0200 you wrote:
Depending on the SoC/platform the CPSW can completely lose context after a suspend/resume cycle, including CPSW wrapper (WR) which will cause reset of
WR_C0_MISC_ENregister, so CPTS IRQ will became disabled.Fix it by moving CPTS IRQ enabling in
cpsw_ndo_open()where CPTS is actually started.[...]
Here is the summary with links:
- net: ethernet: ti: cpsw: fix cpts irq after suspend
https://git.kernel.org/netdev/net/c/2b5668733050
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html