From patchwork Wed Aug 31 07:29:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: MyungJoo Ham X-Patchwork-Id: 1120472 Received: from smtp1.linux-foundation.org (smtp1.linux-foundation.org [140.211.169.13]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p81K4bx7018469 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL) for ; Thu, 1 Sep 2011 20:05:02 GMT Received: from daredevil.linux-foundation.org (localhost [127.0.0.1]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id p81K1Rd3011605; Thu, 1 Sep 2011 13:01:58 -0700 Received: from mailout3.samsung.com (mailout3.samsung.com [203.254.224.33]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id p7V7TlF1017573 for ; Wed, 31 Aug 2011 00:30:52 -0700 Received: from epcpsbgm1.samsung.com (mailout3.samsung.com [203.254.224.33]) by mailout3.samsung.com (Oracle Communications Messaging Exchange Server 7u4-19.01 64bit (built Sep 7 2010)) with ESMTP id <0LQS00G487HMZLB0@mailout3.samsung.com> for linux-pm@lists.linux-foundation.org; Wed, 31 Aug 2011 16:29:46 +0900 (KST) X-AuditID: cbfee61a-b7cf1ae00000208e-0e-4e5de2ea09e2 Received: from epmmp1 ( [203.254.227.16]) by epcpsbgm1.samsung.com (MMPCPMTA) with SMTP id CB.ED.08334.AE2ED5E4; Wed, 31 Aug 2011 16:29:46 +0900 (KST) Received: from TNRNDGASPAPP1.tn.corp.samsungelectronics.net ([165.213.149.150]) by mmp1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0LQS001II7HH5X@mmp1.samsung.com> for linux-pm@lists.linux-foundation.org; Wed, 31 Aug 2011 16:29:46 +0900 (KST) Received: from localhost.localdomain ([165.213.219.116]) by TNRNDGASPAPP1.tn.corp.samsungelectronics.net with Microsoft SMTPSVC(6.0.3790.4675); Wed, 31 Aug 2011 16:30:18 +0900 Date: Wed, 31 Aug 2011 16:29:38 +0900 From: MyungJoo Ham In-reply-to: <1314775779-21399-1-git-send-email-myungjoo.ham@samsung.com> To: linux-pm@lists.linux-foundation.org Message-id: <1314775779-21399-4-git-send-email-myungjoo.ham@samsung.com> X-Mailer: git-send-email 1.7.4.1 References: <1314775779-21399-1-git-send-email-myungjoo.ham@samsung.com> X-OriginalArrivalTime: 31 Aug 2011 07:30:18.0298 (UTC) FILETIME=[D55559A0:01CC67AF] X-Brightmail-Tracker: AAAAAA== Received-SPF: none (domain of myungjoo.ham@samsung.com does not designate permitted sender hosts) X-Spam-Status: No, hits=-12.022 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SUBJECT_BRACKETED, SAMSUNG_WEBMAIL_OSDL X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.21 Cc: Len Brown , Greg Kroah-Hartman , Kyungmin Park , Thomas Gleixner Subject: [linux-pm] [PATCH v9 3/4] PM / devfreq: add common sysfs interfaces X-BeenThere: linux-pm@lists.linux-foundation.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Linux power management List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-pm-bounces@lists.linux-foundation.org Errors-To: linux-pm-bounces@lists.linux-foundation.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Thu, 01 Sep 2011 20:05:02 +0000 (UTC) Device specific sysfs interface /sys/devices/.../power/devfreq_* - governor R: name of governor - cur_freq R: current frequency - max_freq R: maximum operable frequency - min_freq R: minimum operable frequency - polling_interval R: polling interval in ms given with devfreq profile W: update polling interval. Signed-off-by: MyungJoo Ham Signed-off-by: Kyungmin Park --- Changes from v8 - applied per-devfreq locking mechanism Changes from v7 - removed set_freq from the common devfreq interface - added get_devfreq, a mutex-protected wrapper for find_device_devfreq (for sysfs interfaces and later with governor-support) - corrected ABI documentation. Changes from v6 - poling_interval is writable. Changes from v5 - updated devferq_update usage. Changes from v4 - removed system-wide sysfs interface - removed tickling sysfs interface - added set_freq for userspace governor (and any other governors that require user input) Changes from v3 - corrected sysfs API usage - corrected error messages - moved sysfs entry location - added sysfs entries Changes from v2 - add ABI entries for devfreq sysfs interface --- Documentation/ABI/testing/sysfs-devices-power | 37 +++++ drivers/devfreq/devfreq.c | 203 +++++++++++++++++++++++++ 2 files changed, 240 insertions(+), 0 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-devices-power b/Documentation/ABI/testing/sysfs-devices-power index 8ffbc25..57f4591 100644 --- a/Documentation/ABI/testing/sysfs-devices-power +++ b/Documentation/ABI/testing/sysfs-devices-power @@ -165,3 +165,40 @@ Description: Not all drivers support this attribute. If it isn't supported, attempts to read or write it will yield I/O errors. + +What: /sys/devices/.../power/devfreq_governor +Date: July 2011 +Contact: MyungJoo Ham +Description: + The /sys/devices/.../power/devfreq_governor shows the name + of the governor used by the corresponding device. + +What: /sys/devices/.../power/devfreq_cur_freq +Date: July 2011 +Contact: MyungJoo Ham +Description: + The /sys/devices/.../power/devfreq_cur_freq shows the current + frequency of the corresponding device. + +What: /sys/devices/.../power/devfreq_max_freq +Date: July 2011 +Contact: MyungJoo Ham +Description: + The /sys/devices/.../power/devfreq_max_freq shows the + maximum operable frequency of the corresponding device. + +What: /sys/devices/.../power/devfreq_min_freq +Date: July 2011 +Contact: MyungJoo Ham +Description: + The /sys/devices/.../power/devfreq_min_freq shows the + minimum operable frequency of the corresponding device. + +What: /sys/devices/.../power/devfreq_polling_interval +Date: July 2011 +Contact: MyungJoo Ham +Description: + The /sys/devices/.../power/devfreq_polling_interval sets and + shows the requested polling interval of the corresponding + device. The values are represented in ms. If the value is less + than 1 jiffy, it is considered to be 0, which means no polling. diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c index 621b863..1c46052 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -37,6 +37,8 @@ static struct delayed_work devfreq_work; static LIST_HEAD(devfreq_list); static DEFINE_MUTEX(devfreq_list_lock); +static struct attribute_group dev_attr_group; + /** * find_device_devfreq() - find devfreq struct using device pointer * @dev: device pointer used to lookup device devfreq. @@ -191,6 +193,8 @@ static void devfreq_monitor(struct work_struct *work) dev_err(devfreq->dev, "Due to devfreq_do error(%d), devfreq(%s) is removed from the device\n", error, devfreq->governor->name); + sysfs_unmerge_group(&devfreq->dev->kobj, + &dev_attr_group); list_del(&devfreq->node); mutex_unlock(&devfreq->lock); kfree(devfreq); @@ -293,6 +297,8 @@ int devfreq_add_device(struct device *dev, struct devfreq_dev_profile *profile, queue_delayed_work(devfreq_wq, &devfreq_work, devfreq->next_polling); } + + sysfs_merge_group(&dev->kobj, &dev_attr_group); mutex_unlock(&devfreq->lock); goto out; err_init: @@ -333,6 +339,8 @@ int devfreq_remove_device(struct device *dev) goto out; } + sysfs_unmerge_group(&dev->kobj, &dev_attr_group); + list_del(&devfreq->node); if (devfreq->governor->exit) @@ -346,6 +354,201 @@ out: return 0; } +static ssize_t show_governor(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct devfreq *df; + ssize_t ret; + + mutex_lock(&devfreq_list_lock); + df = find_device_devfreq(dev); + if (IS_ERR(df)) { + ret = PTR_ERR(df); + goto out; + } + + mutex_lock(&df->lock); + if (!df->governor) { + ret = -EINVAL; + goto out_l; + } + + ret = sprintf(buf, "%s\n", df->governor->name); +out_l: + mutex_unlock(&df->lock); +out: + mutex_unlock(&devfreq_list_lock); + return ret; +} + +static ssize_t show_freq(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct devfreq *df; + ssize_t ret; + + mutex_lock(&devfreq_list_lock); + df = find_device_devfreq(dev); + if (IS_ERR(df)) { + ret = PTR_ERR(df); + goto out; + } + + ret = sprintf(buf, "%lu\n", df->previous_freq); +out: + mutex_unlock(&devfreq_list_lock); + return ret; +} + +static ssize_t show_max_freq(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct devfreq *df; + ssize_t ret; + unsigned long freq = ULONG_MAX; + struct opp *opp; + + mutex_lock(&devfreq_list_lock); + df = find_device_devfreq(dev); + if (IS_ERR(df)) { + ret = PTR_ERR(df); + goto out; + } + + mutex_lock(&df->lock); + opp = opp_find_freq_floor(df->dev, &freq); + if (IS_ERR(opp)) { + ret = PTR_ERR(opp); + goto out_l; + } + + ret = sprintf(buf, "%lu\n", freq); +out_l: + mutex_unlock(&df->lock); +out: + mutex_unlock(&devfreq_list_lock); + return ret; +} + +static ssize_t show_min_freq(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct devfreq *df; + ssize_t ret; + unsigned long freq = 0; + struct opp *opp; + + mutex_lock(&devfreq_list_lock); + df = find_device_devfreq(dev); + if (IS_ERR(df)) { + ret = PTR_ERR(df); + goto out; + } + + mutex_lock(&df->lock); + opp = opp_find_freq_ceil(df->dev, &freq); + if (IS_ERR(opp)) { + ret = PTR_ERR(opp); + goto out_l; + } + + ret = sprintf(buf, "%lu\n", freq); +out_l: + mutex_unlock(&df->lock); +out: + mutex_unlock(&devfreq_list_lock); + return ret; +} + +static ssize_t show_polling_interval(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct devfreq *df; + ssize_t ret; + + mutex_lock(&devfreq_list_lock); + df = find_device_devfreq(dev); + if (IS_ERR(df)) { + ret = PTR_ERR(df); + goto out; + } + + mutex_lock(&df->lock); + if (!df->profile) { + ret = -EINVAL; + goto out_l; + } + + ret = sprintf(buf, "%d\n", df->profile->polling_ms); +out_l: + mutex_unlock(&df->lock); +out: + mutex_unlock(&devfreq_list_lock); + return ret; +} + +static ssize_t store_polling_interval(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + struct devfreq *df; + unsigned int value; + int ret; + + mutex_lock(&devfreq_list_lock); + df = find_device_devfreq(dev); + if (IS_ERR(df)) { + count = PTR_ERR(df); + goto out; + } + mutex_lock(&df->lock); + if (!df->profile) { + count = -EINVAL; + goto out_l; + } + + ret = sscanf(buf, "%u", &value); + if (ret != 1) { + count = -EINVAL; + goto out_l; + } + + df->profile->polling_ms = value; + df->next_polling = df->polling_jiffies + = msecs_to_jiffies(value); + + if (df->next_polling > 0 && !polling) { + polling = true; + queue_delayed_work(devfreq_wq, &devfreq_work, + df->next_polling); + } +out_l: + mutex_unlock(&df->lock); +out: + mutex_unlock(&devfreq_list_lock); + + return count; +} + +static DEVICE_ATTR(devfreq_governor, 0444, show_governor, NULL); +static DEVICE_ATTR(devfreq_cur_freq, 0444, show_freq, NULL); +static DEVICE_ATTR(devfreq_max_freq, 0444, show_max_freq, NULL); +static DEVICE_ATTR(devfreq_min_freq, 0444, show_min_freq, NULL); +static DEVICE_ATTR(devfreq_polling_interval, 0644, show_polling_interval, + store_polling_interval); +static struct attribute *dev_entries[] = { + &dev_attr_devfreq_governor.attr, + &dev_attr_devfreq_cur_freq.attr, + &dev_attr_devfreq_max_freq.attr, + &dev_attr_devfreq_min_freq.attr, + &dev_attr_devfreq_polling_interval.attr, + NULL, +}; +static struct attribute_group dev_attr_group = { + .name = power_group_name, + .attrs = dev_entries, +}; + /** * devfreq_init() - Initialize data structure for devfreq framework and * start polling registered devfreq devices.