From patchwork Mon Nov 7 06:23:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: huang lin X-Patchwork-Id: 9414287 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E4E496022E for ; Mon, 7 Nov 2016 06:23:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D698728CE5 for ; Mon, 7 Nov 2016 06:23:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C8F8C28CE7; Mon, 7 Nov 2016 06:23:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4189E28CE5 for ; Mon, 7 Nov 2016 06:23:54 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1c3dLS-0004Pw-5i; Mon, 07 Nov 2016 06:23:50 +0000 Received: from mail-pf0-f195.google.com ([209.85.192.195]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c3dLO-0004L2-P9 for linux-rockchip@lists.infradead.org; Mon, 07 Nov 2016 06:23:48 +0000 Received: by mail-pf0-f195.google.com with SMTP id y68so15261776pfb.1 for ; Sun, 06 Nov 2016 22:23:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wqp0JWybyLBY2HNu46FcGxLw4Zj9FbcQGgA7Bl3ADn8=; b=k/f2JSH4qdeNEBFoBICLUEoO/3CstiWe+5KndY8YOaeV+R5I3Q6q2FRYwiHOhdSf5P dTCPjQlbWKk0cBFMuoytEZqipqn5JBOqr5WyxY1N4H1mL/+zXJKVv4tIJb4FP+xT0anD kyG76k5dRtL+EHzqjIfblW8EttDDtCPbPO+MxuwVykrEAfD39xQwJPwZ0sJ1Na0K29ni o2vURFEmPnxynCWXxxwddvcuG6Uy3oQYnwmmZDR+81YW6nQ+o1SanMLk5AyFWCC+yntf /3DnQjViDioTAP00Wmr4GEh3FHbA910d32RZkvUc1gs6TQglPQxuRGseC3H0ddsHLf60 xlRQ== X-Gm-Message-State: ABUngveGywq+pkdnDr1uBOkmbB0tkQxaueA+1K+iioTAiyDdAJ6u4LfQAP7J4HnEyALQtA== X-Received: by 10.99.105.70 with SMTP id e67mr8254881pgc.99.1478499803515; Sun, 06 Nov 2016 22:23:23 -0800 (PST) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id p62sm36900221pfb.42.2016.11.06.22.23.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 06 Nov 2016 22:23:23 -0800 (PST) From: Lin Huang To: myungjoo.ham@samsung.com Subject: [PATCH v3 1/2] PM/devfreq: add suspend frequency support Date: Mon, 7 Nov 2016 14:23:08 +0800 Message-Id: <1478499789-21589-2-git-send-email-hl@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1478499789-21589-1-git-send-email-hl@rock-chips.com> References: <1478499789-21589-1-git-send-email-hl@rock-chips.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161106_222346_917368_340EFB61 X-CRM114-Status: GOOD ( 15.50 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lin Huang , cw00.choi@samsung.com, linux-pm@vger.kernel.org, dbasehore@chromium.org, linux-kernel@vger.kernel.org, dianders@chromium.org, linux-rockchip@lists.infradead.org MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add suspend frequency support and if needed set it to the frequency obtained from the suspend opp (can be defined using opp-v2 bindings and is optional). Signed-off-by: Lin Huang --- Changes in v2: - use update_devfreq() instead devfreq_update_status() Changes in v3: - fix build error drivers/devfreq/devfreq.c | 18 ++++++++++++++++-- drivers/devfreq/governor_simpleondemand.c | 9 +++++++++ include/linux/devfreq.h | 8 ++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c index da72d97..4c76e79 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -359,8 +359,10 @@ void devfreq_monitor_suspend(struct devfreq *devfreq) mutex_unlock(&devfreq->lock); return; } - - devfreq_update_status(devfreq, devfreq->previous_freq); + if (devfreq->suspend_freq) + update_devfreq(devfreq); + else + devfreq_update_status(devfreq, devfreq->previous_freq); devfreq->stop_polling = true; mutex_unlock(&devfreq->lock); cancel_delayed_work_sync(&devfreq->work); @@ -1254,6 +1256,18 @@ struct dev_pm_opp *devfreq_recommended_opp(struct device *dev, } EXPORT_SYMBOL(devfreq_recommended_opp); +void devfreq_opp_get_suspend_opp(struct device *dev, struct devfreq *devfreq) +{ + struct dev_pm_opp *suspend_opp; + + rcu_read_lock(); + suspend_opp = dev_pm_opp_get_suspend_opp(dev); + if (suspend_opp) + devfreq->suspend_freq = dev_pm_opp_get_freq(suspend_opp); + rcu_read_unlock(); +} +EXPORT_SYMBOL(devfreq_opp_get_suspend_opp); + /** * devfreq_register_opp_notifier() - Helper function to get devfreq notified * for any changes in the OPP availability diff --git a/drivers/devfreq/governor_simpleondemand.c b/drivers/devfreq/governor_simpleondemand.c index ae72ba5..a3efee0 100644 --- a/drivers/devfreq/governor_simpleondemand.c +++ b/drivers/devfreq/governor_simpleondemand.c @@ -29,6 +29,15 @@ static int devfreq_simple_ondemand_func(struct devfreq *df, struct devfreq_simple_ondemand_data *data = df->data; unsigned long max = (df->max_freq) ? df->max_freq : UINT_MAX; + /* + * if devfreq in suspend status and have suspend_freq, + * the frequency need to set to suspend_freq + */ + if (df->stop_polling && df->suspend_freq) { + *freq = df->suspend_freq; + return 0; + } + err = devfreq_update_stats(df); if (err) return err; diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h index 98c6993..1bdd5d3 100644 --- a/include/linux/devfreq.h +++ b/include/linux/devfreq.h @@ -172,6 +172,7 @@ struct devfreq { struct delayed_work work; unsigned long previous_freq; + unsigned long suspend_freq; struct devfreq_dev_status last_status; void *data; /* private data for governors */ @@ -214,6 +215,8 @@ extern int devfreq_resume_device(struct devfreq *devfreq); /* Helper functions for devfreq user device driver with OPP. */ extern struct dev_pm_opp *devfreq_recommended_opp(struct device *dev, unsigned long *freq, u32 flags); +extern void devfreq_opp_get_suspend_opp(struct device *dev, + struct devfreq *devfreq); extern int devfreq_register_opp_notifier(struct device *dev, struct devfreq *devfreq); extern int devfreq_unregister_opp_notifier(struct device *dev, @@ -315,6 +318,11 @@ static inline struct dev_pm_opp *devfreq_recommended_opp(struct device *dev, return ERR_PTR(-EINVAL); } +static inline void devfreq_opp_get_suspend_opp(struct device *dev, + struct devfreq *devfreq) +{ +} + static inline int devfreq_register_opp_notifier(struct device *dev, struct devfreq *devfreq) {