can: flexcan: disable clocks during stop mode

[ 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>

diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index aaa7ed1dc97ee193cfb36c279db09fc9b647af18..d59c6c87164f42cf96927ead933d66a3a8467b28 100644 (file)
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -1703,8 +1703,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);
@@ -1730,10 +1728,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);
                }
        }
@@ -1764,8 +1758,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;
 }
@@ -1775,8 +1777,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;
 }