From patchwork Wed Nov 21 09:01:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rajagopal.venkat@linaro.org X-Patchwork-Id: 13030 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id CD41823FC1 for ; Wed, 21 Nov 2012 09:04:26 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 1F860A193B9 for ; Wed, 21 Nov 2012 09:04:26 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so9533081iej.11 for ; Wed, 21 Nov 2012 01:04:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:x-gm-message-state; bh=mokG03YFX2vGnEb3cQ+IURHmCzqt8IX2ytfcDkVbHxE=; b=Udt1OdH2JD0XdW931LAl46dfbw84FPUlxgOeJn8NnIjh2s2YhnHkf9yreX9nJHMzQq sITan4G3eXCQeVYBztHup5IlXkcXCGkCy9TvIstIZzSJGvMqvR8IUKNDusq+Bv0+d23Y X1vx2PXWXoO/ber6cZivfzJr//uJvD64CsC9Q9LDiPPt27GiFWP6VlsgWzRNvG6elEl8 gsKEhoJJqHhwrjUuU6Xe/PLoQQjws2535cdw7dp1bo1z4Jprb8tMM89TYW974JSWVcDf 9FYVFVlgBKdwdXt7LfkVqBj3S/3+dZQSs7upp1fAEvTiXstPeQlrB6m2uMYB5WZM8sej gqkA== Received: by 10.50.186.199 with SMTP id fm7mr12700995igc.62.1353488665539; Wed, 21 Nov 2012 01:04:25 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp453320igt; Wed, 21 Nov 2012 01:04:24 -0800 (PST) Received: by 10.68.243.10 with SMTP id wu10mr57556155pbc.85.1353488664474; Wed, 21 Nov 2012 01:04:24 -0800 (PST) Received: from mail-pb0-f50.google.com (mail-pb0-f50.google.com [209.85.160.50]) by mx.google.com with ESMTPS id pv5si21830743pbb.221.2012.11.21.01.04.24 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 21 Nov 2012 01:04:24 -0800 (PST) Received-SPF: neutral (google.com: 209.85.160.50 is neither permitted nor denied by best guess record for domain of rajagopal.venkat@linaro.org) client-ip=209.85.160.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.160.50 is neither permitted nor denied by best guess record for domain of rajagopal.venkat@linaro.org) smtp.mail=rajagopal.venkat@linaro.org Received: by mail-pb0-f50.google.com with SMTP id wz7so3179897pbc.9 for ; Wed, 21 Nov 2012 01:04:24 -0800 (PST) Received: by 10.68.189.5 with SMTP id ge5mr57325726pbc.1.1353488664054; Wed, 21 Nov 2012 01:04:24 -0800 (PST) Received: from localhost.localdomain ([115.242.197.201]) by mx.google.com with ESMTPS id e9sm9634299paz.28.2012.11.21.01.04.17 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 21 Nov 2012 01:04:23 -0800 (PST) From: Rajagopal Venkat To: myungjoo.ham@samsung.com, rjw@sisk.pl, nm@ti.com, mturquette@linaro.org, kyungmin.park@samsung.com Cc: patches@linaro.org, linaro-dev@lists.linaro.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Rajagopal Venkat Subject: [RFC PATCH] PM / devfreq: Add runtime-pm support Date: Wed, 21 Nov 2012 14:31:14 +0530 Message-Id: <1353488474-24420-1-git-send-email-rajagopal.venkat@linaro.org> X-Mailer: git-send-email 1.7.11.3 X-Gm-Message-State: ALoCoQkHaLeLMQrqydEinljCrrX9aA/gte2Cnb5EcRzY14ae1icNjnf1O74enUSI5e3QKKS8CxEe Instead of devfreq device driver explicitly calling devfreq suspend and resume apis perhaps from runtime-pm suspend and resume callbacks, let devfreq core handle it automatically. Attach devfreq core to runtime-pm framework so that, devfreq device driver pm_runtime_suspend() will automatically suspend the devfreq and pm_runtime_resume() will resume the devfreq. Signed-off-by: Rajagopal Venkat --- drivers/devfreq/devfreq.c | 145 ++++++++++++++++++++++++++++++++-------------- include/linux/devfreq.h | 12 ---- 2 files changed, 102 insertions(+), 55 deletions(-) diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c index 45e053e..190e414 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -25,10 +25,9 @@ #include #include #include +#include #include "governor.h" -static struct class *devfreq_class; - /* * devfreq core provides delayed work based load monitoring helper * functions. Governors can use these or can implement their own @@ -414,6 +413,93 @@ static void devfreq_dev_release(struct device *dev) } /** + * devfreq_suspend_device() - Suspend devfreq of a device. + * @devfreq: the devfreq instance to be suspended + */ +static int devfreq_suspend_device(struct devfreq *devfreq) +{ + if (!devfreq) + return -EINVAL; + + if (!devfreq->governor) + return 0; + + return devfreq->governor->event_handler(devfreq, + DEVFREQ_GOV_SUSPEND, NULL); +} + +/** + * devfreq_resume_device() - Resume devfreq of a device. + * @devfreq: the devfreq instance to be resumed + */ +static int devfreq_resume_device(struct devfreq *devfreq) +{ + if (!devfreq) + return -EINVAL; + + if (!devfreq->governor) + return 0; + + return devfreq->governor->event_handler(devfreq, + DEVFREQ_GOV_RESUME, NULL); +} + +static int devfreq_runtime_suspend(struct device *dev) +{ + int ret; + struct devfreq *devfreq; + + mutex_lock(&devfreq_list_lock); + devfreq = find_device_devfreq(dev); + mutex_unlock(&devfreq_list_lock); + + ret = devfreq_suspend_device(devfreq); + if (ret < 0) + goto out; + + ret = pm_generic_runtime_suspend(dev); +out: + return ret; +} + +static int devfreq_runtime_resume(struct device *dev) +{ + int ret; + struct devfreq *devfreq; + + mutex_lock(&devfreq_list_lock); + devfreq = find_device_devfreq(dev); + mutex_unlock(&devfreq_list_lock); + + ret = devfreq_resume_device(devfreq); + if (ret < 0) + goto out; + + ret = pm_generic_runtime_resume(dev); +out: + return ret; +} + +static int devfreq_runtime_idle(struct device *dev) +{ + return pm_generic_runtime_idle(dev); +} + +static const struct dev_pm_ops devfreq_pm_ops = { + SET_RUNTIME_PM_OPS( + devfreq_runtime_suspend, + devfreq_runtime_resume, + devfreq_runtime_idle + ) +}; + +static struct class devfreq_class = { + .name = "devfreq", + .owner = THIS_MODULE, + .pm = &devfreq_pm_ops, +}; + +/** * devfreq_add_device() - Add devfreq feature to the device * @dev: the device to add devfreq feature. * @profile: device-specific profile to run devfreq. @@ -454,8 +540,9 @@ struct devfreq *devfreq_add_device(struct device *dev, mutex_init(&devfreq->lock); mutex_lock(&devfreq->lock); + dev->class = &devfreq_class; devfreq->dev.parent = dev; - devfreq->dev.class = devfreq_class; + devfreq->dev.class = &devfreq_class; devfreq->dev.release = devfreq_dev_release; devfreq->profile = profile; strncpy(devfreq->governor_name, governor_name, DEVFREQ_NAME_LEN); @@ -498,6 +585,9 @@ struct devfreq *devfreq_add_device(struct device *dev, goto err_init; } + pm_runtime_get_noresume(dev); + pm_runtime_set_active(dev); + return devfreq; err_init: @@ -526,40 +616,6 @@ int devfreq_remove_device(struct devfreq *devfreq) EXPORT_SYMBOL(devfreq_remove_device); /** - * devfreq_suspend_device() - Suspend devfreq of a device. - * @devfreq: the devfreq instance to be suspended - */ -int devfreq_suspend_device(struct devfreq *devfreq) -{ - if (!devfreq) - return -EINVAL; - - if (!devfreq->governor) - return 0; - - return devfreq->governor->event_handler(devfreq, - DEVFREQ_GOV_SUSPEND, NULL); -} -EXPORT_SYMBOL(devfreq_suspend_device); - -/** - * devfreq_resume_device() - Resume devfreq of a device. - * @devfreq: the devfreq instance to be resumed - */ -int devfreq_resume_device(struct devfreq *devfreq) -{ - if (!devfreq) - return -EINVAL; - - if (!devfreq->governor) - return 0; - - return devfreq->governor->event_handler(devfreq, - DEVFREQ_GOV_RESUME, NULL); -} -EXPORT_SYMBOL(devfreq_resume_device); - -/** * devfreq_add_governor() - Add devfreq governor * @governor: the devfreq governor to be added */ @@ -730,6 +786,7 @@ out: ret = count; return ret; } + static ssize_t show_available_governors(struct device *d, struct device_attribute *attr, char *buf) @@ -952,19 +1009,21 @@ static struct device_attribute devfreq_attrs[] = { static int __init devfreq_init(void) { - devfreq_class = class_create(THIS_MODULE, "devfreq"); - if (IS_ERR(devfreq_class)) { + int err; + + err = class_register(&devfreq_class); + if (err < 0) { pr_err("%s: couldn't create class\n", __FILE__); - return PTR_ERR(devfreq_class); + return err; } devfreq_wq = create_freezable_workqueue("devfreq_wq"); if (IS_ERR(devfreq_wq)) { - class_destroy(devfreq_class); + class_unregister(&devfreq_class); pr_err("%s: couldn't create workqueue\n", __FILE__); return PTR_ERR(devfreq_wq); } - devfreq_class->dev_attrs = devfreq_attrs; + devfreq_class.dev_attrs = devfreq_attrs; return 0; } @@ -972,7 +1031,7 @@ subsys_initcall(devfreq_init); static void __exit devfreq_exit(void) { - class_destroy(devfreq_class); + class_unregister(&devfreq_class); destroy_workqueue(devfreq_wq); } module_exit(devfreq_exit); diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h index 235248c..4fd920f 100644 --- a/include/linux/devfreq.h +++ b/include/linux/devfreq.h @@ -181,8 +181,6 @@ extern struct devfreq *devfreq_add_device(struct device *dev, const char *governor_name, void *data); extern int devfreq_remove_device(struct devfreq *devfreq); -extern int devfreq_suspend_device(struct devfreq *devfreq); -extern int devfreq_resume_device(struct devfreq *devfreq); /* Helper functions for devfreq user device driver with OPP. */ extern struct opp *devfreq_recommended_opp(struct device *dev, @@ -226,16 +224,6 @@ static int devfreq_remove_device(struct devfreq *devfreq) return 0; } -static int devfreq_suspend_device(struct devfreq *devfreq) -{ - return 0; -} - -static int devfreq_resume_device(struct devfreq *devfreq) -{ - return 0; -} - static struct opp *devfreq_recommended_opp(struct device *dev, unsigned long *freq, u32 flags) {