Message ID | 20250327195928.680771-3-csokas.bence@prolan.hu |
---|---|
State | New |
Headers | show |
Series | Add more devm_ functions to fix PM imbalance in spi/atmel-quadspi.c | expand |
On Thu, Mar 27, 2025 at 8:59 PM Bence Csókás <csokas.bence@prolan.hu> wrote: > > Add `devm_pm_runtime_set_active_enabled()` and > `devm_pm_runtime_get_noresume()` for simplifying common cases in drivers. > > Signed-off-by: Bence Csókás <csokas.bence@prolan.hu> I can apply this one alone if you want me to do that, but I could also apply the other patch in the series if it got an ACK from the driver maintainer. > --- > drivers/base/power/runtime.c | 44 ++++++++++++++++++++++++++++++++++++ > include/linux/pm_runtime.h | 4 ++++ > 2 files changed, 48 insertions(+) > > diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c > index 0e127b0329c0..205a4f8828b0 100644 > --- a/drivers/base/power/runtime.c > +++ b/drivers/base/power/runtime.c > @@ -1568,6 +1568,32 @@ void pm_runtime_enable(struct device *dev) > } > EXPORT_SYMBOL_GPL(pm_runtime_enable); > > +static void pm_runtime_set_suspended_action(void *data) > +{ > + pm_runtime_set_suspended(data); > +} > + > +/** > + * devm_pm_runtime_set_active_enabled - set_active version of devm_pm_runtime_enable. > + * > + * @dev: Device to handle. > + */ > +int devm_pm_runtime_set_active_enabled(struct device *dev) > +{ > + int err; > + > + err = pm_runtime_set_active(dev); > + if (err) > + return err; > + > + err = devm_add_action_or_reset(dev, pm_runtime_set_suspended_action, dev); > + if (err) > + return err; > + > + return devm_pm_runtime_enable(dev); > +} > +EXPORT_SYMBOL_GPL(devm_pm_runtime_set_active_enabled); > + > static void pm_runtime_disable_action(void *data) > { > pm_runtime_dont_use_autosuspend(data); > @@ -1590,6 +1616,24 @@ int devm_pm_runtime_enable(struct device *dev) > } > EXPORT_SYMBOL_GPL(devm_pm_runtime_enable); > > +static void pm_runtime_put_noidle_action(void *data) > +{ > + pm_runtime_put_noidle(data); > +} > + > +/** > + * devm_pm_runtime_get_noresume - devres-enabled version of pm_runtime_get_noresume. > + * > + * @dev: Device to handle. > + */ > +int devm_pm_runtime_get_noresume(struct device *dev) > +{ > + pm_runtime_get_noresume(dev); > + > + return devm_add_action_or_reset(dev, pm_runtime_put_noidle_action, dev); > +} > +EXPORT_SYMBOL_GPL(devm_pm_runtime_get_noresume); > + > /** > * pm_runtime_forbid - Block runtime PM of a device. > * @dev: Device to handle. > diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h > index 7fb5a459847e..756b842dcd30 100644 > --- a/include/linux/pm_runtime.h > +++ b/include/linux/pm_runtime.h > @@ -96,7 +96,9 @@ extern void pm_runtime_new_link(struct device *dev); > extern void pm_runtime_drop_link(struct device_link *link); > extern void pm_runtime_release_supplier(struct device_link *link); > > +int devm_pm_runtime_set_active_enabled(struct device *dev); > extern int devm_pm_runtime_enable(struct device *dev); > +int devm_pm_runtime_get_noresume(struct device *dev); > > /** > * pm_suspend_ignore_children - Set runtime PM behavior regarding children. > @@ -294,7 +296,9 @@ static inline bool pm_runtime_blocked(struct device *dev) { return true; } > static inline void pm_runtime_allow(struct device *dev) {} > static inline void pm_runtime_forbid(struct device *dev) {} > > +static inline int devm_pm_runtime_set_active_enabled(struct device *dev) { return 0; } > static inline int devm_pm_runtime_enable(struct device *dev) { return 0; } > +static inline int devm_pm_runtime_get_noresume(struct device *dev) { return 0; } > > static inline void pm_suspend_ignore_children(struct device *dev, bool enable) {} > static inline void pm_runtime_get_noresume(struct device *dev) {} > -- > 2.49.0 > >
Hi, On 2025. 04. 09. 19:43, Rafael J. Wysocki wrote: > On Thu, Mar 27, 2025 at 8:59 PM Bence Csókás <csokas.bence@prolan.hu> wrote: >> >> Add `devm_pm_runtime_set_active_enabled()` and >> `devm_pm_runtime_get_noresume()` for simplifying common cases in drivers. >> >> Signed-off-by: Bence Csókás <csokas.bence@prolan.hu> > > I can apply this one alone if you want me to do that, but I could also > apply the other patch in the series if it got an ACK from the driver > maintainer. I think you can apply it and then Mark can apply the SPI part to his tree. @broonie what do you think? Bence
On Mon, Apr 14, 2025 at 03:56:47PM +0200, Csókás Bence wrote: > On 2025. 04. 09. 19:43, Rafael J. Wysocki wrote: > > I can apply this one alone if you want me to do that, but I could also > > apply the other patch in the series if it got an ACK from the driver > > maintainer. > I think you can apply it and then Mark can apply the SPI part to his tree. > @broonie what do you think? Please don't add random characters to my name. I'd need a tag since the driver change isn't going to build without the new API.
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index 0e127b0329c0..205a4f8828b0 100644 --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c @@ -1568,6 +1568,32 @@ void pm_runtime_enable(struct device *dev) } EXPORT_SYMBOL_GPL(pm_runtime_enable); +static void pm_runtime_set_suspended_action(void *data) +{ + pm_runtime_set_suspended(data); +} + +/** + * devm_pm_runtime_set_active_enabled - set_active version of devm_pm_runtime_enable. + * + * @dev: Device to handle. + */ +int devm_pm_runtime_set_active_enabled(struct device *dev) +{ + int err; + + err = pm_runtime_set_active(dev); + if (err) + return err; + + err = devm_add_action_or_reset(dev, pm_runtime_set_suspended_action, dev); + if (err) + return err; + + return devm_pm_runtime_enable(dev); +} +EXPORT_SYMBOL_GPL(devm_pm_runtime_set_active_enabled); + static void pm_runtime_disable_action(void *data) { pm_runtime_dont_use_autosuspend(data); @@ -1590,6 +1616,24 @@ int devm_pm_runtime_enable(struct device *dev) } EXPORT_SYMBOL_GPL(devm_pm_runtime_enable); +static void pm_runtime_put_noidle_action(void *data) +{ + pm_runtime_put_noidle(data); +} + +/** + * devm_pm_runtime_get_noresume - devres-enabled version of pm_runtime_get_noresume. + * + * @dev: Device to handle. + */ +int devm_pm_runtime_get_noresume(struct device *dev) +{ + pm_runtime_get_noresume(dev); + + return devm_add_action_or_reset(dev, pm_runtime_put_noidle_action, dev); +} +EXPORT_SYMBOL_GPL(devm_pm_runtime_get_noresume); + /** * pm_runtime_forbid - Block runtime PM of a device. * @dev: Device to handle. diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h index 7fb5a459847e..756b842dcd30 100644 --- a/include/linux/pm_runtime.h +++ b/include/linux/pm_runtime.h @@ -96,7 +96,9 @@ extern void pm_runtime_new_link(struct device *dev); extern void pm_runtime_drop_link(struct device_link *link); extern void pm_runtime_release_supplier(struct device_link *link); +int devm_pm_runtime_set_active_enabled(struct device *dev); extern int devm_pm_runtime_enable(struct device *dev); +int devm_pm_runtime_get_noresume(struct device *dev); /** * pm_suspend_ignore_children - Set runtime PM behavior regarding children. @@ -294,7 +296,9 @@ static inline bool pm_runtime_blocked(struct device *dev) { return true; } static inline void pm_runtime_allow(struct device *dev) {} static inline void pm_runtime_forbid(struct device *dev) {} +static inline int devm_pm_runtime_set_active_enabled(struct device *dev) { return 0; } static inline int devm_pm_runtime_enable(struct device *dev) { return 0; } +static inline int devm_pm_runtime_get_noresume(struct device *dev) { return 0; } static inline void pm_suspend_ignore_children(struct device *dev, bool enable) {} static inline void pm_runtime_get_noresume(struct device *dev) {}
Add `devm_pm_runtime_set_active_enabled()` and `devm_pm_runtime_get_noresume()` for simplifying common cases in drivers. Signed-off-by: Bence Csókás <csokas.bence@prolan.hu> --- drivers/base/power/runtime.c | 44 ++++++++++++++++++++++++++++++++++++ include/linux/pm_runtime.h | 4 ++++ 2 files changed, 48 insertions(+)