]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
can: flexcan: disable transceiver during system PM
authorHaibo Chen <haibo.chen@nxp.com>
Fri, 14 Mar 2025 11:01:45 +0000 (19:01 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 Apr 2025 12:32:05 +0000 (14:32 +0200)
[ Upstream commit 5a19143124be42900b3fbc9ada3c919632eb45eb ]

During system PM, if no wakeup requirement, disable transceiver to
save power.

Fixes: 4de349e786a3 ("can: flexcan: fix resume function")
Cc: stable@vger.kernel.org
Reviewed-by: Frank Li <frank.li@nxp.com>
Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
Link: https://patch.msgid.link/20250314110145.899179-2-haibo.chen@nxp.com
[mkl: add newlines]
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/can/flexcan.c

index fc9cfe434ce4fb7f43d32feaff18f0ebb3e50274..6f4e3e0330a45b13a17d21c69a1b66b0c4188b39 100644 (file)
@@ -2337,6 +2337,10 @@ static int __maybe_unused flexcan_suspend(struct device *device)
 
                        flexcan_chip_interrupts_disable(dev);
 
+                       err = flexcan_transceiver_disable(priv);
+                       if (err)
+                               return err;
+
                        err = pinctrl_pm_select_sleep_state(device);
                        if (err)
                                return err;
@@ -2369,10 +2373,16 @@ static int __maybe_unused flexcan_resume(struct device *device)
                        if (err)
                                return err;
 
-                       err = flexcan_chip_start(dev);
+                       err = flexcan_transceiver_enable(priv);
                        if (err)
                                return err;
 
+                       err = flexcan_chip_start(dev);
+                       if (err) {
+                               flexcan_transceiver_disable(priv);
+                               return err;
+                       }
+
                        flexcan_chip_interrupts_enable(dev);
                }