From patchwork Fri Aug 3 20:05:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 10555483 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3494415A6 for ; Fri, 3 Aug 2018 20:05:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 269B12B447 for ; Fri, 3 Aug 2018 20:05:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1A3182B841; Fri, 3 Aug 2018 20:05:33 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 72BB32B772 for ; Fri, 3 Aug 2018 20:05:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732069AbeHCWDQ (ORCPT ); Fri, 3 Aug 2018 18:03:16 -0400 Received: from mail-pl0-f65.google.com ([209.85.160.65]:39462 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729796AbeHCWDP (ORCPT ); Fri, 3 Aug 2018 18:03:15 -0400 Received: by mail-pl0-f65.google.com with SMTP id m1-v6so3010895plt.6 for ; Fri, 03 Aug 2018 13:05:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=50v0MObMwW1GhRWbz62t5tp4LgZzGZ5aWgcyvfu2rvY=; b=ABYXl5gtTTJc0j4DSLhu4WSxWrs7ebMPr7JIk4KkcQzOqt0geffNWaEzpK6ybFkXcL GZV5990J9/DHRXoVCqvDBU6dLV6RBkym/NwSp7lrSo9ChDqmJz7PbzW8tljRYPLIiQOT aMNDOuvML4gH6+wJ/kPAUwHMd7fxUMra/sRFI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=50v0MObMwW1GhRWbz62t5tp4LgZzGZ5aWgcyvfu2rvY=; b=nTHln2QCWvKgkh6PDckRfmxlRoKwVk9TYhMQUb8FWvj2ZB+S+HLfNtj6g9cBgwdKRc RANoXO/qe7G+Dy1io8fiFebrEfQZuDKJ7unR5j2lmdZb/DhmNyzn42UUWCu5u6RRKmJJ ix/SkJwOKth26apzvDhHG0+cwIKvbJCYzyDXDHRDJvkDvMIvR2WQCayx/aTSjNdeqUMz 3WiWtQ6XQQzWR0X0Xo0/VKewU5l7gibWxzCA6Hn3ESD2AE+4djxBvHiHWZw6Fv052j/2 ilVbqtD2uvHhg2jXER+hK6faQRyWchzkij1OeJX6AFKsWac0ugMcPI1S7DIbJ1RmHVv2 bBnw== X-Gm-Message-State: AOUpUlEkLjEKRhMOCTC1pUdcvH/pUDoQtP9WfORhISdS7x+JeM3fYpH5 SMEQo4FmPgczvp/YwSSE1bzEoj8y8Ec= X-Google-Smtp-Source: AAOMgpcjsgAVZr6m2K+9Z/oeu3YZPsXR5y6ulhO8E7/j7cn+z26bnp6RIyeGZneUWIzZXPvr3OX5Ag== X-Received: by 2002:a17:902:b401:: with SMTP id x1-v6mr4833228plr.236.1533326729273; Fri, 03 Aug 2018 13:05:29 -0700 (PDT) Received: from mka.mtv.corp.google.com ([2620:15c:202:1:b6af:f85:ed6c:ac6a]) by smtp.gmail.com with ESMTPSA id u83-v6sm19944330pfj.37.2018.08.03.13.05.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Aug 2018 13:05:28 -0700 (PDT) From: Matthias Kaehlcke To: MyungJoo Ham , Kyungmin Park , Chanwoo Choi Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Brian Norris , Matthias Kaehlcke Subject: [PATCH v6 1/3] PM / devfreq: Fix handling of min/max_freq == 0 Date: Fri, 3 Aug 2018 13:05:09 -0700 Message-Id: <20180803200511.189664-2-mka@chromium.org> X-Mailer: git-send-email 2.18.0.597.ga71716f1ad-goog In-Reply-To: <20180803200511.189664-1-mka@chromium.org> References: <20180803200511.189664-1-mka@chromium.org> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Commit ab8f58ad72c4 ("PM / devfreq: Set min/max_freq when adding the devfreq device") initializes df->min/max_freq with the min/max OPP when the device is added. Later commit f1d981eaecf8 ("PM / devfreq: Use the available min/max frequency") adds df->scaling_min/max_freq and the following to the frequency adjustment code: max_freq = MIN(devfreq->scaling_max_freq, devfreq->max_freq); With the current handling of min/max_freq this is incorrect: Even though df->max_freq is now initialized to a value != 0 user space can still set it to 0, in this case max_freq would be 0 instead of df->scaling_max_freq as intended. In consequence the frequency adjustment is not performed: if (max_freq && freq > max_freq) { freq = max_freq; To fix this set df->min/max freq to the min/max OPP in max/max_freq_store, when the user passes a value of 0. This also prevents df->max_freq from being set below the min OPP when df->min_freq is 0, and similar for min_freq. Since it is now guaranteed that df->min/max_freq can't be 0 the checks for this case can be removed. Fixes: f1d981eaecf8 ("PM / devfreq: Use the available min/max frequency") Signed-off-by: Matthias Kaehlcke Reviewed-by: Brian Norris Reviewed-by: Chanwoo Choi --- Changes in v6: - min/max_freq_store(): updated comment about sorting order of frequency table - min/max_freq_store(): moved declaration of 'freq_table' into the block that uses it - added 'Reviewed-by: Chanwoo Choi ' tag Changes in v5: - none Changes in v4: - added 'Reviewed-by: Brian Norris ' tag Changes in v3: - none Changes in v2: - handle freq tables sorted in ascending and descending order in min/max_freq_store() - use same order for conditional statements in min/max_freq_store() --- drivers/devfreq/devfreq.c | 42 ++++++++++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c index 4c49bb1330b5..772e8aab1627 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -283,11 +283,11 @@ int update_devfreq(struct devfreq *devfreq) max_freq = MIN(devfreq->scaling_max_freq, devfreq->max_freq); min_freq = MAX(devfreq->scaling_min_freq, devfreq->min_freq); - if (min_freq && freq < min_freq) { + if (freq < min_freq) { freq = min_freq; flags &= ~DEVFREQ_FLAG_LEAST_UPPER_BOUND; /* Use GLB */ } - if (max_freq && freq > max_freq) { + if (freq > max_freq) { freq = max_freq; flags |= DEVFREQ_FLAG_LEAST_UPPER_BOUND; /* Use LUB */ } @@ -1126,17 +1126,26 @@ static ssize_t min_freq_store(struct device *dev, struct device_attribute *attr, struct devfreq *df = to_devfreq(dev); unsigned long value; int ret; - unsigned long max; ret = sscanf(buf, "%lu", &value); if (ret != 1) return -EINVAL; mutex_lock(&df->lock); - max = df->max_freq; - if (value && max && value > max) { - ret = -EINVAL; - goto unlock; + + if (value) { + if (value > df->max_freq) { + ret = -EINVAL; + goto unlock; + } + } else { + unsigned long *freq_table = df->profile->freq_table; + + /* Get minimum frequency according to sorting order */ + if (freq_table[0] < freq_table[df->profile->max_state - 1]) + value = freq_table[0]; + else + value = freq_table[df->profile->max_state - 1]; } df->min_freq = value; @@ -1161,17 +1170,26 @@ static ssize_t max_freq_store(struct device *dev, struct device_attribute *attr, struct devfreq *df = to_devfreq(dev); unsigned long value; int ret; - unsigned long min; ret = sscanf(buf, "%lu", &value); if (ret != 1) return -EINVAL; mutex_lock(&df->lock); - min = df->min_freq; - if (value && min && value < min) { - ret = -EINVAL; - goto unlock; + + if (value) { + if (value < df->min_freq) { + ret = -EINVAL; + goto unlock; + } + } else { + unsigned long *freq_table = df->profile->freq_table; + + /* Get maximum frequency according to sorting order */ + if (freq_table[0] < freq_table[df->profile->max_state - 1]) + value = freq_table[df->profile->max_state - 1]; + else + value = freq_table[0]; } df->max_freq = value; From patchwork Fri Aug 3 20:05:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 10555487 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C4C9F13BF for ; Fri, 3 Aug 2018 20:05:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B39B62B772 for ; Fri, 3 Aug 2018 20:05:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A5A532B447; Fri, 3 Aug 2018 20:05:47 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 220F72B447 for ; Fri, 3 Aug 2018 20:05:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728477AbeHCWDc (ORCPT ); Fri, 3 Aug 2018 18:03:32 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:34259 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732047AbeHCWDQ (ORCPT ); Fri, 3 Aug 2018 18:03:16 -0400 Received: by mail-pf1-f196.google.com with SMTP id k19-v6so3803155pfi.1 for ; Fri, 03 Aug 2018 13:05:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KwSdWcRlE8qhbDzxuh55QFL17PZSPEwFjyt67vHVEtQ=; b=g4oejE3btHUHZH68I56sCB+BeskSwbZl5/I2Ti9QQ98BqHnELPNA3ejDhMR59wNtsN d0tRgbrj/dK9pWD1qm115U25fOBxq4w9SK0ZHLlL3M1rXh+zbGAtnQ683gUAVpvvDSgB k3G5Yw7Bxd5Wwfk6op1T45S/Ac062kFpF6lc4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KwSdWcRlE8qhbDzxuh55QFL17PZSPEwFjyt67vHVEtQ=; b=lp+isXtvWlB404xUlzZ93j23VTaGEEZKEUlPN6Wv8c2aPH12hbzMip7S1IebaB5Ifk TzZaq1sZfxRSKFDol9ZZf6AVEijxlIG4u0R3+8kXwJ90xeVliD1SM/5sUMC9W+CFphn8 THhHl+UHkmg1q5CH6kIk0i2tJ3T/QNy2oT+zrvOnhhQgOFzu+LUZxN6ZGjIHcJyUav97 kOXFdRut+rHU7t2oG/rMz5pdGCooWnfuSwmR84it2gX2hwoeTE+jNxZCZx71+nan7JyI o73oM9G3NjeBJ0c0FXCRjN+G19rN8/M6/5sTI2SGMtPDIuJbs72dT7tPP6MLV9cLzvHt 3zVw== X-Gm-Message-State: AOUpUlGsTKis+haszLlUTChf6tv9osWc1MC0oPPo9+jb1k/ZlXTi5m4F x8n1WKASfKiXTM21ul2BWnPOlw== X-Google-Smtp-Source: AAOMgpe1T8JGGbHfzoicbDkMJnXORF8HsDZQ664Sj1qaaSk9+SOcihdg1BoMtMqf7Lw29iahlGBCYg== X-Received: by 2002:a63:2a0b:: with SMTP id q11-v6mr5098331pgq.36.1533326730511; Fri, 03 Aug 2018 13:05:30 -0700 (PDT) Received: from mka.mtv.corp.google.com ([2620:15c:202:1:b6af:f85:ed6c:ac6a]) by smtp.gmail.com with ESMTPSA id u83-v6sm19944330pfj.37.2018.08.03.13.05.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Aug 2018 13:05:29 -0700 (PDT) From: Matthias Kaehlcke To: MyungJoo Ham , Kyungmin Park , Chanwoo Choi Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Brian Norris , Matthias Kaehlcke Subject: [PATCH v6 2/3] PM / devfreq: Don't adjust to user limits in governors Date: Fri, 3 Aug 2018 13:05:10 -0700 Message-Id: <20180803200511.189664-3-mka@chromium.org> X-Mailer: git-send-email 2.18.0.597.ga71716f1ad-goog In-Reply-To: <20180803200511.189664-1-mka@chromium.org> References: <20180803200511.189664-1-mka@chromium.org> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Several governors use the user space limits df->min/max_freq to adjust the target frequency. This is not necessary, since update_devfreq() already takes care of this. Instead the governor can request the available min/max frequency by setting the target frequency to DEVFREQ_MIN/MAX_FREQ and let update_devfreq() take care of any adjustments. Signed-off-by: Matthias Kaehlcke Reviewed-by: Brian Norris Reviewed-by: Chanwoo Choi --- Changes in v6: - added 'Reviewed-by: Chanwoo Choi ' tag Changes in v5: - none Changes in v4: - added 'Reviewed-by: Brian Norris ' tag Changes in v3: - none Changes in v2: - squashed "PM / devfreq: Remove redundant frequency adjustment from governors" and "PM / devfreq: governors: Return device frequency limits instead of user limits" - updated subject and commit message - use DEVFREQ_MIN/MAX_FREQ instead of df->scaling_min/max_freq --- drivers/devfreq/governor.h | 3 +++ drivers/devfreq/governor_performance.c | 5 +---- drivers/devfreq/governor_powersave.c | 2 +- drivers/devfreq/governor_simpleondemand.c | 12 +++--------- drivers/devfreq/governor_userspace.c | 16 ++++------------ 5 files changed, 12 insertions(+), 26 deletions(-) diff --git a/drivers/devfreq/governor.h b/drivers/devfreq/governor.h index cfc50a61a90d..b81700244ce3 100644 --- a/drivers/devfreq/governor.h +++ b/drivers/devfreq/governor.h @@ -25,6 +25,9 @@ #define DEVFREQ_GOV_SUSPEND 0x4 #define DEVFREQ_GOV_RESUME 0x5 +#define DEVFREQ_MIN_FREQ 0 +#define DEVFREQ_MAX_FREQ ULONG_MAX + /** * struct devfreq_governor - Devfreq policy governor * @node: list node - contains registered devfreq governors diff --git a/drivers/devfreq/governor_performance.c b/drivers/devfreq/governor_performance.c index 4d23ecfbd948..ded429fd51be 100644 --- a/drivers/devfreq/governor_performance.c +++ b/drivers/devfreq/governor_performance.c @@ -20,10 +20,7 @@ static int devfreq_performance_func(struct devfreq *df, * target callback should be able to get floor value as * said in devfreq.h */ - if (!df->max_freq) - *freq = UINT_MAX; - else - *freq = df->max_freq; + *freq = DEVFREQ_MAX_FREQ; return 0; } diff --git a/drivers/devfreq/governor_powersave.c b/drivers/devfreq/governor_powersave.c index 0c42f23249ef..9e8897f5ac42 100644 --- a/drivers/devfreq/governor_powersave.c +++ b/drivers/devfreq/governor_powersave.c @@ -20,7 +20,7 @@ static int devfreq_powersave_func(struct devfreq *df, * target callback should be able to get ceiling value as * said in devfreq.h */ - *freq = df->min_freq; + *freq = DEVFREQ_MIN_FREQ; return 0; } diff --git a/drivers/devfreq/governor_simpleondemand.c b/drivers/devfreq/governor_simpleondemand.c index 28e0f2de7100..c0417f0e081e 100644 --- a/drivers/devfreq/governor_simpleondemand.c +++ b/drivers/devfreq/governor_simpleondemand.c @@ -27,7 +27,6 @@ static int devfreq_simple_ondemand_func(struct devfreq *df, unsigned int dfso_upthreshold = DFSO_UPTHRESHOLD; unsigned int dfso_downdifferential = DFSO_DOWNDIFFERENCTIAL; struct devfreq_simple_ondemand_data *data = df->data; - unsigned long max = (df->max_freq) ? df->max_freq : UINT_MAX; err = devfreq_update_stats(df); if (err) @@ -47,7 +46,7 @@ static int devfreq_simple_ondemand_func(struct devfreq *df, /* Assume MAX if it is going to be divided by zero */ if (stat->total_time == 0) { - *freq = max; + *freq = DEVFREQ_MAX_FREQ; return 0; } @@ -60,13 +59,13 @@ static int devfreq_simple_ondemand_func(struct devfreq *df, /* Set MAX if it's busy enough */ if (stat->busy_time * 100 > stat->total_time * dfso_upthreshold) { - *freq = max; + *freq = DEVFREQ_MAX_FREQ; return 0; } /* Set MAX if we do not know the initial frequency */ if (stat->current_frequency == 0) { - *freq = max; + *freq = DEVFREQ_MAX_FREQ; return 0; } @@ -85,11 +84,6 @@ static int devfreq_simple_ondemand_func(struct devfreq *df, b = div_u64(b, (dfso_upthreshold - dfso_downdifferential / 2)); *freq = (unsigned long) b; - if (df->min_freq && *freq < df->min_freq) - *freq = df->min_freq; - if (df->max_freq && *freq > df->max_freq) - *freq = df->max_freq; - return 0; } diff --git a/drivers/devfreq/governor_userspace.c b/drivers/devfreq/governor_userspace.c index 080607c3f34d..378d84c011df 100644 --- a/drivers/devfreq/governor_userspace.c +++ b/drivers/devfreq/governor_userspace.c @@ -26,19 +26,11 @@ static int devfreq_userspace_func(struct devfreq *df, unsigned long *freq) { struct userspace_data *data = df->data; - if (data->valid) { - unsigned long adjusted_freq = data->user_frequency; - - if (df->max_freq && adjusted_freq > df->max_freq) - adjusted_freq = df->max_freq; - - if (df->min_freq && adjusted_freq < df->min_freq) - adjusted_freq = df->min_freq; - - *freq = adjusted_freq; - } else { + if (data->valid) + *freq = data->user_frequency; + else *freq = df->previous_freq; /* No user freq specified yet */ - } + return 0; } From patchwork Fri Aug 3 20:05:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 10555485 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C276D13BF for ; Fri, 3 Aug 2018 20:05:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B4EC32B447 for ; Fri, 3 Aug 2018 20:05:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A92F02B841; Fri, 3 Aug 2018 20:05:34 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4F0E92B447 for ; Fri, 3 Aug 2018 20:05:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732227AbeHCWDS (ORCPT ); Fri, 3 Aug 2018 18:03:18 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:36270 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732180AbeHCWDS (ORCPT ); Fri, 3 Aug 2018 18:03:18 -0400 Received: by mail-pf1-f194.google.com with SMTP id b11-v6so3798741pfo.3 for ; Fri, 03 Aug 2018 13:05:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dKj25AmVeyeX7jwDKFFWvEQmV7oeiXozFeZd/moXmGk=; b=NeZDCPJn1xhRRg624McpYukY08l0tfCIeSAZTaNOYLbmzKRh38hg/WTX5hfcKto3ky P8QPPPAfej6bklIcj/Gll8qgn5/1v8uIPdaweu7p+YjJt5XPhIevguki/aoDo5SnAIm9 BvoChFiyn3DIgQm2Xe5VwsHorbWwj+0ENBlwE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dKj25AmVeyeX7jwDKFFWvEQmV7oeiXozFeZd/moXmGk=; b=lrhKZxctBlqbGqYehukc1adiHtrIQkJpoTpoPzgc+CJPNz04IOoATuF4oszr+2TcLD lRJPQBgy9LPpJ1U7vrqLcawKLzWIRrirsBcew9Qmd5aKgFpwjiBWviSBwxrmB9LWLW98 T1t84IWtA9pTAN+M7D/noUQrs51RCrbFaPTP3dwtOi27ko3kSzD+VX9joeZFoDqhJobw mA67+Usz63UPTNUly0MtsI2TSsifyxRpyQnBudhvhMhmAK/WKH7I9qz8MWHqyR7gyZSO dmTGTY4bVwxEbKZmkJkQB6hSjkGCzTsAAiANUrKKtOT5wcG7I+jsWFn1McihbF5VqwGp Ld6g== X-Gm-Message-State: AOUpUlHpIzlpyyB24NwvdsbxGVJL1qFnLVKhu+BLI5RTm61xIWIS3M6/ /aQqZlcgRICwVmiaUHfHzeK6pDp/N0M= X-Google-Smtp-Source: AAOMgpd5DqtuiPe2MuUsDSKLNzG1Jsa7gGLJg0z4zaMGkbIvZNsnG5EENYvtMGcETWPjqdfJy9njHg== X-Received: by 2002:a65:5141:: with SMTP id g1-v6mr5061018pgq.418.1533326731738; Fri, 03 Aug 2018 13:05:31 -0700 (PDT) Received: from mka.mtv.corp.google.com ([2620:15c:202:1:b6af:f85:ed6c:ac6a]) by smtp.gmail.com with ESMTPSA id u83-v6sm19944330pfj.37.2018.08.03.13.05.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Aug 2018 13:05:30 -0700 (PDT) From: Matthias Kaehlcke To: MyungJoo Ham , Kyungmin Park , Chanwoo Choi Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Brian Norris , Matthias Kaehlcke Subject: [PATCH v6 3/3] PM / devfreq: Make update_devfreq() public Date: Fri, 3 Aug 2018 13:05:11 -0700 Message-Id: <20180803200511.189664-4-mka@chromium.org> X-Mailer: git-send-email 2.18.0.597.ga71716f1ad-goog In-Reply-To: <20180803200511.189664-1-mka@chromium.org> References: <20180803200511.189664-1-mka@chromium.org> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Currently update_devfreq() is only visible to devfreq governors outside of devfreq.c. Make it public to allow drivers that adjust devfreq policies to cause a re-evaluation of the frequency after a policy change. Signed-off-by: Matthias Kaehlcke Acked-by: MyungJoo Ham Reviewed-by: Brian Norris Reviewed-by: Chanwoo Choi --- Changes in v6: - added 'Reviewed-by: Chanwoo Choi ' tag Changes in v5: - none Changed in v4: - added 'Reviewed-by: Brian Norris ' tag Changes in v3: - none Changes in v2: - added 'Acked-by: MyungJoo Ham ' tag --- drivers/devfreq/governor.h | 3 --- include/linux/devfreq.h | 8 ++++++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/devfreq/governor.h b/drivers/devfreq/governor.h index b81700244ce3..f53339ca610f 100644 --- a/drivers/devfreq/governor.h +++ b/drivers/devfreq/governor.h @@ -57,9 +57,6 @@ struct devfreq_governor { unsigned int event, void *data); }; -/* Caution: devfreq->lock must be locked before calling update_devfreq */ -extern int update_devfreq(struct devfreq *devfreq); - extern void devfreq_monitor_start(struct devfreq *devfreq); extern void devfreq_monitor_stop(struct devfreq *devfreq); extern void devfreq_monitor_suspend(struct devfreq *devfreq); diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h index 3aae5b3af87c..e4963b0f45da 100644 --- a/include/linux/devfreq.h +++ b/include/linux/devfreq.h @@ -198,6 +198,14 @@ extern void devm_devfreq_remove_device(struct device *dev, extern int devfreq_suspend_device(struct devfreq *devfreq); extern int devfreq_resume_device(struct devfreq *devfreq); +/** + * update_devfreq() - Reevaluate the device and configure frequency + * @devfreq: the devfreq device + * + * Note: devfreq->lock must be held + */ +extern int update_devfreq(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);