Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp3703573imm; Tue, 29 May 2018 11:59:00 -0700 (PDT) X-Google-Smtp-Source: AB8JxZodPLQ2JRrMufc3dw6BbyE1okaNy2v0tN9G86aTgAoHUyFFnMWDFpba/b0NljSHh8U/k4Cl X-Received: by 2002:aa7:8492:: with SMTP id u18-v6mr18502768pfn.225.1527620340705; Tue, 29 May 2018 11:59:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527620340; cv=none; d=google.com; s=arc-20160816; b=nvZFlrL0DIoarBCnYUzW2KhZlwObVYZiux4OBJ3+nhIR/zjVa23RS5qAZFQzm8wfyE K+i22AK2KXP+VW+tbYyrYQ/hcmcEnQPkB/cFkijbMF2OeqhoDABNHwS2seNDj0bLKJMy og9aVlmLIW76/W/b9Rap+/kupRJj1MXn757MIxTVkUpyuwYk6NkKxgCmCZLX++/+TiRg N140+tAm0ZffJ7fiO+vYOpgF1x4dym+D6n+leE8vg4DMsWwKHtHCXgUl9Fr7wTsKf1lo tkNJtCEJetBBydT0ose0ZshwZyiLM/QRTHRTqfNlyOdO2S6UMw2CdEWuCnCkwAN0/R8q BCmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-transfer-encoding:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature :arc-authentication-results; bh=QxWzeBe65C0Qz0CMrIJR0pbiRlKhlKHQaw+GJw8QPmc=; b=sCKpdxLp+DQL49UeGh3pe4Lq5/F8Vtb7Fe2AOR1BY27H+X1tLgcQH5Do5gGuhJi8/O P5K7uTk3q8C5wD9sPcRc1BkdO1SDUS2GMKBsU58nY9oCxh5ujpTjMXEd+5dLdHb3NDHv fLlrH4XD92NrZ+2n9IJcu3TVO0IpKZooMu2UO0+RkMomC+oAbi9fL8iIMkuynE2bwa6s lFp6IhSqORD24HW+EnB5Mwh7xUqZsheLc+Xyh8Ahw7TTYJ+7brt8e1VowcR76zFo2uRA MXJqah/ZfRarqeWBTXUkITzwrj7SYmlRKTE4o+AI05mTdud5qoAa39vYDOkDWbqAEG2U lDPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=jDOEezd3; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q23-v6si32429083pfd.153.2018.05.29.11.58.46; Tue, 29 May 2018 11:59:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=jDOEezd3; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966399AbeE2S6G (ORCPT + 99 others); Tue, 29 May 2018 14:58:06 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:37556 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965761AbeE2S6A (ORCPT ); Tue, 29 May 2018 14:58:00 -0400 Received: by mail-pf0-f193.google.com with SMTP id e9-v6so7721144pfi.4 for ; Tue, 29 May 2018 11:58:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to :user-agent; bh=QxWzeBe65C0Qz0CMrIJR0pbiRlKhlKHQaw+GJw8QPmc=; b=jDOEezd3HkZCjvF2x64jko53aqVBPL9mx/EVUKjej9ROme0ggkad+acV6evdBxiqYI 43TCBb0tZSu4wRGm8LlgLzYsaSxhMLhzutcx5TQvxMaq7yEjlrkzsmMuowRRrIQ+f4tB Eh4cHJKTfi2CctCW7lNawnHqJR2zk5+2mrdCQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to:user-agent; bh=QxWzeBe65C0Qz0CMrIJR0pbiRlKhlKHQaw+GJw8QPmc=; b=P72qb17uG+l9CRoUiRKosl70Okfs+eUZdpuJd6t7qgUJxBPwcRO6rB2KYuL0Abtpm1 pCxAPtY8Gd98n1Nl+6O3dAoXeLEBhEt2YaXDTP8kjKCeGZX0K1fQBDUQBryRIsUJq1Yg XAOw9OMsWRKsnHBJ+oiggG/DMWeC5zprz2QFXCsFBLUR2fx0wqQoP4RAk3Z/3eayaviK nNYG3YqYXtAVlnLSYUuTO01Tye5lr45wnVfgy3N6k/sYVFgGAxI+I92tM6/rIWzh6hua Yjw1E7ZVjYqTkxLrDWlLBCxfXFPj/du/qEDOnVozVU8q9tlBRtUGSWzCO810MAaPHUrT de9w== X-Gm-Message-State: ALKqPwc1yS0ZNdzJdnLFow8MjwmK3kHAKD8EGQb6q0rH+H5GlzdDSCmM hf4ubEMF/tsRp1GzjTXw9kewxg== X-Received: by 2002:a62:db05:: with SMTP id f5-v6mr18536473pfg.137.1527620279685; Tue, 29 May 2018 11:57:59 -0700 (PDT) Received: from localhost ([2620:0:1000:1501:8e2d:4727:1211:622]) by smtp.gmail.com with ESMTPSA id r84-v6sm60437235pfa.125.2018.05.29.11.57.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 May 2018 11:57:59 -0700 (PDT) Date: Tue, 29 May 2018 11:57:58 -0700 From: Matthias Kaehlcke To: Chanwoo Choi Cc: MyungJoo Ham , Kyungmin Park , 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 , =?utf-8?B?w5hyamFu?= Eide , John Einar Reitan Subject: Re: [PATCH 02/11] PM / devfreq: Fix handling of min/max_freq == 0 Message-ID: <20180529185758.GG168650@google.com> References: <20180525203043.249193-1-mka@chromium.org> <20180525203043.249193-3-mka@chromium.org> <5B0BA3BB.8060505@samsung.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <5B0BA3BB.8060505@samsung.com> User-Agent: Mutt/1.9.2 (2017-12-15) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, May 28, 2018 at 03:37:47PM +0900, Chanwoo Choi wrote: > Hi, > > On 2018년 05월 26일 05:30, Matthias Kaehlcke wrote: > > 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 > > --- > > drivers/devfreq/devfreq.c | 30 ++++++++++++++++++------------ > > 1 file changed, 18 insertions(+), 12 deletions(-) > > > > diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c > > index 0057ef5b0a98..67da4e7b486b 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 */ > > } > > @@ -1123,17 +1123,20 @@ 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 { > > + value = df->profile->freq_table[df->profile->max_state - 1]; > > } > > If you want to prevent that df->min_freq is zero, > you should reinitialize 'value' as following. > Because freq_table must be in ascending order. > value = df->profile->freq_table[0]; Thanks for pointing this out! The devfreq device I tested with (a Mali GPU) uses descending order for some reason, and I assumed that's the usual order. https://chromium.googlesource.com/chromiumos/third_party/kernel/+/chromeos-4.4/drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c#208 It seems the ordering doesn't have any impact beyond this patch. If the order isn't mandatory for drivers that set up their own freq_table we should probably support both cases to be safe. > > @@ -1158,17 +1161,20 @@ 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) { > > + value = df->profile->freq_table[0]; > > ditto. > value = df->profile->freq_table[df->profile->max_state - 1]; > > > + } else { > > + if (value < df->min_freq) { > > + ret = -EINVAL; > > + goto unlock; > > + } > > } > > > > df->max_freq = value; > > > > Actually, min_freq_store() and max_freq_store() are very similar. > But, this patch changed the order of conditional statement as following: > If there is no special reason, you better to keep the same format > for the readability. > > > min_freq_store() > if (value) { > ... > } else { > value = df->profile->freq_table[df->profile->max_state - 1]; > } > > > max_freq_store() > if (!value) { > value = df->profile->freq_table[0]; > } else { > ... > Agreed, better use the same format, I'll update it in the next revision.