| Message ID | 20200811081545.19921-2-l.stach@pengutronix.de |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | David Miller |
| Headers | show |
| Series | can: m_can_platform: don't call m_can_class_suspend in runtime suspend | expand |
Lucase On 8/11/20 3:15 AM, Lucas Stach wrote: > 0704c5743694 (can: m_can_platform: remove unnecessary m_can_class_resume() > call) removed the m_can_class_resume() call in the runtime resume path > to get rid of a infinite recursion, so the runtime resume now only handles > the device clocks. Unfortunately it did not remove the complementary > m_can_class_suspend() call in the runtime suspend function, so those paths > are now unbalanced, which causes the pinctrl state to get stuck on the > "sleep" state, which breaks all CAN functionality on SoCs where this state > is defined. Remove the m_can_class_suspend() call to fix this. > > Fixes: 0704c5743694 (can: m_can_platform: remove unnecessary > m_can_class_resume() call) Not sure about this wrap around for the fixes in the commit msg. Otherwise Acked-by: Dan Murphy <dmurphy@ti.com> > Signed-off-by: Lucas Stach <l.stach@pengutronix.de> > --- > drivers/net/can/m_can/m_can_platform.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/net/can/m_can/m_can_platform.c b/drivers/net/can/m_can/m_can_platform.c > index 38ea5e600fb8..e6d0cb9ee02f 100644 > --- a/drivers/net/can/m_can/m_can_platform.c > +++ b/drivers/net/can/m_can/m_can_platform.c > @@ -144,8 +144,6 @@ static int __maybe_unused m_can_runtime_suspend(struct device *dev) > struct net_device *ndev = dev_get_drvdata(dev); > struct m_can_classdev *mcan_class = netdev_priv(ndev); > > - m_can_class_suspend(dev); > - > clk_disable_unprepare(mcan_class->cclk); > clk_disable_unprepare(mcan_class->hclk); >
diff --git a/drivers/net/can/m_can/m_can_platform.c b/drivers/net/can/m_can/m_can_platform.c index 38ea5e600fb8..e6d0cb9ee02f 100644 --- a/drivers/net/can/m_can/m_can_platform.c +++ b/drivers/net/can/m_can/m_can_platform.c @@ -144,8 +144,6 @@ static int __maybe_unused m_can_runtime_suspend(struct device *dev) struct net_device *ndev = dev_get_drvdata(dev); struct m_can_classdev *mcan_class = netdev_priv(ndev); - m_can_class_suspend(dev); - clk_disable_unprepare(mcan_class->cclk); clk_disable_unprepare(mcan_class->hclk);
0704c5743694 (can: m_can_platform: remove unnecessary m_can_class_resume() call) removed the m_can_class_resume() call in the runtime resume path to get rid of a infinite recursion, so the runtime resume now only handles the device clocks. Unfortunately it did not remove the complementary m_can_class_suspend() call in the runtime suspend function, so those paths are now unbalanced, which causes the pinctrl state to get stuck on the "sleep" state, which breaks all CAN functionality on SoCs where this state is defined. Remove the m_can_class_suspend() call to fix this. Fixes: 0704c5743694 (can: m_can_platform: remove unnecessary m_can_class_resume() call) Signed-off-by: Lucas Stach <l.stach@pengutronix.de> --- drivers/net/can/m_can/m_can_platform.c | 2 -- 1 file changed, 2 deletions(-)