From patchwork Wed Feb 22 11:06:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 655911 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E652FC636D6 for ; Wed, 22 Feb 2023 11:07:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231664AbjBVLHB (ORCPT ); Wed, 22 Feb 2023 06:07:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58672 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229964AbjBVLG7 (ORCPT ); Wed, 22 Feb 2023 06:06:59 -0500 Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F8C038E90 for ; Wed, 22 Feb 2023 03:06:56 -0800 (PST) Received: by mail-pj1-x102c.google.com with SMTP id g14so8448730pjb.2 for ; Wed, 22 Feb 2023 03:06:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pKF4g3sJY4F36hMtcM0eHUIlxzL76BJwo9OlrmTuaXo=; b=r1QtHTdmuiRplIZ5BlnOJSnSr9AfM12vU5yV8seTDhtwDfAwQVVrchPoLYEtimSeSO fZcOjLk2nkQ4BNkACOsmfYIXAurwqq1Wcp1/8R447NRr9t/UwAwiK4ReoOoKg8fMz61B NzblmUIez8fpvNadarTg5ogp8sv3C6SBBsUiAuHC/3V6DbSw/L42g5bneQ4b2MtrHTsv sTs7V9J11iejVjby1kcY+SPupy/b+vy3wM6W0mLZe9sgFJr2hD26X8aWk4K8YILU4Qns DluNjWyWME9jDCYpOFtKWAImOytgUD1JN11Vdpbiw72JWSd1Bj/xkYth2KyB6VcR8mrk up7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pKF4g3sJY4F36hMtcM0eHUIlxzL76BJwo9OlrmTuaXo=; b=WxxGfbvVPczDSFMqf6uErZS1BRO8/qCP0VpxOdEl4ORp8KlJNcU7j2aI5esvje94HJ 7anu+DowrXTiiiNFIMdu5uNWYKAS1SQae1my3oGLakl7DIbsouaMXk0GQjXfSkFwTDQ0 xLgRq1Ewg8npcYfIdmh8nXo91Duwev3QQiam03IhEJw7Tnt+/5X5/QavfiIAYLsAeJOL zJ+wlkVutVT9hTszxYbCAp+OPpA63pj2ZFJSs/D5hHFuceF0WdgKDeODjfhNqxRtJju4 7M3N7csJ+3fvQZLpZ9Zl65zQ53I0eTIGGpj747lh3JpTbogZ7tWn8M22ULzWQy46GEMF ArEQ== X-Gm-Message-State: AO0yUKWs2woie/5P1Xz7CS4rqxZFoEKFjyEBlKIidqaiRbG0KkTPZ4Z4 otHHIpggIofSBe0V0XMPzFimEQ== X-Google-Smtp-Source: AK7set8KiGimYVmciFfKyYspnOZlfnqBDC3S2RItxcdvLBhN4RUzQmnZsgiLF8s5kx1/dn69giz5bQ== X-Received: by 2002:a17:902:cf48:b0:19a:80c2:4396 with SMTP id e8-20020a170902cf4800b0019a80c24396mr8138522plg.68.1677064015575; Wed, 22 Feb 2023 03:06:55 -0800 (PST) Received: from localhost ([122.172.83.155]) by smtp.gmail.com with ESMTPSA id 12-20020a170902c14c00b001949f21e1d2sm4579999plj.308.2023.02.22.03.06.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Feb 2023 03:06:55 -0800 (PST) From: Viresh Kumar To: Jun Nie , Viresh Kumar , Nishanth Menon , Stephen Boyd Cc: Viresh Kumar , linux-pm@vger.kernel.org, Vincent Guittot , "Rafael J. Wysocki" , Manivannan Sadhasivam , linux-kernel@vger.kernel.org Subject: [PATCH 1/3] OPP: Handle all genpd cases together in _set_required_opps() Date: Wed, 22 Feb 2023 16:36:37 +0530 Message-Id: <8f9fba47f91ef04fa2cf0c3adba9299a23d5280a.1677063656.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.31.1.272.g89b43f80a514 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org There is no real need of keeping separate code for single genpd case, it can be made to work with a simple change. Signed-off-by: Viresh Kumar Reviewed-by: Ulf Hansson --- drivers/opp/core.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/opp/core.c b/drivers/opp/core.c index e87567dbe99f..6d7016ce8c53 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -959,7 +959,8 @@ static int _set_required_opps(struct device *dev, struct dev_pm_opp *opp, bool up) { struct opp_table **required_opp_tables = opp_table->required_opp_tables; - struct device **genpd_virt_devs = opp_table->genpd_virt_devs; + struct device **genpd_virt_devs = + opp_table->genpd_virt_devs ? opp_table->genpd_virt_devs : &dev; int i, ret = 0; if (!required_opp_tables) @@ -979,12 +980,6 @@ static int _set_required_opps(struct device *dev, return -ENOENT; } - /* Single genpd case */ - if (!genpd_virt_devs) - return _set_required_opp(dev, dev, opp, 0); - - /* Multiple genpd case */ - /* * Acquire genpd_virt_dev_lock to make sure we don't use a genpd_dev * after it is freed from another thread. From patchwork Wed Feb 22 11:06:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 656193 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2ECD6C636D6 for ; Wed, 22 Feb 2023 11:07:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231695AbjBVLHE (ORCPT ); Wed, 22 Feb 2023 06:07:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231669AbjBVLHB (ORCPT ); Wed, 22 Feb 2023 06:07:01 -0500 Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7AAD838E92 for ; Wed, 22 Feb 2023 03:06:59 -0800 (PST) Received: by mail-pl1-x633.google.com with SMTP id h14so8475160plf.10 for ; Wed, 22 Feb 2023 03:06:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VTFmQMiqtUc7pwcWMY+qhhF7WdtAyTRbIisqm76H6qE=; b=r4ALaOW2f7Akg1Mdcn3iw8u74rUnAqIkuefrRsyXjT1f3JQ1f8o9Cf+sRlMGMndhue yt94gDP2i6As0UHAEILftMnAljUNFXdm7bhl4O0LRdzjOyw3EN3aT2hhhGJi6k0PTpYM onDUTZzr/QJufxfzro5YS4CdKgNn/rou3baC6xS4Vkpj5NOU8VOjfLU8QS+jvsmAhD+V o3WCZSipVs0jl+kVlVvq955378NoTUxuE/ycQvW0JxYpCYbn+xUFZDJvqZVKRmYF5QgD 9TK8vuwABItOoVsnMuxaSzHx5HPUrLxSALbFAXdeVOl8usZ06aMaSJHtbZ2YMX+9bXO8 Z8QA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VTFmQMiqtUc7pwcWMY+qhhF7WdtAyTRbIisqm76H6qE=; b=PeOhKS9/OJA4dJWhk8spIssTfkdXAMNRon+27AxtLbRDsrHxpM4PhEjsLp2sNkioAA E4+8ipSUaYge/OC9QTq/s5uQdRsfyDKUQYLW5GE6LqjZ2ZZ5F5fqtirX9H5GVu85w4lM aimQvGNHJyEn3SH1ttvVThytsUYeT/6w8udcG4F64MqEpQjgfAuA0zOER5exQxUPF53L olFJUMNdG5GoDR2AZgO/vSPeRcG6ZyP/QZs6x2mxF1BCsOx9hWXiLpV7fIVsxhdqwDUJ h0RFm04Gt1tU8ZMCXbJt8l+SACkyAhNn/lXhV4R23o8xuVX0o49qSQy1wR6EQ4Z1GOPG N0gw== X-Gm-Message-State: AO0yUKXjtI1VqU2L06kDHo1fmwn6X3yefDVfZaVN1Wysuc1QDUgoZVZ7 A9ZZ1EyClYw9tTpwImN4nKuP4w== X-Google-Smtp-Source: AK7set8vGQfRcj16iAJunqMzpMJfxjoKAEB8ouCAx9vXeuU/NmWFp1+Rm93QxCZvsdR4kMTrGS+fJw== X-Received: by 2002:a17:902:f908:b0:19a:a2e7:64cf with SMTP id kw8-20020a170902f90800b0019aa2e764cfmr6332392plb.69.1677064018883; Wed, 22 Feb 2023 03:06:58 -0800 (PST) Received: from localhost ([122.172.83.155]) by smtp.gmail.com with ESMTPSA id y7-20020a170902d64700b0019926c7757asm4956737plh.289.2023.02.22.03.06.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Feb 2023 03:06:58 -0800 (PST) From: Viresh Kumar To: Jun Nie , Viresh Kumar , Nishanth Menon , Stephen Boyd Cc: Viresh Kumar , linux-pm@vger.kernel.org, Vincent Guittot , "Rafael J. Wysocki" , Manivannan Sadhasivam , linux-kernel@vger.kernel.org Subject: [PATCH 2/3] OPP: Move required opps configuration to specialized callback Date: Wed, 22 Feb 2023 16:36:38 +0530 Message-Id: <56b9926836652e9dbf56ca6b7628e836cddca351.1677063656.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.31.1.272.g89b43f80a514 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org The required-opps configuration is closely tied to genpd and performance states at the moment and it is not very obvious that required-opps can live without genpds. Though we don't support configuring required-opps for non-genpd cases currently. This commit aims at separating these parts, where configuring genpds would be a special case of configuring the required-opps. Add a specialized callback, set_required_opps(), to the opp table and set it to different callbacks accordingly. This shouldn't result in any functional changes for now. Signed-off-by: Viresh Kumar --- drivers/opp/core.c | 69 ++++++++++++++++++++++++++++------------------ drivers/opp/of.c | 3 ++ drivers/opp/opp.h | 4 +++ 3 files changed, 49 insertions(+), 27 deletions(-) diff --git a/drivers/opp/core.c b/drivers/opp/core.c index 6d7016ce8c53..954c94865cf5 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -935,8 +935,8 @@ static int _set_opp_bw(const struct opp_table *opp_table, return 0; } -static int _set_required_opp(struct device *dev, struct device *pd_dev, - struct dev_pm_opp *opp, int i) +static int _set_performance_state(struct device *dev, struct device *pd_dev, + struct dev_pm_opp *opp, int i) { unsigned int pstate = likely(opp) ? opp->required_opps[i]->pstate : 0; int ret; @@ -953,33 +953,20 @@ static int _set_required_opp(struct device *dev, struct device *pd_dev, return ret; } -/* This is only called for PM domain for now */ -static int _set_required_opps(struct device *dev, - struct opp_table *opp_table, - struct dev_pm_opp *opp, bool up) +static int _opp_set_required_opps_generic(struct device *dev, + struct opp_table *opp_table, struct dev_pm_opp *opp, bool scaling_down) +{ + dev_err(dev, "setting required-opps isn't supported for non-genpd devices\n"); + return -ENOENT; +} + +static int _opp_set_required_opps_genpd(struct device *dev, + struct opp_table *opp_table, struct dev_pm_opp *opp, bool scaling_down) { - struct opp_table **required_opp_tables = opp_table->required_opp_tables; struct device **genpd_virt_devs = opp_table->genpd_virt_devs ? opp_table->genpd_virt_devs : &dev; int i, ret = 0; - if (!required_opp_tables) - return 0; - - /* required-opps not fully initialized yet */ - if (lazy_linking_pending(opp_table)) - return -EBUSY; - - /* - * We only support genpd's OPPs in the "required-opps" for now, as we - * don't know much about other use cases. Error out if the required OPP - * doesn't belong to a genpd. - */ - if (unlikely(!required_opp_tables[0]->is_genpd)) { - dev_err(dev, "required-opps don't belong to a genpd\n"); - return -ENOENT; - } - /* * Acquire genpd_virt_dev_lock to make sure we don't use a genpd_dev * after it is freed from another thread. @@ -987,15 +974,15 @@ static int _set_required_opps(struct device *dev, mutex_lock(&opp_table->genpd_virt_dev_lock); /* Scaling up? Set required OPPs in normal order, else reverse */ - if (up) { + if (!scaling_down) { for (i = 0; i < opp_table->required_opp_count; i++) { - ret = _set_required_opp(dev, genpd_virt_devs[i], opp, i); + ret = _set_performance_state(dev, genpd_virt_devs[i], opp, i); if (ret) break; } } else { for (i = opp_table->required_opp_count - 1; i >= 0; i--) { - ret = _set_required_opp(dev, genpd_virt_devs[i], opp, i); + ret = _set_performance_state(dev, genpd_virt_devs[i], opp, i); if (ret) break; } @@ -1006,6 +993,34 @@ static int _set_required_opps(struct device *dev, return ret; } +/* This is only called for PM domain for now */ +static int _set_required_opps(struct device *dev, struct opp_table *opp_table, + struct dev_pm_opp *opp, bool up) +{ + /* required-opps not fully initialized yet */ + if (lazy_linking_pending(opp_table)) + return -EBUSY; + + if (opp_table->set_required_opps) + return opp_table->set_required_opps(dev, opp_table, opp, up); + + return 0; +} + +/* Update set_required_opps handler */ +void _update_set_required_opps(struct opp_table *opp_table) +{ + /* Already set */ + if (opp_table->set_required_opps) + return; + + /* All required OPPs will belong to genpd or none */ + if (opp_table->required_opp_tables[0]->is_genpd) + opp_table->set_required_opps = _opp_set_required_opps_genpd; + else + opp_table->set_required_opps = _opp_set_required_opps_generic; +} + static void _find_current_opp(struct device *dev, struct opp_table *opp_table) { struct dev_pm_opp *opp = ERR_PTR(-ENODEV); diff --git a/drivers/opp/of.c b/drivers/opp/of.c index e55c6095adf0..93da3c797afc 100644 --- a/drivers/opp/of.c +++ b/drivers/opp/of.c @@ -196,6 +196,8 @@ static void _opp_table_alloc_required_tables(struct opp_table *opp_table, /* Let's do the linking later on */ if (lazy) list_add(&opp_table->lazy, &lazy_opp_tables); + else + _update_set_required_opps(opp_table); goto put_np; @@ -411,6 +413,7 @@ static void lazy_link_required_opp_table(struct opp_table *new_table) /* All required opp-tables found, remove from lazy list */ if (!lazy) { + _update_set_required_opps(opp_table); list_del_init(&opp_table->lazy); list_for_each_entry(opp, &opp_table->opp_list, node) diff --git a/drivers/opp/opp.h b/drivers/opp/opp.h index 3a6e077df386..2a057c42ddf4 100644 --- a/drivers/opp/opp.h +++ b/drivers/opp/opp.h @@ -184,6 +184,7 @@ enum opp_table_access { * @enabled: Set to true if the device's resources are enabled/configured. * @genpd_performance_state: Device's power domain support performance state. * @is_genpd: Marks if the OPP table belongs to a genpd. + * @set_required_opps: Helper responsible to set required OPPs. * @dentry: debugfs dentry pointer of the real device directory (not links). * @dentry_name: Name of the real dentry. * @@ -234,6 +235,8 @@ struct opp_table { bool enabled; bool genpd_performance_state; bool is_genpd; + int (*set_required_opps)(struct device *dev, + struct opp_table *opp_table, struct dev_pm_opp *opp, bool scaling_down); #ifdef CONFIG_DEBUG_FS struct dentry *dentry; @@ -257,6 +260,7 @@ void _dev_pm_opp_cpumask_remove_table(const struct cpumask *cpumask, int last_cp struct opp_table *_add_opp_table_indexed(struct device *dev, int index, bool getclk); void _put_opp_list_kref(struct opp_table *opp_table); void _required_opps_available(struct dev_pm_opp *opp, int count); +void _update_set_required_opps(struct opp_table *opp_table); static inline bool lazy_linking_pending(struct opp_table *opp_table) { From patchwork Wed Feb 22 11:06:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 655910 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ED775C636D6 for ; Wed, 22 Feb 2023 11:07:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231769AbjBVLHN (ORCPT ); Wed, 22 Feb 2023 06:07:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59172 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231175AbjBVLHK (ORCPT ); Wed, 22 Feb 2023 06:07:10 -0500 Received: from mail-pg1-x534.google.com (mail-pg1-x534.google.com [IPv6:2607:f8b0:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E92CD392B8 for ; Wed, 22 Feb 2023 03:07:03 -0800 (PST) Received: by mail-pg1-x534.google.com with SMTP id c32so4088675pgc.7 for ; Wed, 22 Feb 2023 03:07:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pDg7lq2x44X37ra1GNdaDrKzjiETRuIzGhmCMqpU5cE=; b=r1B1OjeRgYE2hqrawLKj4xpLJVqD/NOJn2YO5tpvGrJoVa63RKypdjpj7HIRczRaRq 4EJSObe8KfRHFxJGyQ/5jOv5SajH0HE7OCEeJuBmMwMUwQjgw96J13XWoBgSvhs68U4u oMFV2k0JCMxS0aFax7sI1VqIq1Blgx2Z9M9xJAR3b5/N1z699TcZHAcRIYFDq5vzfm4E oMRdVlhqbsVRnpS7qVtEJuDP0ffT/nlbbiryV/2HEPVWlknxa0uNTpfuQ2rDBjfyUdt3 wEgbEl7QURSywxkwf3cxQGTzx1qsPwfjyqxd5P+yeUUHcI1fZJ6eyAiJhDxzat3cRYM6 yz7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pDg7lq2x44X37ra1GNdaDrKzjiETRuIzGhmCMqpU5cE=; b=A9X1OsOhc2tOyucURT5iYDNpnr9tobpm4LvE39RzELFs5M7MEEk7l2E8/7xT8noFAi p72HH5xecXcgM0KLj34WY/V6Rzwv615zPsfVb8um0XmpKh+zY+11UWH23Aenr4ZIqonf gp7TX86AvG+IZkE+W8cpQHbQcNW3TZlRBWAsuLtfkL26/axZI6A/07t31mtW6VbLu/J6 A3yLa1p/rLPw0EyrrPt8hjVqmKBTlv7XEqFw3oN25VTH2OwVddW0yZ7ElQOkBv71HSJ0 pHpUJk/8Jlg+XmOIi3eSFjTxIiqA0XbOijlF7GMEUCvNIPQA7kUv9TuqV3T/UbJlKhFW Uh8w== X-Gm-Message-State: AO0yUKVXvz0pS7b+efpBSMfNvLTmT7g2Z17zR4EaodUfvYwwWR2z5fHT HUm5CwqUvwUiqFs2cp9tTF40GA== X-Google-Smtp-Source: AK7set9fKC+RycmDf0F/GqylOk93+YTe3GQqwm+VQ6ERcOpZORV12Lo/ieqtt/fuMQqEOwm55GXHRw== X-Received: by 2002:a62:52d5:0:b0:5a8:ad9d:83f with SMTP id g204-20020a6252d5000000b005a8ad9d083fmr6289573pfb.24.1677064023416; Wed, 22 Feb 2023 03:07:03 -0800 (PST) Received: from localhost ([122.172.83.155]) by smtp.gmail.com with ESMTPSA id f15-20020aa78b0f000000b005ac419804d3sm4822377pfd.186.2023.02.22.03.07.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Feb 2023 03:07:02 -0800 (PST) From: Viresh Kumar To: Jun Nie , Viresh Kumar , Nishanth Menon , Stephen Boyd , "Rafael J. Wysocki" Cc: Viresh Kumar , linux-pm@vger.kernel.org, Vincent Guittot , Manivannan Sadhasivam , linux-kernel@vger.kernel.org Subject: [PATCH 3/3] OPP: Allow platforms to add a set_required_opps() callback Date: Wed, 22 Feb 2023 16:36:39 +0530 Message-Id: X-Mailer: git-send-email 2.31.1.272.g89b43f80a514 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org We currently configure required-opps only for genpds, as we aren't really sure what's required of the other use cases. This patch allows platforms to add their own set_required_opps() helper. Signed-off-by: Viresh Kumar --- Jun, I think this can replace the cpufreq notification from the devfreq driver (get_target_freq_with_cpufreq()), which is used currently only by mtk-cci-devfreq.c. Instead of the notification, the aggregation of the requests for the devfreq device can be done within this callback. What do you say ? --- drivers/opp/core.c | 35 +++++++++++++++++++++++++++++++++++ drivers/opp/opp.h | 4 ++-- include/linux/pm_opp.h | 5 +++++ 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/drivers/opp/core.c b/drivers/opp/core.c index 954c94865cf5..22985ad7af79 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -2421,8 +2421,35 @@ static void _opp_detach_genpd(struct opp_table *opp_table) mutex_unlock(&opp_table->genpd_virt_dev_lock); } +/** + * _opp_set_required_opps_helper() - Register custom set required opps helper. + * @dev: Device for which the helper is getting registered. + * @set_required_opps: Custom set required opps helper. + * + * This must be called before any OPPs are initialized for the device. + */ +static void _opp_set_required_opps_helper(struct opp_table *opp_table, + set_required_opps_t set_required_opps) +{ + opp_table->set_required_opps = set_required_opps; +} + +/** + * _opp_put_required_opps_helper() - Releases resources blocked for + * required opps helper. + * @opp_table: OPP table returned from _opp_set_required_opps_helper(). + * + * Release resources blocked for platform specific required opps helper. + */ +static void _opp_put_required_opps_helper(struct opp_table *opp_table) +{ + opp_table->set_required_opps = NULL; +} + static void _opp_clear_config(struct opp_config_data *data) { + if (data->flags & OPP_CONFIG_REQUIRED_OPPS) + _opp_put_required_opps_helper(data->opp_table); if (data->flags & OPP_CONFIG_GENPD) _opp_detach_genpd(data->opp_table); if (data->flags & OPP_CONFIG_REGULATOR) @@ -2546,6 +2573,14 @@ int dev_pm_opp_set_config(struct device *dev, struct dev_pm_opp_config *config) data->flags |= OPP_CONFIG_GENPD; } + /* Required opps helper */ + if (config->set_required_opps) { + _opp_set_required_opps_helper(opp_table, + config->set_required_opps); + + data->flags |= OPP_CONFIG_REQUIRED_OPPS; + } + ret = xa_alloc(&opp_configs, &id, data, XA_LIMIT(1, INT_MAX), GFP_KERNEL); if (ret) diff --git a/drivers/opp/opp.h b/drivers/opp/opp.h index 2a057c42ddf4..54cfeb894f5d 100644 --- a/drivers/opp/opp.h +++ b/drivers/opp/opp.h @@ -35,6 +35,7 @@ extern struct list_head opp_tables, lazy_opp_tables; #define OPP_CONFIG_PROP_NAME BIT(3) #define OPP_CONFIG_SUPPORTED_HW BIT(4) #define OPP_CONFIG_GENPD BIT(5) +#define OPP_CONFIG_REQUIRED_OPPS BIT(6) /** * struct opp_config_data - data for set config operations @@ -235,8 +236,7 @@ struct opp_table { bool enabled; bool genpd_performance_state; bool is_genpd; - int (*set_required_opps)(struct device *dev, - struct opp_table *opp_table, struct dev_pm_opp *opp, bool scaling_down); + set_required_opps_t set_required_opps; #ifdef CONFIG_DEBUG_FS struct dentry *dentry; diff --git a/include/linux/pm_opp.h b/include/linux/pm_opp.h index dc1fb5890792..5a8c0cc50c96 100644 --- a/include/linux/pm_opp.h +++ b/include/linux/pm_opp.h @@ -64,6 +64,9 @@ typedef int (*config_regulators_t)(struct device *dev, typedef int (*config_clks_t)(struct device *dev, struct opp_table *opp_table, struct dev_pm_opp *opp, void *data, bool scaling_down); +typedef int (*set_required_opps_t)(struct device *dev, struct opp_table *opp_table, + struct dev_pm_opp *opp, bool scaling_down); + /** * struct dev_pm_opp_config - Device OPP configuration values * @clk_names: Clk names, NULL terminated array. @@ -76,6 +79,7 @@ typedef int (*config_clks_t)(struct device *dev, struct opp_table *opp_table, * @genpd_names: Null terminated array of pointers containing names of genpd to * attach. * @virt_devs: Pointer to return the array of virtual devices. + * @set_required_opps: Custom set required opps helper. * * This structure contains platform specific OPP configurations for the device. */ @@ -90,6 +94,7 @@ struct dev_pm_opp_config { const char * const *regulator_names; const char * const *genpd_names; struct device ***virt_devs; + set_required_opps_t set_required_opps; }; #if defined(CONFIG_PM_OPP)