From patchwork Wed Sep 12 08:28:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 146514 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp4546805ljw; Wed, 12 Sep 2018 01:29:59 -0700 (PDT) X-Google-Smtp-Source: ANB0VdbI3CXR2iDAESzEEutA41eIU6QIW4ooxqHORBPIWYxaYHD1t4dwYttLdr8aP1TSdxE8cyUW X-Received: by 2002:a62:8ad1:: with SMTP id o78-v6mr925100pfk.17.1536740999340; Wed, 12 Sep 2018 01:29:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536740999; cv=none; d=google.com; s=arc-20160816; b=vbPl5mCvK8JSZgC4N3FUdy6tq0H4J0eu6CMmMEY9EUbUcENR184nmgFZSaqEdoSNoq EIy1Tf2l8tntdCCXQRbmGSpIrc5CwZR/uvE/UlWp8u4MmCviac1RW55Euw8l8Lj5C7zf uSrqrzEQWHCQzu6wF+wxhZPFB2Y/SQ9AlMR0b8/y4dqzve27pUrV4lTXk0cmeSO+vqpf Ijf2SyaRmKEDdEZJuKnmuUFYy93UO9kK8bCsNsorvwqRGH5S3mNmiDIx4VLVSgKzSvHe JgwSZW8XhsNi5bQroKmQyANjhmPkt3BFKGOM8k2pmS/7B0o+SPcl4NuafKcoggzSrPgo lDPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=tDYkIscN1OCu/B3vv/mTFBv7y924obTrvpBhZ7BBUSs=; b=BVwvSKJosUl7KkSDr3lrMGBP5ON7OWW1KVCXbnxj0J+bG6esOsouXd3LNwscFNZVhm x2FWLN4Gjpjyh+lMCGS8Z0dFkS04TcflI4Fx1mN1dwPKgfS6s4++5uXrp6X8VV7Uc8XC WqMsOxeTEqJ+Zd0ZEj6YmdWcahiU89iR3rPl6wiVb2X6aikOd9zYnZe3D7lTLLRFLkmv GqLx/oXdIUR3KX6zgBHYhLRF5v+jLuYOh/xpRudT9Gb42gzxDKiRiW3j6tG3N8vdlfXh yq3hyVHzKXMAemK3AwhBMk2ajGe7458JALT1A0RLas11TyORnauTIftzyWBwOsMCeip2 7DqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GELEHqyp; 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=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e4-v6si394131pgk.630.2018.09.12.01.29.59; Wed, 12 Sep 2018 01:29:59 -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=@linaro.org header.s=google header.b=GELEHqyp; 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=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728029AbeILNdY (ORCPT + 32 others); Wed, 12 Sep 2018 09:33:24 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:39368 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726642AbeILNdX (ORCPT ); Wed, 12 Sep 2018 09:33:23 -0400 Received: by mail-pf1-f196.google.com with SMTP id j8-v6so649688pff.6 for ; Wed, 12 Sep 2018 01:29:56 -0700 (PDT) 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; bh=tDYkIscN1OCu/B3vv/mTFBv7y924obTrvpBhZ7BBUSs=; b=GELEHqypQ9xRec6OKHfUYHdRaXDz48QISqWD35Dr4vphPb786GJj/Zn9WqyAuNA3lL 9SdZdysUrMXkDnll5MTBtvwqwUnyZIalt7Lwv8+q7ZOPo4A5KYtSBqGJ7tFEKQqYl9zh Za3hRuOgLfc60SeQVZczL2AE0l0iROnQkkfms= 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=tDYkIscN1OCu/B3vv/mTFBv7y924obTrvpBhZ7BBUSs=; b=LUENPkOU1pOeFMu78mMZPT7ZkK+ABjYpk7BqaHzJ6wFzFdTwAlHZMZa7e+HxTp09Co x8hSiYwczIz+AxrwlpWDmKeFyyh5vL2acRZNqCLR7+BXeSxQfMhebFDjeBwnThG5d7on usvBgzX+QGFtQv1whfHUrhTUo21m4FalzHN/SeEklBOJ6H40Jwp18qE6+UYoxSfFx+Qu dusioVk5j1a0iKqUa7S236hfglJ6XdbgUdJDk3IVlmGBM/5+FaQXIQXAeedH99g88sQb BUs/Cl4MI+QSzwdgfq6SBwVP9fu9FvsrQE1O4AHZDapwKVyl2iZ5ZZmHCnuZq51DJxNr HigA== X-Gm-Message-State: APzg51Dm3HJbOQW4Es9nTyM+df5/OaOgSZFX+ZseOy+yRjguey6aQQaX JNDyNTL+KRsoCnoqjXhmtnfzQA== X-Received: by 2002:a63:cf52:: with SMTP id b18-v6mr889480pgj.194.1536740996164; Wed, 12 Sep 2018 01:29:56 -0700 (PDT) Received: from localhost ([122.171.64.45]) by smtp.gmail.com with ESMTPSA id x2-v6sm905268pfi.166.2018.09.12.01.29.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Sep 2018 01:29:55 -0700 (PDT) From: Viresh Kumar To: niklas.cassel@linaro.org, Viresh Kumar , Nishanth Menon , Stephen Boyd , "Rafael J. Wysocki" Cc: Viresh Kumar , linux-pm@vger.kernel.org, Vincent Guittot , linux-kernel@vger.kernel.org Subject: [PATCH 03/11] OPP: Pass index to _of_init_opp_table() Date: Wed, 12 Sep 2018 13:58:42 +0530 Message-Id: X-Mailer: git-send-email 2.18.0.rc1.242.g61856ae69a2c In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is a preparatory patch required for the next commit which will start using OPP table's node pointer in _of_init_opp_table(), which requires the index in order to read the OPP table's phandle. This commit adds the index argument in the call chains in order to get it delivered to _of_init_opp_table(). Signed-off-by: Viresh Kumar --- drivers/opp/core.c | 19 +++++++++++++++---- drivers/opp/of.c | 12 +++++++----- drivers/opp/opp.h | 4 ++-- include/linux/pm_opp.h | 6 ++++++ 4 files changed, 30 insertions(+), 11 deletions(-) -- 2.18.0.rc1.242.g61856ae69a2c diff --git a/drivers/opp/core.c b/drivers/opp/core.c index 9f8aa31265fe..332748adc262 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -785,7 +785,7 @@ struct opp_device *_add_opp_dev(const struct device *dev, return opp_dev; } -static struct opp_table *_allocate_opp_table(struct device *dev) +static struct opp_table *_allocate_opp_table(struct device *dev, int index) { struct opp_table *opp_table; struct opp_device *opp_dev; @@ -808,7 +808,7 @@ static struct opp_table *_allocate_opp_table(struct device *dev) return NULL; } - _of_init_opp_table(opp_table, dev); + _of_init_opp_table(opp_table, dev, index); /* Find clk for the device */ opp_table->clk = clk_get(dev, NULL); @@ -833,7 +833,7 @@ void _get_opp_table_kref(struct opp_table *opp_table) kref_get(&opp_table->kref); } -struct opp_table *dev_pm_opp_get_opp_table(struct device *dev) +static struct opp_table *_opp_get_opp_table(struct device *dev, int index) { struct opp_table *opp_table; @@ -844,15 +844,26 @@ struct opp_table *dev_pm_opp_get_opp_table(struct device *dev) if (!IS_ERR(opp_table)) goto unlock; - opp_table = _allocate_opp_table(dev); + opp_table = _allocate_opp_table(dev, index); unlock: mutex_unlock(&opp_table_lock); return opp_table; } + +struct opp_table *dev_pm_opp_get_opp_table(struct device *dev) +{ + return _opp_get_opp_table(dev, 0); +} EXPORT_SYMBOL_GPL(dev_pm_opp_get_opp_table); +struct opp_table *dev_pm_opp_get_opp_table_indexed(struct device *dev, + int index) +{ + return _opp_get_opp_table(dev, index); +} + static void _opp_table_kref_release(struct kref *kref) { struct opp_table *opp_table = container_of(kref, struct opp_table, kref); diff --git a/drivers/opp/of.c b/drivers/opp/of.c index 20988c426650..a91857d163b2 100644 --- a/drivers/opp/of.c +++ b/drivers/opp/of.c @@ -52,7 +52,8 @@ static struct opp_table *_managed_opp(const struct device_node *np) return managed_table; } -void _of_init_opp_table(struct opp_table *opp_table, struct device *dev) +void _of_init_opp_table(struct opp_table *opp_table, struct device *dev, + int index) { struct device_node *np; @@ -378,7 +379,8 @@ static int _opp_add_static_v2(struct opp_table *opp_table, struct device *dev, } /* Initializes OPP tables based on new bindings */ -static int _of_add_opp_table_v2(struct device *dev, struct device_node *opp_np) +static int _of_add_opp_table_v2(struct device *dev, struct device_node *opp_np, + int index) { struct device_node *np; struct opp_table *opp_table; @@ -393,7 +395,7 @@ static int _of_add_opp_table_v2(struct device *dev, struct device_node *opp_np) goto put_opp_table; } - opp_table = dev_pm_opp_get_opp_table(dev); + opp_table = dev_pm_opp_get_opp_table_indexed(dev, index); if (!opp_table) return -ENOMEM; @@ -526,7 +528,7 @@ int dev_pm_opp_of_add_table(struct device *dev) return _of_add_opp_table_v1(dev); } - ret = _of_add_opp_table_v2(dev, opp_np); + ret = _of_add_opp_table_v2(dev, opp_np, 0); of_node_put(opp_np); return ret; @@ -574,7 +576,7 @@ int dev_pm_opp_of_add_table_indexed(struct device *dev, int index) return -ENODEV; } - ret = _of_add_opp_table_v2(dev, opp_np); + ret = _of_add_opp_table_v2(dev, opp_np, index); of_node_put(opp_np); return ret; diff --git a/drivers/opp/opp.h b/drivers/opp/opp.h index e0866b1c1f1b..84aba19531b8 100644 --- a/drivers/opp/opp.h +++ b/drivers/opp/opp.h @@ -200,9 +200,9 @@ void _dev_pm_opp_cpumask_remove_table(const struct cpumask *cpumask, bool of); struct opp_table *_add_opp_table(struct device *dev); #ifdef CONFIG_OF -void _of_init_opp_table(struct opp_table *opp_table, struct device *dev); +void _of_init_opp_table(struct opp_table *opp_table, struct device *dev, int index); #else -static inline void _of_init_opp_table(struct opp_table *opp_table, struct device *dev) {} +static inline void _of_init_opp_table(struct opp_table *opp_table, struct device *dev, int index) {} #endif #ifdef CONFIG_DEBUG_FS diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h index 099b31960dec..5d399eeef172 100644 --- a/include/linux/pm_opp.h +++ b/include/linux/pm_opp.h @@ -79,6 +79,7 @@ struct dev_pm_set_opp_data { #if defined(CONFIG_PM_OPP) struct opp_table *dev_pm_opp_get_opp_table(struct device *dev); +struct opp_table *dev_pm_opp_get_opp_table_indexed(struct device *dev, int index); void dev_pm_opp_put_opp_table(struct opp_table *opp_table); unsigned long dev_pm_opp_get_voltage(struct dev_pm_opp *opp); @@ -136,6 +137,11 @@ static inline struct opp_table *dev_pm_opp_get_opp_table(struct device *dev) return ERR_PTR(-ENOTSUPP); } +static inline struct opp_table *dev_pm_opp_get_opp_table_indexed(struct device *dev, int index) +{ + return ERR_PTR(-ENOTSUPP); +} + static inline void dev_pm_opp_put_opp_table(struct opp_table *opp_table) {} static inline unsigned long dev_pm_opp_get_voltage(struct dev_pm_opp *opp)