Commit c9ff8a7f authored by Douglas Anderson's avatar Douglas Anderson Committed by sanglipeng1
Browse files

PM: runtime: Have devm_pm_runtime_enable() handle pm_runtime_dont_use_autosuspend() 

stable inclusion
from stable-v5.10.210
commit 21b38d85f6dee8e2c6504a70573dc8b112bc7552
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAE52H

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=21b38d85f6dee8e2c6504a70573dc8b112bc7552



--------------------------------

[ Upstream commit b4060db9 ]

The PM Runtime docs say:

  Drivers in ->remove() callback should undo the runtime PM changes done
  in ->probe(). Usually this means calling pm_runtime_disable(),
  pm_runtime_dont_use_autosuspend() etc.

>From grepping code, it's clear that many people aren't aware of the
need to call pm_runtime_dont_use_autosuspend().

When brainstorming solutions, one idea that came up was to leverage
the new-ish devm_pm_runtime_enable() function. The idea here is that:

 * When the devm action is called we know that the driver is being
   removed. It's the perfect time to undo the use_autosuspend.

 * The code of pm_runtime_dont_use_autosuspend() already handles the
   case of being called when autosuspend wasn't enabled.

Suggested-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarDouglas Anderson <dianders@chromium.org>
Reviewed-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Stable-dep-of: 3d07a411b4fa ("drm/msm/dsi: Use pm_runtime_resume_and_get to prevent refcnt leaks")
Signed-off-by: default avatarAmit Pundir <amit.pundir@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng1 <sanglipeng1@jd.com>
parent 8c2ed986

drivers/base/power/runtime.c

+5 −0
Original line number Diff line number Diff line
@@ -1481,11 +1481,16 @@ EXPORT_SYMBOL_GPL(pm_runtime_enable); 


static void pm_runtime_disable_action(void *data)

{

	pm_runtime_dont_use_autosuspend(data);

	pm_runtime_disable(data);

}



/**

 * devm_pm_runtime_enable - devres-enabled version of pm_runtime_enable.

 *

 * NOTE: this will also handle calling pm_runtime_dont_use_autosuspend() for

 * you at driver exit time if needed.

 *

 * @dev: Device to handle.

 */

int devm_pm_runtime_enable(struct device *dev)

include/linux/pm_runtime.h

+4 −0
Original line number Diff line number Diff line
@@ -539,6 +539,10 @@ static inline void pm_runtime_disable(struct device *dev) 
 * Allow the runtime PM autosuspend mechanism to be used for @dev whenever

 * requested (or "autosuspend" will be handled as direct runtime-suspend for

 * it).

 *

 * NOTE: It's important to undo this with pm_runtime_dont_use_autosuspend()

 * at driver exit time unless your driver initially enabled pm_runtime

 * with devm_pm_runtime_enable() (which handles it for you).

 */

static inline void pm_runtime_use_autosuspend(struct device *dev)

{