diff mbox series

can: flexcan: avoid unbalanced pm_runtime_enable warning

Message ID 20221213094351.3023858-1-haibo.chen@nxp.com (mailing list archive)
State Awaiting Upstream
Delegated to: Netdev Maintainers
Headers show
Series can: flexcan: avoid unbalanced pm_runtime_enable warning | expand

Checks

Context Check Description
netdev/tree_selection success Series ignored based on subject

Commit Message

Bough Chen Dec. 13, 2022, 9:43 a.m. UTC 
From: Haibo Chen <haibo.chen@nxp.com>

When do suspend/resume, meet the following warning message:
[   30.028336] flexcan 425b0000.can: Unbalanced pm_runtime_enable!

Balance the pm_runtime_force_suspend() and pm_runtime_force_resume().

Fixes: 8cb53b485f18 ("can: flexcan: add auto stop mode for IMX93 to support wakeup")
Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
---
 drivers/net/can/flexcan/flexcan-core.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

Comments

Marc Kleine-Budde Dec. 13, 2022, 1:38 p.m. UTC | #1 
On 13.12.2022 17:43:51, haibo.chen@nxp.com wrote:
> From: Haibo Chen <haibo.chen@nxp.com>
> 
> When do suspend/resume, meet the following warning message:
> [   30.028336] flexcan 425b0000.can: Unbalanced pm_runtime_enable!
> 
> Balance the pm_runtime_force_suspend() and pm_runtime_force_resume().
> 
> Fixes: 8cb53b485f18 ("can: flexcan: add auto stop mode for IMX93 to support wakeup")
> Signed-off-by: Haibo Chen <haibo.chen@nxp.com>

Looks good. Applied to linux-can-next.

Marc
diff mbox series

Patch

diff --git a/drivers/net/can/flexcan/flexcan-core.c b/drivers/net/can/flexcan/flexcan-core.c
index 0aeff34e5ae1..6d638c93977b 100644
--- a/drivers/net/can/flexcan/flexcan-core.c
+++ b/drivers/net/can/flexcan/flexcan-core.c
@@ -2349,9 +2349,15 @@  static int __maybe_unused flexcan_noirq_resume(struct device *device)
 	if (netif_running(dev)) {
 		int err;
 
-		err = pm_runtime_force_resume(device);
-		if (err)
-			return err;
+		/* For the wakeup in auto stop mode, no need to gate on the
+		 * clock here, hardware will do this automatically.
+		 */
+		if (!(device_may_wakeup(device) &&
+		      priv->devtype_data.quirks & FLEXCAN_QUIRK_AUTO_STOP_MODE)) {
+			err = pm_runtime_force_resume(device);
+			if (err)
+				return err;
+		}
 
 		if (device_may_wakeup(device))
 			flexcan_enable_wakeup_irq(priv, false);