From patchwork Mon Nov 26 08:10:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 151990 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp5345549ljp; Mon, 26 Nov 2018 00:10:27 -0800 (PST) X-Google-Smtp-Source: AFSGD/X4XynEdlEVQi7dY/x0BxlztBCvlv1dmqnr05wPxiJ1gf/Hg6Gz3fKUtjIbkd0D2IexNsCd X-Received: by 2002:a17:902:5a4d:: with SMTP id f13mr27375582plm.49.1543219826951; Mon, 26 Nov 2018 00:10:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543219826; cv=none; d=google.com; s=arc-20160816; b=lKMUk0KvLEA/4UMo19OwB5E+OFIvG9gotvYNe1poRfwROs46jx/hREUikm3eOhGfBl ox3phjLFlMu11IrWQrTd3RWKxCpw/uMxZuUDlxVnoeBu/RXAJsNoH3ODANewJwDDgpkT vei/hUzGgpKj5L3fEVC2cJ08OJXsJAkrkwTi72Fketc2kwkxUbN6kT4hyxR9qxe/LLw0 kn+/UNqaX/csrOcfKyIJcJREIxbkk/nd2og4JgXAvBYJTrapwg/kl9cBVV0JipBz8sFV UIHtpEqiEAWx5b0uS8A/9ZuSBygv1jkmNbn4N/RkmL4M3tt4DX0t5yiqtAVZW810eMsg LCiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=O17aol/D58byrR6YndIqp0QVKFatgqkI1jJsfGYUpvQ=; b=I4N46TUNKJo9x2X/2AFxZzsbYmciGJi/0eLjeAtk6TXUd7b5Db6SeSBBkzkCHITJYO 0qHIgMCBvE8vbNVdkqd5uTEB/xpmsyAtkD6gLm754LeIobDkp3GO6h8lv4uUHHziGrbO 0p6X2MzcEK5YEjPR8O6kkEUbSfJ0nWC9IS596VcxCcC3evdMrUVs21sSjht+E+nU9HY/ HzxLUi1iWXd1IWh6A85yoc9DYDCq3vRUFZlFeZquSrr4xk+GXivtc/YQmBA9DInUlT6W UQrg8LEoIiSHKKjoLql4cXp5mdD38uZlLqR6Zy1G7h2/UVuXvmgLlHanCcVitK8yS6eT OzqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QBCZRsM7; 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 gn22si9906040plb.19.2018.11.26.00.10.26; Mon, 26 Nov 2018 00:10:26 -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; dkim=pass header.i=@linaro.org header.s=google header.b=QBCZRsM7; 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 S1726407AbeKZTDo (ORCPT + 32 others); Mon, 26 Nov 2018 14:03:44 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:46555 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726203AbeKZTDn (ORCPT ); Mon, 26 Nov 2018 14:03:43 -0500 Received: by mail-pg1-f193.google.com with SMTP id w7so5782323pgp.13 for ; Mon, 26 Nov 2018 00:10:24 -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 :mime-version:content-transfer-encoding; bh=O17aol/D58byrR6YndIqp0QVKFatgqkI1jJsfGYUpvQ=; b=QBCZRsM7c0CDjL3a9IctQ5rWPCRNCCbAVwe7Q598+yA7zTaLJXtfjMZDulL89g6L9u twpaP3O0Xu8Ptyyos4mtiC8O9mZULhZEnTOXnZQPL16B9unMLt18nFsp2wbmKI0DorGu daYMKbV+82VJSiKwmk0vEsC3VeN5n8fVqnXGo= 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=O17aol/D58byrR6YndIqp0QVKFatgqkI1jJsfGYUpvQ=; b=QoQdpF9ADnQiwZGDM5/TE3vIdySfhhNe1wEmr50sv8cw9ljNS4UcQ10uexN6GbWmyc 9E2FyePhiG0cfDuBzjokY+/9KIolga5ItcMXpfex0vHCyenDcm6BJYHEANTr5wsQrdUM 4pqgQ9HZF3GalCDPDrB4VHKYw+q+9tUF/HJbU6fmr8Xn+BAaXrLytxekg9KI0oEyiv2y UUO459dLjxgFrV9MZmVPGoAMzSl5UOt0X7FBUvnpqFemcvGXrDio0FHnapuVHFFcelLk Nj0s9MG2wb+0H1klKeL8jqSL6hUinhQtJtUC3zCX2AqZGFrfo7ZMz0PU3/mgxZQTyZoW xrng== X-Gm-Message-State: AGRZ1gKrkEvGKpwMll8cZu+wwso7D8WzmF0088nb9pIevj7S42CGODr9 pI5lJNGrvRC1KXa7VSg3tpTz3g== X-Received: by 2002:a63:cd4c:: with SMTP id a12mr24330079pgj.252.1543219823252; Mon, 26 Nov 2018 00:10:23 -0800 (PST) Received: from localhost ([122.172.88.116]) by smtp.gmail.com with ESMTPSA id k14sm83287429pgs.52.2018.11.26.00.10.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Nov 2018 00:10:22 -0800 (PST) From: Viresh Kumar To: ulf.hansson@linaro.org, Rafael Wysocki , Viresh Kumar , Nishanth Menon , Stephen Boyd Cc: Viresh Kumar , Vincent Guittot , rnayak@codeaurora.org, niklas.cassel@linaro.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V2 2/5] OPP: Add dev_pm_opp_xlate_performance_state() helper Date: Mon, 26 Nov 2018 13:40:01 +0530 Message-Id: <8bb37fb6120221ded6abb53e69c86620aade20f6.1543219386.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.19.1.568.g152ad8e3369a In-Reply-To: References: MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Introduce a new helper dev_pm_opp_xlate_performance_state() which will be used to translate from pstate of a device to another one. Initially this will be used by genpd to find pstate of a master domain using its sub-domain's pstate. Signed-off-by: Viresh Kumar --- drivers/opp/core.c | 59 ++++++++++++++++++++++++++++++++++++++++++ include/linux/pm_opp.h | 7 +++++ 2 files changed, 66 insertions(+) -- 2.19.1.568.g152ad8e3369a diff --git a/drivers/opp/core.c b/drivers/opp/core.c index 0eaa954b3f6c..99b71f60b6d8 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -1707,6 +1707,65 @@ void dev_pm_opp_put_genpd_virt_dev(struct opp_table *opp_table, dev_err(virt_dev, "Failed to find required device entry\n"); } +/** + * dev_pm_opp_xlate_performance_state() - Find required OPP's pstate for src_table. + * @src_table: OPP table which has dst_table as one of its required OPP table. + * @dst_table: Required OPP table of the src_table. + * @pstate: Current performance state of the src_table. + * + * This Returns pstate of the OPP (present in @dst_table) pointed out by the + * "required-opps" property of the OPP (present in @src_table) which has + * performance state set to @pstate. + * + * Return: Positive performance state on success, otherwise 0 on errors. + */ +unsigned int dev_pm_opp_xlate_performance_state(struct opp_table *src_table, + struct opp_table *dst_table, + unsigned int pstate) +{ + struct dev_pm_opp *opp; + unsigned int dest_pstate = 0; + int i; + + /* + * Normally the src_table will have the "required_opps" property set to + * point to one of the OPPs in the dst_table, but in some cases the + * genpd and its master have one to one mapping of performance states + * and so none of them have the "required-opps" property set. Return the + * pstate of the src_table as it is in such cases. + */ + if (!src_table->required_opp_count) + return pstate; + + for (i = 0; i < src_table->required_opp_count; i++) { + if (src_table->required_opp_tables[i]->np == dst_table->np) + break; + } + + if (unlikely(i == src_table->required_opp_count)) { + pr_err("%s: Couldn't find matching OPP table (%p: %p)\n", + __func__, src_table, dst_table); + return 0; + } + + mutex_lock(&src_table->lock); + + list_for_each_entry(opp, &src_table->opp_list, node) { + if (opp->pstate == pstate) { + dest_pstate = opp->required_opps[i]->pstate; + goto unlock; + } + } + + pr_err("%s: Couldn't find matching OPP (%p: %p)\n", __func__, src_table, + dst_table); + +unlock: + mutex_unlock(&src_table->lock); + + return dest_pstate; +} + /** * dev_pm_opp_add() - Add an OPP table from a table definitions * @dev: device for which we do this operation diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h index 2b2c3fd985ab..5a64a81a1789 100644 --- a/include/linux/pm_opp.h +++ b/include/linux/pm_opp.h @@ -128,6 +128,7 @@ struct opp_table *dev_pm_opp_register_set_opp_helper(struct device *dev, int (*s void dev_pm_opp_unregister_set_opp_helper(struct opp_table *opp_table); struct opp_table *dev_pm_opp_set_genpd_virt_dev(struct device *dev, struct device *virt_dev, int index); void dev_pm_opp_put_genpd_virt_dev(struct opp_table *opp_table, struct device *virt_dev); +unsigned int dev_pm_opp_xlate_performance_state(struct opp_table *src_table, struct opp_table *dst_table, unsigned int pstate); int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq); int dev_pm_opp_set_sharing_cpus(struct device *cpu_dev, const struct cpumask *cpumask); int dev_pm_opp_get_sharing_cpus(struct device *cpu_dev, struct cpumask *cpumask); @@ -280,6 +281,12 @@ static inline struct opp_table *dev_pm_opp_set_genpd_virt_dev(struct device *dev } static inline void dev_pm_opp_put_genpd_virt_dev(struct opp_table *opp_table, struct device *virt_dev) {} + +static inline unsigned int dev_pm_opp_xlate_performance_state(struct opp_table *src_table, struct opp_table *dst_table, unsigned int pstate) +{ + return 0; +} + static inline int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq) { return -ENOTSUPP;