[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20120428153335.GA13787@G62>
Date: Sat, 28 Apr 2012 08:33:35 -0700
From: mark gross <markgross@...gnar.org>
To: "Rafael J. Wysocki" <rjw@...k.pl>
Cc: Linux PM list <linux-pm@...r.kernel.org>,
LKML <linux-kernel@...r.kernel.org>,
Kevin Hilman <khilman@...com>,
Magnus Damm <magnus.damm@...il.com>,
Mark Brown <broonie@...nsource.wolfsonmicro.com>,
markgross@...gnar.org, Jean Pihet <j-pihet@...com>
Subject: Re: [PATCH 1/2] PM / QoS: Create device constraints objects on
notifier registration
On Fri, Apr 27, 2012 at 11:48:18PM +0200, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rjw@...k.pl>
>
> The current behavior of dev_pm_qos_add_notifier() makes device PM QoS
> notifiers less than useful. Namely, it silently returns success when
> called before any PM QoS constraints are added for the device, so the
> caller will assume that the notifier has been registered, but when
> someone actually adds some nontrivial constraints for the device
> eventually, the previous callers of dev_pm_qos_add_notifier()
> will not know about that and their notifier routines will not be
> executed (contrary to their expectations).
>
> To address this problem make dev_pm_qos_add_notifier() create the
> constraints object for the device if it is not present when the
> routine is called.
>
> Signed-off-by: Rafael J. Wysocki <rjw@...k.pl>
> ---
> drivers/base/power/qos.c | 19 ++++++++++++-------
> 1 file changed, 12 insertions(+), 7 deletions(-)
>
> Index: linux/drivers/base/power/qos.c
> ===================================================================
> --- linux.orig/drivers/base/power/qos.c
> +++ linux/drivers/base/power/qos.c
> @@ -352,21 +352,26 @@ EXPORT_SYMBOL_GPL(dev_pm_qos_remove_requ
> *
> * Will register the notifier into a notification chain that gets called
> * upon changes to the target value for the device.
> + *
> + * If the device's constraints object doesn't exist when this routine is called,
> + * it will be created (or error code will be returned if that fails).
> */
> int dev_pm_qos_add_notifier(struct device *dev, struct notifier_block *notifier)
> {
> - int retval = 0;
> + int ret = 0;
>
> mutex_lock(&dev_pm_qos_mtx);
>
> - /* Silently return if the constraints object is not present. */
> - if (dev->power.constraints)
> - retval = blocking_notifier_chain_register(
> - dev->power.constraints->notifiers,
> - notifier);
FWIW (and IIRC) I did this because some audio use of pm_qos had a series
of re-allocation of constraints and clean up that would fall over so I
had this silent hack to deal with that "complexity".
> + if (!dev->power.constraints)
> + ret = dev->power.power_state.event != PM_EVENT_INVALID ?
> + dev_pm_qos_constraints_allocate(dev) : -ENODEV;
> +
> + if (!ret)
> + ret = blocking_notifier_chain_register(
> + dev->power.constraints->notifiers, notifier);
>
> mutex_unlock(&dev_pm_qos_mtx);
> - return retval;
> + return ret;
> }
> EXPORT_SYMBOL_GPL(dev_pm_qos_add_notifier);
>
Definitely a change for the better (but we should check that the audio
stuff still works before committing this. I'll see if I can check that
this weekend.)
Acked-by : markgross <markgross@...gnar.org>
--mark
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists