From patchwork Wed Jun 19 14:08:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 13703859 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B4F17C27C79 for ; Wed, 19 Jun 2024 14:10:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=jH7teSUneCZWfoVt/91/lHeZpMwu3/Yn++4TJjeU7NA=; b=VKqdKYK6jKlVF0ZtVPLnBwRhWV 5pohXBa9qypDoiJxCW4aqnq+g3nhaO077f8pRO5DJcbWgaspCKw9ashATLxzkYXeMvKV4DghfSzOl BmHUgt8iuVY1beXXD7NX81Ez5p+Vm4T43u58exqrwtjYphmmCnU5Gbz79Tqq9LrmBWw4eL7p5wt8o /w2ieqyJ25rYMVDoUl8UMnRcgFT7hqGVI/MmdvbzDQfYy8tF1SSHEGsNZHUpQUYK1nW96yI0xhW1U 2PWljT/yhvY+UUojC20FUmkoP+5p4JOxGw0lgXhwXSq3z8C4zNHklyxPTTjX50/hEIzFiOfe+sBJ7 f1utoCpg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sJw0W-00000001ROI-3Nxk; Wed, 19 Jun 2024 14:09:52 +0000 Received: from mail-lf1-x133.google.com ([2a00:1450:4864:20::133]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sJvzy-00000001R2r-2DJE for linux-arm-kernel@lists.infradead.org; Wed, 19 Jun 2024 14:09:23 +0000 Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-52cc14815c3so2364107e87.0 for ; Wed, 19 Jun 2024 07:09:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1718806157; x=1719410957; darn=lists.infradead.org; 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=jH7teSUneCZWfoVt/91/lHeZpMwu3/Yn++4TJjeU7NA=; b=RrDQu8uDjpuXmlENWr1qx7ODIwZrp3PwhUoQb0C4SCR/KWWNJY0D0oe1QyclfrfDw4 hFt8c3joAaZym+omIdRBfpi558oB7WsAne80aY2bfDBsyxnRghNXs2GYEJAsSxo+NKRY 2pYwaz7TZ/iQIUaoDenC0SLm6001+gHU9q7RYl9FRy9BUP+hDuSO37yvQZ0f1EqObrN+ oE3nkdBX1lxzmgPkKZXYMPAiI6n6KnN/U84C4hJCvRun3wTGg5/V3d/ncKY+ZF2F0NOL hcd/Cku01GV9mrAUzHXus86Pc7MjEim8ow9O1Gw30sTt3oYit2N86PxCNjzxlVxa3Ttz CMqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718806157; x=1719410957; 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=jH7teSUneCZWfoVt/91/lHeZpMwu3/Yn++4TJjeU7NA=; b=v35Ggvi0ZV7sJxeHstcZL5CGa5pzZNmCDDJOG/YNOI/NF9vCTnFCZAA9ibMHCUNbdI Zu4brul42tYRp/jdhpVziSKCwQYytTgAmzUUkU/WXp86gEAoSc2x/xfDCsy6uQu3PrRe 3B477k8U1djrXQLue8e7+Y8D7Sv1obRs1Gk1xReNgH4FR1FtYX2Ujnwc0KVQQgHCeKK5 mG+I5T3KebzRTRciBCAl8pzjEhtVpFODPlJPxtRJ7CsUl0eKazcbstOcTQOAbO+ie9nU PW5pGEAlK8cpMU9U0DhN+XAlqqYpA5ZKvw/vTDraMjAH7cMTlV236vqXwnFxjH8q3M9i rjRg== X-Forwarded-Encrypted: i=1; AJvYcCVdIByatOWjBxgnDLnhLWMkUE8wwu0jBHi7uRKJFcJU5hCUqJrfus+YE/Idmj5btJWJA8kuG3c6edKIqj9vZTSnU6yEpnPd+Rt20FcwJhHNplfdW8U= X-Gm-Message-State: AOJu0Yy8Cqun0IKp4yl7CT/1HzrL/+RYv3qfsAbCUnPZBHgf2jCCl697 +A1oYDzGIq9EJ1nScQsPmYylITMWZ4FEc22vV35Ne8eaB092iO85/CM2W0Nq4no= X-Google-Smtp-Source: AGHT+IGoJr5DuwJJ1A2TjVENIUslYHC6GqIXMmnq00+SVaUdczAOZsm6VolY8hrQoNfjsd/Xd4Uhig== X-Received: by 2002:a05:6512:3d0e:b0:52c:cda0:18bf with SMTP id 2adb3069b0e04-52ccda019d6mr967714e87.4.1718806156688; Wed, 19 Jun 2024 07:09:16 -0700 (PDT) Received: from uffe-tuxpro14.. (h-178-174-189-39.A498.priv.bahnhof.se. [178.174.189.39]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52ca2872241sm1787003e87.124.2024.06.19.07.09.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jun 2024 07:09:16 -0700 (PDT) From: Ulf Hansson To: Viresh Kumar , Nishanth Menon , Stephen Boyd Cc: Bjorn Andersson , Konrad Dybcio , Nikunj Kela , Prasad Sodagudi , Thierry Reding , Jonathan Hunter , Ulf Hansson , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 6/7] OPP/pmdomain: Set the required_dev for a required OPP during genpd attach Date: Wed, 19 Jun 2024 16:08:48 +0200 Message-Id: <20240619140849.368580-7-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240619140849.368580-1-ulf.hansson@linaro.org> References: <20240619140849.368580-1-ulf.hansson@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240619_070918_983461_629B55B0 X-CRM114-Status: GOOD ( 29.48 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Through dev_pm_opp_set_config() the _opp_attach_genpd() allows consumer drivers to hook up a device to its PM domains. This works for both a single and multiple PM domains. Their corresponding virtual devices that are created by genpd during attach, are later being assigned as the required_devs for the corresponding required OPPs. In principle this works fine, but there are some problems. Especially as the index for a "required-opps" may not necessarily need to match the index for the "power-domain" in DT, in which case things gets screwed up. To improve the situation, let's instead assign the required_devs during device attach in genpd, by using _opp_set_required_dev(). At this point the genpd and the genpd's OPP table are known for the device in question, which then can be used to find the correct index for the required-dev. As a part of this change, genpd also starts to assign the required_devs even for the single PM domain case, as a way to align the behaviour. Furthermore, to maintain the existing behaviour for consumers of _opp_attach_genpd(), let's adapt it to the new genpd behaviour. Signed-off-by: Ulf Hansson --- drivers/opp/core.c | 45 +-------------------------------- drivers/pmdomain/core.c | 55 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 44 deletions(-) diff --git a/drivers/opp/core.c b/drivers/opp/core.c index bc1ed1d3d60d..7e567b479c3d 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -2369,7 +2369,6 @@ static void _opp_detach_genpd(struct opp_table *opp_table) continue; dev_pm_domain_detach(opp_table->required_devs[index], false); - opp_table->required_devs[index] = NULL; } } @@ -2393,8 +2392,7 @@ static void _opp_detach_genpd(struct opp_table *opp_table) static int _opp_attach_genpd(struct opp_table *opp_table, struct device *dev, const char * const *names, struct device ***virt_devs) { - struct device *virt_dev, *gdev; - struct opp_table *genpd_table; + struct device *virt_dev; int index = 0, ret = -EINVAL; const char * const *name = names; @@ -2427,47 +2425,6 @@ static int _opp_attach_genpd(struct opp_table *opp_table, struct device *dev, goto err; } - /* - * The required_opp_tables parsing is not perfect, as the OPP - * core does the parsing solely based on the DT node pointers. - * The core sets the required_opp_tables entry to the first OPP - * table in the "opp_tables" list, that matches with the node - * pointer. - * - * If the target DT OPP table is used by multiple devices and - * they all create separate instances of 'struct opp_table' from - * it, then it is possible that the required_opp_tables entry - * may be set to the incorrect sibling device. - * - * Cross check it again and fix if required. - */ - gdev = dev_to_genpd_dev(virt_dev); - if (IS_ERR(gdev)) - return PTR_ERR(gdev); - - genpd_table = _find_opp_table(gdev); - if (!IS_ERR(genpd_table)) { - if (genpd_table != opp_table->required_opp_tables[index]) { - dev_pm_opp_put_opp_table(opp_table->required_opp_tables[index]); - opp_table->required_opp_tables[index] = genpd_table; - } else { - dev_pm_opp_put_opp_table(genpd_table); - } - } - - /* - * Add the virtual genpd device as a user of the OPP table, so - * we can call dev_pm_opp_set_opp() on it directly. - * - * This will be automatically removed when the OPP table is - * removed, don't need to handle that here. - */ - if (!_add_opp_dev(virt_dev, opp_table->required_opp_tables[index])) { - ret = -ENOMEM; - goto err; - } - - opp_table->required_devs[index] = virt_dev; index++; name++; } diff --git a/drivers/pmdomain/core.c b/drivers/pmdomain/core.c index 74ebb8a423be..a38d08862a61 100644 --- a/drivers/pmdomain/core.c +++ b/drivers/pmdomain/core.c @@ -2774,6 +2774,57 @@ static void genpd_dev_pm_sync(struct device *dev) genpd_queue_power_off_work(pd); } +static struct opp_table *genpd_find_opp_table(struct generic_pm_domain *genpd, + unsigned int depth) +{ + struct opp_table *opp_table; + struct gpd_link *link; + + if (genpd->opp_table) + return genpd->opp_table; + + list_for_each_entry(link, &genpd->child_links, child_node) { + struct generic_pm_domain *parent = link->parent; + + genpd_lock_nested(parent, depth + 1); + opp_table = genpd_find_opp_table(parent, depth + 1); + genpd_unlock(parent); + + if (opp_table) + return opp_table; + } + + return NULL; +} + +static int genpd_set_required_opp_dev(struct device *dev, + struct device *base_dev) +{ + struct generic_pm_domain *genpd = dev_to_genpd(dev); + struct opp_table *opp_table; + int ret = 0; + + if (!dev_pm_opp_of_has_required_opp(base_dev)) + return 0; + + genpd_lock(genpd); + opp_table = genpd_find_opp_table(genpd, 0); + genpd_unlock(genpd); + + if (opp_table) { + struct dev_pm_opp_config config = { + .required_dev = dev, + .required_opp_table = opp_table, + }; + + ret = devm_pm_opp_set_config(base_dev, &config); + if (ret < 0) + dev_err(dev, "failed to set opp config %d\n", ret); + } + + return ret; +} + static int genpd_set_required_opp(struct device *dev, unsigned int index) { int ret, pstate; @@ -2830,6 +2881,10 @@ static int __genpd_dev_pm_attach(struct device *dev, struct device *base_dev, dev->pm_domain->detach = genpd_dev_pm_detach; dev->pm_domain->sync = genpd_dev_pm_sync; + ret = genpd_set_required_opp_dev(dev, base_dev); + if (ret) + goto err; + ret = genpd_set_required_opp(dev, index); if (ret) goto err;