FAILED: patch "[PATCH] PM: runtime: Take active children into account in" failed to apply to 6.6-stable tree
Subsystems (5)
[email protected]
maintainerThe patch below does not apply to the 6.6-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 51888393cc64dd0462d0b96c13ab94873abbc030
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025082128-casually-sensuous-5677@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 51888393cc64dd0462d0b96c13ab94873abbc030 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <[email protected]>
Date: Wed, 9 Jul 2025 12:41:45 +0200
Subject: [PATCH] PM: runtime: Take active children into account in
pm_runtime_get_if_in_use()
For all practical purposes, there is no difference between the situation in which a given device is not ignoring children and its active child count is nonzero and the situation in which its runtime PM usage counter is nonzero. However, pm_runtime_get_if_in_use() will only increment the device's usage counter and return 1 in the latter case.
For consistency, make it do so in the former case either by adjusting pm_runtime_get_conditional() and update the related kerneldoc comments accordingly.
drivers/base/power/runtime.c +18 -9
@@ -1191,10 +1191,12 @@ EXPORT_SYMBOL_GPL(__pm_runtime_resume);* * Return -EINVAL if runtime PM is disabled for @dev. * -* Otherwise, if the runtime PM status of @dev is %RPM_ACTIVE and either -* @ign_usage_count is %true or the runtime PM usage counter of @dev is not -* zero, increment the usage counter of @dev and return 1. Otherwise, return 0 -* without changing the usage counter. +* Otherwise, if its runtime PM status is %RPM_ACTIVE and (1) @ign_usage_count +* is set, or (2) @dev is not ignoring children and its active child count is +* nonero, or (3) the runtime PM usage counter of @dev is not zero, increment +* the usage counter of @dev and return 1. +* +* Otherwise, return 0 without changing the usage counter. * * If @ign_usage_count is %true, this function can be used to prevent suspending * the device when its runtime PM status is %RPM_ACTIVE.
@@ -1216,7 +1218,8 @@ static int pm_runtime_get_conditional(struct device *dev, bool ign_usage_count) retval = -EINVAL ; }else if (dev->power.runtime_status !=RPM_ACTIVE ) { retval =0 ; - }else if (ign_usage_count) { + }else if (ign_usage_count || (!dev->power.ignore_children && +atomic_read (&dev->power.child_count) >0 )) { retval =1 ;atomic_inc (&dev->power.usage_count); }else {
@@ -1249,10 +1252,16 @@ EXPORT_SYMBOL_GPL(pm_runtime_get_if_active);* @dev: Target device. * * Increment the runtime PM usage counter of @dev if its runtime PM status is -* %RPM_ACTIVE and its runtime PM usage counter is greater than 0, in which case -* it returns 1. If the device is in a different state or its usage_count is 0, -* 0 is returned. -EINVAL is returned if runtime PM is disabled for the device, -* in which case also the usage_count will remain unmodified. +* %RPM_ACTIVE and its runtime PM usage counter is greater than 0 or it is not +* ignoring children and its active child count is nonzero. 1 is returned in +* this case. +* +* If @dev is in a different state or it is not in use (that is, its usage +* counter is 0, or it is ignoring children, or its active child count is 0), +* 0 is returned. +* +* -EINVAL is returned if runtime PM is disabled for the device, in which case +* also the usage counter of @dev is not updated. */ int pm_runtime_get_if_in_use (struct device *dev) {
Sasha Levin
maintainerPATCH 1/2 PM: runtime: Simplify pm_runtime_get_if_active() usage
From: Sakari Ailus <[email protected]>
[ Upstream commit c0ef3df8dbaef51ee4cfd58a471adf2eaee6f6b3 ]
There are two ways to opportunistically increment a device's runtime PM usage count, calling either pm_runtime_get_if_active() or pm_runtime_get_if_in_use(). The former has an argument to tell whether to ignore the usage count or not, and the latter simply calls the former with ign_usage_count set to false. The other users that want to ignore the usage_count will have to explicitly set that argument to true which is a bit cumbersome.
To make this function more practical to use, remove the ign_usage_count argument from the function. The main implementation is in a static function called pm_runtime_get_conditional() and implementations of pm_runtime_get_if_active() and pm_runtime_get_if_in_use() are moved to runtime.c.
--- Documentation/power/runtime_pm.rst | 5 ++-- drivers/base/power/runtime.c | 35 +++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_runtime_pm.c | 5 +++- drivers/media/i2c/ccs/ccs-core.c | 2 +- drivers/net/ipa/ipa_smp2p.c | 2 +- drivers/pci/pci.c | 2 +- drivers/ufs/core/ufshcd-priv.h | 2 +- include/linux/pm_runtime.h | 18 +++---------- sound/hda/hdac_device.c | 2 +- 9 files changed, 47 insertions(+), 26 deletions(-)
Documentation/power/runtime_pm.rst +2 -3
@@ -398,10 +398,9 @@ drivers/base/power/runtime.c and include/linux/pm_runtime.h: nonzero, increment the counter and return 1; otherwise return 0 without changing the counter - `int pm_runtime_get_if_active(struct device *dev, bool ign_usage_count);` + `int pm_runtime_get_if_active(struct device *dev);` - return -EINVAL if 'power.disable_depth' is nonzero; otherwise, if the - runtime PM status is RPM_ACTIVE, and either ign_usage_count is true - or the device's usage_count is non-zero, increment the counter and + runtime PM status is RPM_ACTIVE, increment the counter and return 1; otherwise return 0 without changing the counter `void pm_runtime_put_noidle(struct device *dev);`
drivers/base/power/runtime.c +33 -2
@@ -1175,7 +1175,7 @@ int __pm_runtime_resume(struct device *dev, int rpmflags)EXPORT_SYMBOL_GPL (__pm_runtime_resume);/** -* pm_runtime_get_if_active - Conditionally bump up device usage counter. +* pm_runtime_get_conditional - Conditionally bump up device usage counter. * @dev: Device to handle. * @ign_usage_count: Whether or not to look at the current usage counter value. *
@@ -1196,7 +1196,7 @@ EXPORT_SYMBOL_GPL(__pm_runtime_resume);* The caller is responsible for decrementing the runtime PM usage counter of * @dev after this function has returned a positive value for it. */ -int pm_runtime_get_if_active (struct device *dev,bool ign_usage_count) +static int pm_runtime_get_conditional (struct device *dev,bool ign_usage_count) {unsigned long flags;int retval;
@@ -1217,8 +1217,39 @@ int pm_runtime_get_if_active(struct device *dev, bool ign_usage_count)return retval; } + +/** +* pm_runtime_get_if_active - Bump up runtime PM usage counter if the device is +* in active state +* @dev: Target device. +* +* Increment the runtime PM usage counter of @dev if its runtime PM status is +* %RPM_ACTIVE, in which case it returns 1. If the device is in a different +* state, 0 is returned. -EINVAL is returned if runtime PM is disabled for the +* device, in which case also the usage_count will remain unmodified. +*/ +int pm_runtime_get_if_active (struct device *dev) +{ +return pm_runtime_get_conditional (dev, true); +}EXPORT_SYMBOL_GPL (pm_runtime_get_if_active); +/** +* pm_runtime_get_if_in_use - Conditionally bump up runtime PM usage counter. +* @dev: Target device. +* +* Increment the runtime PM usage counter of @dev if its runtime PM status is +* %RPM_ACTIVE and its runtime PM usage counter is greater than 0, in which case +* it returns 1. If the device is in a different state or its usage_count is 0, +* 0 is returned. -EINVAL is returned if runtime PM is disabled for the device, +* in which case also the usage_count will remain unmodified. +*/ +int pm_runtime_get_if_in_use (struct device *dev) +{ +return pm_runtime_get_conditional (dev, false); +} +EXPORT_SYMBOL_GPL (pm_runtime_get_if_in_use); +/** * __pm_runtime_set_status - Set runtime PM status of a device. * @dev: Device to handle.
drivers/gpu/drm/i915/intel_runtime_pm.c +4 -1
@@ -434,7 +434,10 @@ static intel_wakeref_t __intel_runtime_pm_get_if_active(struct intel_runtime_pm* function, since the power state is undefined. This applies * atm to the late/early system suspend/resume handlers. */ -if (pm_runtime_get_if_active (rpm->kdev, ignore_usecount) <=0 ) +if ((ignore_usecount && +pm_runtime_get_if_active (rpm->kdev) <=0 ) || + (!ignore_usecount && +pm_runtime_get_if_in_use (rpm->kdev) <=0 ))return 0 ; }
drivers/media/i2c/ccs/ccs-core.c +1 -1
@@ -665,7 +665,7 @@ static int ccs_set_ctrl(struct v4l2_ctrl *ctrl)break ; } - pm_status =pm_runtime_get_if_active (&client->dev, true); + pm_status =pm_runtime_get_if_active (&client->dev);if (!pm_status)return 0 ;
drivers/net/ipa/ipa_smp2p.c +1 -1
@@ -92,7 +92,7 @@ static void ipa_smp2p_notify(struct ipa_smp2p *smp2p)return ; dev = &smp2p->ipa->pdev->dev; - smp2p->power_on =pm_runtime_get_if_active (dev, true) >0 ; + smp2p->power_on =pm_runtime_get_if_active (dev) >0 ;/* Signal whether the IPA power is enabled */ mask =BIT (smp2p->enabled_bit);
drivers/pci/pci.c +1 -1
@@ -2475,7 +2475,7 @@ static void pci_pme_list_scan(struct work_struct *work)* course of the call. */ if (bdev) { - bref =pm_runtime_get_if_active (bdev, true); + bref =pm_runtime_get_if_active (bdev);if (!bref)continue ;
drivers/ufs/core/ufshcd-priv.h +1 -1
@@ -326,7 +326,7 @@ static inline int ufshcd_rpm_get_sync(struct ufs_hba *hba)static inline int ufshcd_rpm_get_if_active (struct ufs_hba *hba) { -return pm_runtime_get_if_active (&hba->ufs_device_wlun->sdev_gendev, true); +return pm_runtime_get_if_active (&hba->ufs_device_wlun->sdev_gendev); }static inline int ufshcd_rpm_put_sync (struct ufs_hba *hba)
include/linux/pm_runtime.h +3 -15
@@ -73,7 +73,8 @@ extern int pm_runtime_force_resume(struct device *dev);extern int __pm_runtime_idle (struct device *dev,int rpmflags);extern int __pm_runtime_suspend (struct device *dev,int rpmflags);extern int __pm_runtime_resume (struct device *dev,int rpmflags); -extern int pm_runtime_get_if_active (struct device *dev,bool ign_usage_count); +extern int pm_runtime_get_if_active (struct device *dev); +extern int pm_runtime_get_if_in_use (struct device *dev);extern int pm_schedule_suspend (struct device *dev,unsigned int delay);extern int __pm_runtime_set_status (struct device *dev,unsigned int status);extern int pm_runtime_barrier (struct device *dev);
@@ -95,18 +96,6 @@ extern void pm_runtime_release_supplier(struct device_link *link);extern int devm_pm_runtime_enable (struct device *dev); -/** -* pm_runtime_get_if_in_use - Conditionally bump up runtime PM usage counter. -* @dev: Target device. -* -* Increment the runtime PM usage counter of @dev if its runtime PM status is -* %RPM_ACTIVE and its runtime PM usage counter is greater than 0. -*/ -static inline int pm_runtime_get_if_in_use (struct device *dev) -{ -return pm_runtime_get_if_active (dev, false); -} -/** * pm_suspend_ignore_children - Set runtime PM behavior regarding children. * @dev: Target device.
@@ -277,8 +266,7 @@ static inline int pm_runtime_get_if_in_use(struct device *dev) {return -EINVAL ; } -static inline int pm_runtime_get_if_active (struct device *dev, -bool ign_usage_count) +static inline int pm_runtime_get_if_active (struct device *dev) {return -EINVAL ; }
sound/hda/hdac_device.c +1 -1
@@ -611,7 +611,7 @@ EXPORT_SYMBOL_GPL(snd_hdac_power_up_pm);int snd_hdac_keep_power_up (struct hdac_device *codec) {if (!atomic_inc_not_zero (&codec->in_pm)) { -int ret =pm_runtime_get_if_active (&codec->dev, true); +int ret =pm_runtime_get_if_active (&codec->dev);if (!ret)return -1 ;if (ret <0 )
Signature · 1 line
2.50.1
Sasha Levin
maintainerPATCH 2/2 PM: runtime: Take active children into account in pm_runtime_get_if_in_use()
From: "Rafael J. Wysocki" <[email protected]>
[ Upstream commit 51888393cc64dd0462d0b96c13ab94873abbc030 ]
For all practical purposes, there is no difference between the situation in which a given device is not ignoring children and its active child count is nonzero and the situation in which its runtime PM usage counter is nonzero. However, pm_runtime_get_if_in_use() will only increment the device's usage counter and return 1 in the latter case.
For consistency, make it do so in the former case either by adjusting pm_runtime_get_conditional() and update the related kerneldoc comments accordingly.
--- drivers/base/power/runtime.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-)
drivers/base/power/runtime.c +18 -9
@@ -1181,10 +1181,12 @@ EXPORT_SYMBOL_GPL(__pm_runtime_resume);* * Return -EINVAL if runtime PM is disabled for @dev. * -* Otherwise, if the runtime PM status of @dev is %RPM_ACTIVE and either -* @ign_usage_count is %true or the runtime PM usage counter of @dev is not -* zero, increment the usage counter of @dev and return 1. Otherwise, return 0 -* without changing the usage counter. +* Otherwise, if its runtime PM status is %RPM_ACTIVE and (1) @ign_usage_count +* is set, or (2) @dev is not ignoring children and its active child count is +* nonero, or (3) the runtime PM usage counter of @dev is not zero, increment +* the usage counter of @dev and return 1. +* +* Otherwise, return 0 without changing the usage counter. * * If @ign_usage_count is %true, this function can be used to prevent suspending * the device when its runtime PM status is %RPM_ACTIVE.
@@ -1206,7 +1208,8 @@ static int pm_runtime_get_conditional(struct device *dev, bool ign_usage_count) retval = -EINVAL ; }else if (dev->power.runtime_status !=RPM_ACTIVE ) { retval =0 ; - }else if (ign_usage_count) { + }else if (ign_usage_count || (!dev->power.ignore_children && +atomic_read (&dev->power.child_count) >0 )) { retval =1 ;atomic_inc (&dev->power.usage_count); }else {
@@ -1239,10 +1242,16 @@ EXPORT_SYMBOL_GPL(pm_runtime_get_if_active);* @dev: Target device. * * Increment the runtime PM usage counter of @dev if its runtime PM status is -* %RPM_ACTIVE and its runtime PM usage counter is greater than 0, in which case -* it returns 1. If the device is in a different state or its usage_count is 0, -* 0 is returned. -EINVAL is returned if runtime PM is disabled for the device, -* in which case also the usage_count will remain unmodified. +* %RPM_ACTIVE and its runtime PM usage counter is greater than 0 or it is not +* ignoring children and its active child count is nonzero. 1 is returned in +* this case. +* +* If @dev is in a different state or it is not in use (that is, its usage +* counter is 0, or it is ignoring children, or its active child count is 0), +* 0 is returned. +* +* -EINVAL is returned if runtime PM is disabled for the device, in which case +* also the usage counter of @dev is not updated. */ int pm_runtime_get_if_in_use (struct device *dev) {
Signature · 1 line
2.50.1