From patchwork Tue Feb 9 05:00:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 61493 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp1831172lbl; Mon, 8 Feb 2016 21:02:21 -0800 (PST) X-Received: by 10.67.14.136 with SMTP id fg8mr47796717pad.105.1454994138282; Mon, 08 Feb 2016 21:02:18 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 10si49909379pfk.172.2016.02.08.21.02.17; Mon, 08 Feb 2016 21:02:18 -0800 (PST) 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; 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; dkim=pass header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753402AbcBIFCO (ORCPT + 30 others); Tue, 9 Feb 2016 00:02:14 -0500 Received: from mail-pa0-f41.google.com ([209.85.220.41]:36605 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752761AbcBIFBg (ORCPT ); Tue, 9 Feb 2016 00:01:36 -0500 Received: by mail-pa0-f41.google.com with SMTP id yy13so85143985pab.3 for ; Mon, 08 Feb 2016 21:01:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=Npvr31pRQi0JAhcqfsbr+GM0cSnFp1IcPvp2r3jIQtc=; b=TFpKVYWVgzVPP1GiEh2QaM3XKZ6JKatBXfIuoYpbPkLkIkCEMYEZG6ohvyzkcChw4C aLMK/VB9AXlLD6m5d26mB42prYeDmaiQcYnoftXt0Bs8TmkgqiF0U4ZoJDy7D2Qzb6d0 zeoyMQqVZ7AGkZEMZ3+x1sSambkWLPYqarBCw= 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:in-reply-to:references; bh=Npvr31pRQi0JAhcqfsbr+GM0cSnFp1IcPvp2r3jIQtc=; b=MlTpC9D1jMDvL5lqRv16QjHXdKULgVaOTHu2dZ9yPlegmsKU8GPM/ZDh7YRHkI6GM8 FGrS1hJmrVpkMsumjiXmx6NLq4wD7HIIqZJI5SGArKbICdCrviSBLD7/YQRf5Eq+4ML6 3n8Zi6hYUz4xYMyupLd+NKZWD6A8FSRV0ScbT2hztTQVgW8f6t15hSp/Wc2BIV+uiQR5 /C1wwq73v3szP83jDrB6eBXGCVHwUKwx4KkAxQsxDDDfVKTP+1or6BScYXbW4dbjOQ0/ nQIxtuVch6QdUIhpMdlHsRraw25pJW/mQbqEwv96FkgFklD15LHhOFueOcp+yL0bSB6O 4KEg== X-Gm-Message-State: AG10YOTIwnPVjdXn1TDmw1Q3vjEmIeZINzCV2FXnOmWglQxIxNgmkVtsjtKsqVV/9QOyaR9g X-Received: by 10.66.139.234 with SMTP id rb10mr47139424pab.82.1454994096047; Mon, 08 Feb 2016 21:01:36 -0800 (PST) Received: from localhost ([122.172.22.246]) by smtp.gmail.com with ESMTPSA id e1sm47031526pas.1.2016.02.08.21.01.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Feb 2016 21:01:35 -0800 (PST) From: Viresh Kumar To: Rafael Wysocki Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org, Stephen Boyd , nm@ti.com, Viresh Kumar , Greg Kroah-Hartman , Len Brown , linux-kernel@vger.kernel.org (open list), Pavel Machek , Viresh Kumar Subject: [PATCH V3 05/16] PM / OPP: Parse clock-latency and voltage-tolerance for v1 bindings Date: Tue, 9 Feb 2016 10:30:37 +0530 Message-Id: <953ea13dc8e1249cfe7e26ae122352798a5cab10.1454992186.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.7.1.370.gb2aa7f8 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org V2 bindings have better support for clock-latency and voltage-tolerance and doesn't need special care. To use callbacks, like dev_pm_opp_get_max_{transition|volt}_latency(), irrespective of the bindings, the core needs to know clock-latency/voltage-tolerance for the earlier bindings. This patch reads clock-latency/voltage-tolerance from the device node, irrespective of the bindings (to keep it simple) and use them only for V1 bindings. Signed-off-by: Viresh Kumar Reviewed-by: Stephen Boyd --- drivers/base/power/opp/core.c | 20 ++++++++++++++++++++ drivers/base/power/opp/opp.h | 6 ++++++ 2 files changed, 26 insertions(+) -- 2.7.1.370.gb2aa7f8 diff --git a/drivers/base/power/opp/core.c b/drivers/base/power/opp/core.c index b0f5c72f0fc3..4fafa733a1c7 100644 --- a/drivers/base/power/opp/core.c +++ b/drivers/base/power/opp/core.c @@ -582,6 +582,7 @@ static struct device_opp *_add_device_opp(struct device *dev) { struct device_opp *dev_opp; struct device_list_opp *list_dev; + struct device_node *np; /* Check for existing list for 'dev' first */ dev_opp = _find_device_opp(dev); @@ -604,6 +605,21 @@ static struct device_opp *_add_device_opp(struct device *dev) return NULL; } + /* + * Only required for backward compatibility with v1 bindings, but isn't + * harmful for other cases. And so we do it unconditionally. + */ + np = of_node_get(dev->of_node); + if (np) { + u32 val; + + if (!of_property_read_u32(np, "clock-latency", &val)) + dev_opp->clock_latency_ns_max = val; + of_property_read_u32(np, "voltage-tolerance", + &dev_opp->voltage_tolerance_v1); + of_node_put(np); + } + srcu_init_notifier_head(&dev_opp->srcu_head); INIT_LIST_HEAD(&dev_opp->opp_list); @@ -861,6 +877,7 @@ static int _opp_add_v1(struct device *dev, unsigned long freq, long u_volt, { struct device_opp *dev_opp; struct dev_pm_opp *new_opp; + unsigned long tol; int ret; /* Hold our list modification lock here */ @@ -874,7 +891,10 @@ static int _opp_add_v1(struct device *dev, unsigned long freq, long u_volt, /* populate the opp table */ new_opp->rate = freq; + tol = u_volt * dev_opp->voltage_tolerance_v1 / 100; new_opp->u_volt = u_volt; + new_opp->u_volt_min = u_volt - tol; + new_opp->u_volt_max = u_volt + tol; new_opp->available = true; new_opp->dynamic = dynamic; diff --git a/drivers/base/power/opp/opp.h b/drivers/base/power/opp/opp.h index 416293b7da23..fe44beb404ba 100644 --- a/drivers/base/power/opp/opp.h +++ b/drivers/base/power/opp/opp.h @@ -138,6 +138,8 @@ struct device_list_opp { * @dentry: debugfs dentry pointer of the real device directory (not links). * @dentry_name: Name of the real dentry. * + * @voltage_tolerance_v1: In percentage, for v1 bindings only. + * * This is an internal data structure maintaining the link to opps attached to * a device. This structure is not meant to be shared to users as it is * meant for book keeping and private to OPP library. @@ -156,6 +158,10 @@ struct device_opp { struct device_node *np; unsigned long clock_latency_ns_max; + + /* For backward compatibility with v1 bindings */ + unsigned int voltage_tolerance_v1; + bool shared_opp; struct dev_pm_opp *suspend_opp;