From patchwork Thu Jun 14 19:47:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 10465209 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 BB41C600D0 for ; Thu, 14 Jun 2018 19:51:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AD15728C22 for ; Thu, 14 Jun 2018 19:51:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 99FB628C2B; Thu, 14 Jun 2018 19:51:00 +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=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=unavailable 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 32C3328C22 for ; Thu, 14 Jun 2018 19:51:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755534AbeFNTuP (ORCPT ); Thu, 14 Jun 2018 15:50:15 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:37496 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755435AbeFNTrX (ORCPT ); Thu, 14 Jun 2018 15:47:23 -0400 Received: by mail-pg0-f65.google.com with SMTP id r21-v6so3380375pgv.4 for ; Thu, 14 Jun 2018 12:47:22 -0700 (PDT) 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; bh=JcYUqylHuYDANcRsdz8ys1e03YkBn8Gx5Vp2Bs++y30=; b=lpRz/vitpxMFgYea0or01+INDxwlgEaJlqtkwXllDGN4JbEKjj9fTurpKEUgRWNS6+ jF1tHflEwpzNILz7jaty7h/B3KOiRWr3TvFB6Ss3mkxImSk4qpTftrfIjHEKwryq94Ca 7pfQFhYSySswJP7fMVdGOjNh1HOXOdhkYD4bRLhLvDU/rV0bcklegZKlzcH6ghDRyfOt lEJwgXrl7n3R98aVPyv2U3f0D/9Fk20ESLrdreD1RP578epWiA2a2W4NLP/1+AwKVZaI Boj8plxMQow+A7eZDRdnNfwHrel6tYqUUNtvGPRIjsQ4TgOUVleqwUVLJosnnT/nZfZs LqQA== X-Gm-Message-State: APt69E2RLh5XrYLHHgtVAmFDxDRAbN4PgLkBlwVrPwbBU2zOp5CPkVVx nJj331o3jFA2QjmuXHw2Van18A== X-Google-Smtp-Source: ADUXVKIXjsTN4hHhD4fQUKZVAt/ha/hDV+KCc308TbgxhqVZ7m5ZCjaKhqNwMKOXfMclkQE9WWMBWw== X-Received: by 2002:a63:7b1e:: with SMTP id w30-v6mr3302644pgc.402.1529005642134; Thu, 14 Jun 2018 12:47:22 -0700 (PDT) Received: from mka.mtv.corp.google.com ([2620:0:1000:1501:8e2d:4727:1211:622]) by smtp.gmail.com with ESMTPSA id s28-v6sm9955506pfg.89.2018.06.14.12.47.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Jun 2018 12:47:20 -0700 (PDT) From: Matthias Kaehlcke To: MyungJoo Ham Cc: Kyungmin Park , Chanwoo Choi , Arnd Bergmann , Greg Kroah-Hartman , Rob Herring , Mark Rutland , linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Brian Norris , Douglas Anderson , Enric Balletbo i Serra , "Rafael J . Wysocki" , Viresh Kumar , Lee Jones , Matthias Kaehlcke Subject: [PATCH v3 02/12] PM / devfreq: Fix handling of min/max_freq == 0 Date: Thu, 14 Jun 2018 12:47:02 -0700 Message-Id: <20180614194712.102134-3-mka@chromium.org> X-Mailer: git-send-email 2.18.0.rc1.242.g61856ae69a-goog In-Reply-To: <20180614194712.102134-1-mka@chromium.org> References: <20180614194712.102134-1-mka@chromium.org> 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 --- 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 0057ef5b0a98..6f604f8b2b81 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 */ } @@ -1122,18 +1122,27 @@ static ssize_t min_freq_store(struct device *dev, struct device_attribute *attr, { struct devfreq *df = to_devfreq(dev); unsigned long value; + unsigned long *freq_table; 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 { + freq_table = df->profile->freq_table; + /* typical order is ascending, some drivers use descending */ + 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; @@ -1157,18 +1166,27 @@ static ssize_t max_freq_store(struct device *dev, struct device_attribute *attr, { struct devfreq *df = to_devfreq(dev); unsigned long value; + unsigned long *freq_table; 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 { + freq_table = df->profile->freq_table; + /* typical order is ascending, some drivers use descending */ + 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;