net: fec: fix clock count mis-match
Subsystems (3)
PATCH v4 1/1 net: fec: fix clock count mis-match
pm_runtime_put_autosuspend in probe will call runtime suspend to disable clks automatically if CONFIG_PM is defined. (If CONFIG_PM is not defined, its implementation will be empty, then runtime suspend will not be called.)
Therefore, we can call pm_runtime_get_sync to runtime resume it first to enable clks, which matches the runtime suspend. (Only when CONFIG_PM is defined, otherwise pm_runtime_get_sync will also be empty, then runtime resume will not be called.)
Then it is fine to disable clks without causing clock count mis-match.
---
Changes in v4:
- Fix some typos.
drivers/net/ethernet/freescale/fec_main.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/net/ethernet/freescale/fec_main.c +11 -4
@@ -3636,6 +3636,11 @@ fec_drv_remove(struct platform_device *pdev)struct net_device *ndev =platform_get_drvdata (pdev);struct fec_enet_private *fep =netdev_priv (ndev);struct device_node *np = pdev->dev.of_node; +int ret; + + ret =pm_runtime_get_sync (&pdev->dev); +if (ret <0 ) +return ret;cancel_work_sync (&fep->tx_timeout_work);fec_ptp_stop (pdev);
@@ -3643,15 +3648,17 @@ fec_drv_remove(struct platform_device *pdev)fec_enet_mii_remove (fep);if (fep->reg_phy)regulator_disable (fep->reg_phy); -pm_runtime_put (&pdev->dev); -pm_runtime_disable (&pdev->dev); -clk_disable_unprepare (fep->clk_ahb); -clk_disable_unprepare (fep->clk_ipg); +if (of_phy_is_fixed_link (np))of_phy_deregister_fixed_link (np);of_node_put (fep->phy_node);free_netdev (ndev); +clk_disable_unprepare (fep->clk_ahb); +clk_disable_unprepare (fep->clk_ipg); +pm_runtime_put_noidle (&pdev->dev); +pm_runtime_disable (&pdev->dev); +return 0 ; }
Signature · 1 line
2.24.0
From: Chuhong Yuan <[email protected]> Sent: Wednesday, November 20, 2019 9:25 AM
Quoted 9 lines
pm_runtime_put_autosuspendin probe will call runtime suspend to disable clks automatically ifCONFIG_PMis defined. (IfCONFIG_PMis not defined, its implementation will be empty, then runtime suspend will not be called.)Therefore, we can call
pm_runtime_get_syncto runtime resume it first to enable clks, which matches the runtime suspend. (Only whenCONFIG_PMis defined, otherwisepm_runtime_get_syncwill also be empty, then runtime resume will not be called.)
Quoted 5 lines
Then it is fine to disable clks without causing clock count mis-match.
Fixes c43eab3eddb4 ("net: fec: add missed clk_disable_unprepare inremove")
Signed-off-by Chuhong Yuan <[email protected]>
Quoted 48 lines
---
Changes in v4:
- Fix some typos.drivers/net/ethernet/freescale/fec_main.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)drivers/net/ethernet/freescale/fec_main.c +11
-5@@ -3636,6 +3636,11 @@ fec_drv_remove(struct platform_device *pdev)struct net_device *ndev =platform_get_drvdata (pdev);struct fec_enet_private *fep =netdev_priv (ndev);struct device_node *np = pdev->dev.of_node; +int ret; + + ret =pm_runtime_get_sync (&pdev->dev); +if (ret <0 ) +return ret;cancel_work_sync (&fep->tx_timeout_work);fec_ptp_stop (pdev);@@ -3643,15 +3648,17 @@ fec_drv_remove(struct platform_device *pdev)fec_enet_mii_remove (fep);if (fep->reg_phy)regulator_disable (fep->reg_phy); -pm_runtime_put (&pdev->dev); -pm_runtime_disable (&pdev->dev); -clk_disable_unprepare (fep->clk_ahb); -clk_disable_unprepare (fep->clk_ipg); +if (of_phy_is_fixed_link (np))of_phy_deregister_fixed_link (np);of_node_put (fep->phy_node);free_netdev (ndev); +clk_disable_unprepare (fep->clk_ahb); +clk_disable_unprepare (fep->clk_ipg); +pm_runtime_put_noidle (&pdev->dev); +pm_runtime_disable (&pdev->dev); +return 0 ; } --2.24.0
From: Chuhong Yuan <[email protected]>
Date: Wed, 20 Nov 2019 09:25:13 +0800
Quoted 10 lines
pm_runtime_put_autosuspendin probe will call runtime suspend to disable clks automatically ifCONFIG_PMis defined. (IfCONFIG_PMis not defined, its implementation will be empty, then runtime suspend will not be called.)Therefore, we can call
pm_runtime_get_syncto runtime resume it first to enable clks, which matches the runtime suspend. (Only whenCONFIG_PMis defined, otherwisepm_runtime_get_syncwill also be empty, then runtime resume will not be called.)
Quoted 7 lines
Then it is fine to disable clks without causing clock count mis-match.
Fixes c43eab3eddb4 ("net: fec: add missed clk_disable_unprepare in remove")Signed-off-by Chuhong Yuan <[email protected]>---
Changes in v4:
- Fix some typos.
Applied, thanks.