| From 8a738e108f860d593cf14464710ee969ba078001 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 10 Dec 2019 09:00:13 +0000 |
| Subject: can: flexcan: disable clocks during stop mode |
| |
| From: Joakim Zhang <qiangqing.zhang@nxp.com> |
| |
| [ Upstream commit 02f71c6605e1f8259c07f16178330db766189a74 ] |
| |
| Disable clocks while CAN core is in stop mode. |
| |
| Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com> |
| Tested-by: Sean Nyekjaer <sean@geanix.com> |
| Link: https://lore.kernel.org/r/20191210085721.9853-2-qiangqing.zhang@nxp.com |
| Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/can/flexcan.c | 30 ++++++++++++++++++++---------- |
| 1 file changed, 20 insertions(+), 10 deletions(-) |
| |
| diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c |
| index 2ac7a667bde35..bc21a82cf3a76 100644 |
| --- a/drivers/net/can/flexcan.c |
| +++ b/drivers/net/can/flexcan.c |
| @@ -1722,8 +1722,6 @@ static int __maybe_unused flexcan_suspend(struct device *device) |
| err = flexcan_chip_disable(priv); |
| if (err) |
| return err; |
| - |
| - err = pm_runtime_force_suspend(device); |
| } |
| netif_stop_queue(dev); |
| netif_device_detach(dev); |
| @@ -1749,10 +1747,6 @@ static int __maybe_unused flexcan_resume(struct device *device) |
| if (err) |
| return err; |
| } else { |
| - err = pm_runtime_force_resume(device); |
| - if (err) |
| - return err; |
| - |
| err = flexcan_chip_enable(priv); |
| } |
| } |
| @@ -1783,8 +1777,16 @@ static int __maybe_unused flexcan_noirq_suspend(struct device *device) |
| struct net_device *dev = dev_get_drvdata(device); |
| struct flexcan_priv *priv = netdev_priv(dev); |
| |
| - if (netif_running(dev) && device_may_wakeup(device)) |
| - flexcan_enable_wakeup_irq(priv, true); |
| + if (netif_running(dev)) { |
| + int err; |
| + |
| + if (device_may_wakeup(device)) |
| + flexcan_enable_wakeup_irq(priv, true); |
| + |
| + err = pm_runtime_force_suspend(device); |
| + if (err) |
| + return err; |
| + } |
| |
| return 0; |
| } |
| @@ -1794,8 +1796,16 @@ static int __maybe_unused flexcan_noirq_resume(struct device *device) |
| struct net_device *dev = dev_get_drvdata(device); |
| struct flexcan_priv *priv = netdev_priv(dev); |
| |
| - if (netif_running(dev) && device_may_wakeup(device)) |
| - flexcan_enable_wakeup_irq(priv, false); |
| + if (netif_running(dev)) { |
| + int err; |
| + |
| + err = pm_runtime_force_resume(device); |
| + if (err) |
| + return err; |
| + |
| + if (device_may_wakeup(device)) |
| + flexcan_enable_wakeup_irq(priv, false); |
| + } |
| |
| return 0; |
| } |
| -- |
| 2.27.0 |
| |