This driver forgets to disable and unprepare clks when remove.
Add calls to clk_disable_unprepare to fix it.
Signed-off-by: Chuhong Yuan <[email protected]>
---
drivers/net/ethernet/freescale/fec_main.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 22c01b224baa..a9c386b63581 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -3645,6 +3645,8 @@ fec_drv_remove(struct platform_device *pdev)
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);
--
2.23.0
From: Chuhong Yuan <[email protected]>
Date: Mon, 4 Nov 2019 23:50:00 +0800
> This driver forgets to disable and unprepare clks when remove.
> Add calls to clk_disable_unprepare to fix it.
>
> Signed-off-by: Chuhong Yuan <[email protected]>
Applied.
From: David Miller <[email protected]> Sent: Tuesday, November 5, 2019 3:36 AM
> From: Chuhong Yuan <[email protected]>
> Date: Mon, 4 Nov 2019 23:50:00 +0800
>
> > This driver forgets to disable and unprepare clks when remove.
> > Add calls to clk_disable_unprepare to fix it.
> >
> > Signed-off-by: Chuhong Yuan <[email protected]>
>
> Applied.
David, the patch introduces clock count mismatch issue, please drop it.
Regards,
Andy
From: Chuhong Yuan <[email protected]> Sent: Monday, November 4, 2019 11:50 PM
> This driver forgets to disable and unprepare clks when remove.
> Add calls to clk_disable_unprepare to fix it.
>
> Signed-off-by: Chuhong Yuan <[email protected]>
If runtime is enabled, the patch will introduce clock count mis-match.
Probe->
Enable clk_ipg, clk_ahb clocks
...
In the end, runtime auto suspend callback disable clk_ipg, clk_ahb clocks.
You should check CONFIG_PM is enabled or not in your platform, if not,
it can disable these two clocks by checking CONFIG_PM.
Regards,
Andy
> ---
> drivers/net/ethernet/freescale/fec_main.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/net/ethernet/freescale/fec_main.c
> b/drivers/net/ethernet/freescale/fec_main.c
> index 22c01b224baa..a9c386b63581 100644
> --- a/drivers/net/ethernet/freescale/fec_main.c
> +++ b/drivers/net/ethernet/freescale/fec_main.c
> @@ -3645,6 +3645,8 @@ fec_drv_remove(struct platform_device *pdev)
> 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);
> --
> 2.23.0
From: Andy Duan <[email protected]>
Date: Tue, 5 Nov 2019 01:27:10 +0000
> From: David Miller <[email protected]> Sent: Tuesday, November 5, 2019 3:36 AM
>> From: Chuhong Yuan <[email protected]>
>> Date: Mon, 4 Nov 2019 23:50:00 +0800
>>
>> > This driver forgets to disable and unprepare clks when remove.
>> > Add calls to clk_disable_unprepare to fix it.
>> >
>> > Signed-off-by: Chuhong Yuan <[email protected]>
>>
>> Applied.
>
> David, the patch introduces clock count mismatch issue, please drop it.
Please send me a revert, I'm backlogged at the moment.
Thanks.
From: David Miller <[email protected]> Sent: Tuesday, November 5, 2019 9:32 AM
> From: Andy Duan <[email protected]>
> Date: Tue, 5 Nov 2019 01:27:10 +0000
>
> > From: David Miller <[email protected]> Sent: Tuesday, November 5,
> 2019 3:36 AM
> >> From: Chuhong Yuan <[email protected]>
> >> Date: Mon, 4 Nov 2019 23:50:00 +0800
> >>
> >> > This driver forgets to disable and unprepare clks when remove.
> >> > Add calls to clk_disable_unprepare to fix it.
> >> >
> >> > Signed-off-by: Chuhong Yuan <[email protected]>
> >>
> >> Applied.
> >
> > David, the patch introduces clock count mismatch issue, please drop it.
>
> Please send me a revert, I'm backlogged at the moment.
>
> Thanks.
I already give comment to Chuhong Yuan, let's wait his response.
If he will send the fixes, let's wait his patch. If not, I will send the a
revert these two days.
Regards,
Andy
On Tue, Nov 5, 2019 at 9:26 AM Andy Duan <[email protected]> wrote:
>
> From: Chuhong Yuan <[email protected]> Sent: Monday, November 4, 2019 11:50 PM
> > This driver forgets to disable and unprepare clks when remove.
> > Add calls to clk_disable_unprepare to fix it.
> >
> > Signed-off-by: Chuhong Yuan <[email protected]>
>
> If runtime is enabled, the patch will introduce clock count mis-match.
> Probe->
> Enable clk_ipg, clk_ahb clocks
> ...
> In the end, runtime auto suspend callback disable clk_ipg, clk_ahb clocks.
>
> You should check CONFIG_PM is enabled or not in your platform, if not,
> it can disable these two clocks by checking CONFIG_PM.
>
Thanks for your hint!
But I am still not very clear about the mechanism.
In my opinion, it means that if CONFIG_PM is disabled, runtime_suspend will
be called automatically to disable clks.
Therefore, #ifdef CONFIG_PM check should be added before disabling
clks in remove.
I am not sure whether this understanding is right or not?
Regards,
Chuhong
> Regards,
> Andy
> > ---
> > drivers/net/ethernet/freescale/fec_main.c | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/drivers/net/ethernet/freescale/fec_main.c
> > b/drivers/net/ethernet/freescale/fec_main.c
> > index 22c01b224baa..a9c386b63581 100644
> > --- a/drivers/net/ethernet/freescale/fec_main.c
> > +++ b/drivers/net/ethernet/freescale/fec_main.c
> > @@ -3645,6 +3645,8 @@ fec_drv_remove(struct platform_device *pdev)
> > 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);
> > --
> > 2.23.0
>
From: Chuhong Yuan <[email protected]> Sent: Tuesday, November 5, 2019 11:34 PM
> On Tue, Nov 5, 2019 at 9:26 AM Andy Duan <[email protected]> wrote:
> >
> > From: Chuhong Yuan <[email protected]> Sent: Monday, November 4,
> > 2019 11:50 PM
> > > This driver forgets to disable and unprepare clks when remove.
> > > Add calls to clk_disable_unprepare to fix it.
> > >
> > > Signed-off-by: Chuhong Yuan <[email protected]>
> >
> > If runtime is enabled, the patch will introduce clock count mis-match.
> > Probe->
> > Enable clk_ipg, clk_ahb clocks
> > ...
> > In the end, runtime auto suspend callback disable clk_ipg, clk_ahb
> clocks.
> >
> > You should check CONFIG_PM is enabled or not in your platform, if not,
> > it can disable these two clocks by checking CONFIG_PM.
> >
>
> Thanks for your hint!
> But I am still not very clear about the mechanism.
> In my opinion, it means that if CONFIG_PM is disabled, runtime_suspend will
> be called automatically to disable clks.
CONFIG_PM is enabled, runtime pm works. Otherwise, it doesn't work, then it
Requires .remove() to disable the clks.
Andy
> Therefore, #ifdef CONFIG_PM check should be added before disabling clks in
> remove.
> I am not sure whether this understanding is right or not?
>
> Regards,
> Chuhong
>
> > Regards,
> > Andy
> > > ---
> > > drivers/net/ethernet/freescale/fec_main.c | 2 ++
> > > 1 file changed, 2 insertions(+)
> > >
> > > diff --git a/drivers/net/ethernet/freescale/fec_main.c
> > > b/drivers/net/ethernet/freescale/fec_main.c
> > > index 22c01b224baa..a9c386b63581 100644
> > > --- a/drivers/net/ethernet/freescale/fec_main.c
> > > +++ b/drivers/net/ethernet/freescale/fec_main.c
> > > @@ -3645,6 +3645,8 @@ fec_drv_remove(struct platform_device *pdev)
> > > 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);
> > > --
> > > 2.23.0
> >