Message ID | 20240105160103.183092-4-ulf.hansson@linaro.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel+bounces-18034-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp6311448dyb; Fri, 5 Jan 2024 08:03:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IH7RtsBuPFhKw8KPIX450HSC/PI4Brr5LXoO1lR3pSDaEOTjOsI+p8zqin9NMuCc9Hj2ZTD X-Received: by 2002:a17:903:1105:b0:1d0:6ffe:1e7f with SMTP id n5-20020a170903110500b001d06ffe1e7fmr2501797plh.98.1704470625424; Fri, 05 Jan 2024 08:03:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704470625; cv=none; d=google.com; s=arc-20160816; b=CsJ8xiNesFd1hfId89Vk+KzdEifjvuIBNeW9I/SRPwfRuL3rowv2kgO/ziqbYRkUmV zG3mgpjjdPBfGNdJx9/r9i0TAF95kdPc/yse8hs+K56fDPVlAJ8vbwcjuoF09QMK8Xg6 MIlOSTOcSdzqCeO6DRccD13+25dIYnk4CA78lBWHQz04oqSpQEHW6TufVHd3yxB1Qkl4 d/dtZLAw16LHEJvZlvLuatcR93GXLNhJB+pXclJ5rgKPpBOLsGuy3OyRSow4A9h7ZxaA u1vsya+P/fntpqrKZzRF3PY1h5hw9lxRYonAHsxJUFoFj8Q+hHDXFqowqO+GUF0PcVr0 Oc0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=+xTV3KNGUOJDAGwGlyDoyXQPDYV81EgjVZP/tKxx0pk=; fh=y8KIZwWXGEf3lnFMq+9Fmb/XzxcrxQpx8g+wQGoWW9Y=; b=T+ks8aczFg9GtlytnzIWgI7Fv+47B0xbgJ9ZjHOJTeRixxR5+B2UhzVS37CcX6kELZ ogCNIsSu//FKTPcDLzK2TA8ewq8NS+QVsAfS7i9rATpbwMn31On9z3oOwmqGWiGbsXN5 blOmejDN3t/muoDVMhXTEDKqaSe9SQSvu9wHlGNJcYbbyy9tkEiqTN4jYEr34OOaJLWR kY8ioPKTRkq5gXvH5kDaNj8talaiVpeSpM5M008Jbkng5O6hc5B/Eb8fWqUIxfYEvAcn Rq3ISZj3SjgD8cf9kGajy52n8lzbtuMu84fKhZbSmEqs4FuTacvYldRsnt9D1EcgMXKN 6N0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YDmBF7lF; spf=pass (google.com: domain of linux-kernel+bounces-18034-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-18034-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id t26-20020a056a00139a00b006d9adec6d0asi1471733pfg.272.2024.01.05.08.03.45 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jan 2024 08:03:45 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-18034-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YDmBF7lF; spf=pass (google.com: domain of linux-kernel+bounces-18034-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-18034-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 2D42E28236E for <ouuuleilei@gmail.com>; Fri, 5 Jan 2024 16:03:45 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D1C34358BD; Fri, 5 Jan 2024 16:01:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="YDmBF7lF" X-Original-To: linux-kernel@vger.kernel.org Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 962E43529A for <linux-kernel@vger.kernel.org>; Fri, 5 Jan 2024 16:01:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-lf1-f47.google.com with SMTP id 2adb3069b0e04-50ea9daac4cso1963304e87.3 for <linux-kernel@vger.kernel.org>; Fri, 05 Jan 2024 08:01:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1704470478; x=1705075278; darn=vger.kernel.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=+xTV3KNGUOJDAGwGlyDoyXQPDYV81EgjVZP/tKxx0pk=; b=YDmBF7lFZiuX1dCRdWZpabfgxPbsOV6Stw36oosXPP+RmFjCmIpBv8udpLWBlxt+Zn Qv73R0O/CWt5IJagtninpik/ErVDKFFg9zRUzO6Ba8ZVbJG5fmrbKMdiDe9eaqzqAAl9 9cPhlil85lEf8SOlHfz+XWk0lj7Q4wlsbL2ga13bAflBALtbmxcuqlnjJKnLgHm88tl3 PcRdke8Xc4jZ/LP0qCGPku9ZabkL4qcsq1e8MJleEg6aRh+ydbOF/31i3rxSDqI+rJfO TA1fS436KkUCV3zU2P92PnyxygjzqSJYwULhWVFSLe307Az2DpfYUjQk5a9s2/BsAdg6 SUHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704470478; x=1705075278; 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=+xTV3KNGUOJDAGwGlyDoyXQPDYV81EgjVZP/tKxx0pk=; b=QHFPA+uQMxfx2I6V/a12M7t57lvc3fFMc/EBTE3RpD6W/RUe2ghTjrP8rHVh40sjae nG9EUDPukPgIZbNxCY4P8WaTIwqIPNe8jm27zsmpfXJji2Yb+z55sIJbKGyP/XCmuTSq 4clXtJxnmZgKNUowpgqdIGe0ZK0Q9f0TO0kn8ltNnl6xkTEVTLHOI2ZOHHSMhPxvKBQZ SD+h1u3+kVv+VOoQn8qkvR/8hGeQ9F6mDjaG6xF+T98ZvnZgmO5PeZ4d3wdGtUK0e7GZ G+ZDnacHi3slNwPX59wY8Tlfp6Te/3FMLhLWOHhnPDu4JZmGyz+ovZWcrQ0z9sQlFAvj Zn3Q== X-Gm-Message-State: AOJu0YwcNSnaMqNrAQdfNj869QCN3KK7sDBp4Q5Xg8QPJpYmXUfmXX5u 8p0xfJ5MaOpBTfpyNYcqq8efFw3OKn713Q== X-Received: by 2002:a05:6512:532:b0:50e:6e9f:bc89 with SMTP id o18-20020a056512053200b0050e6e9fbc89mr1038688lfc.104.1704470477717; Fri, 05 Jan 2024 08:01:17 -0800 (PST) Received: from uffe-tuxpro14.. (h-178-174-189-39.A498.priv.bahnhof.se. [178.174.189.39]) by smtp.gmail.com with ESMTPSA id n5-20020a056512310500b0050e76978861sm262094lfb.277.2024.01.05.08.01.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jan 2024 08:01:15 -0800 (PST) From: Ulf Hansson <ulf.hansson@linaro.org> To: "Rafael J . Wysocki" <rafael@kernel.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Viresh Kumar <viresh.kumar@linaro.org>, linux-pm@vger.kernel.org Cc: Ulf Hansson <ulf.hansson@linaro.org>, Sudeep Holla <sudeep.holla@arm.com>, Kevin Hilman <khilman@kernel.org>, Konrad Dybcio <konrad.dybcio@linaro.org>, Bjorn Andersson <andersson@kernel.org>, Nikunj Kela <nkela@quicinc.com>, Prasad Sodagudi <psodagud@quicinc.com>, Stephan Gerhold <stephan@gerhold.net>, Ben Horgan <Ben.Horgan@arm.com>, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-remoteproc@vger.kernel.org, linux-media@vger.kernel.org, Mathieu Poirier <mathieu.poirier@linaro.org>, Shawn Guo <shawnguo@kernel.org>, Sascha Hauer <s.hauer@pengutronix.de>, Iuliana Prodan <iuliana.prodan@nxp.com>, Daniel Baluta <daniel.baluta@nxp.com> Subject: [PATCH v2 3/5] remoteproc: imx_rproc: Convert to dev_pm_domain_attach|detach_list() Date: Fri, 5 Jan 2024 17:01:01 +0100 Message-Id: <20240105160103.183092-4-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240105160103.183092-1-ulf.hansson@linaro.org> References: <20240105160103.183092-1-ulf.hansson@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787266990434759529 X-GMAIL-MSGID: 1787266990434759529 |
Series |
PM: domains: Add helpers for multi PM domains to avoid open-coding
|
|
Commit Message
Ulf Hansson
Jan. 5, 2024, 4:01 p.m. UTC
Let's avoid the boilerplate code to manage the multiple PM domain case, by
converting into using dev_pm_domain_attach|detach_list().
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Bjorn Andersson <andersson@kernel.org>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Iuliana Prodan <iuliana.prodan@nxp.com>
Cc: Daniel Baluta <daniel.baluta@nxp.com>
Cc: <linux-remoteproc@vger.kernel.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---
Changes in v2:
- None.
Iuliana/Daniel I am ccing you to request help with test/review of this change.
Note that, you will need patch 1/5 in the series too, to be able to test this.
Kind regards
Ulf Hansson
---
drivers/remoteproc/imx_rproc.c | 73 +++++-----------------------------
1 file changed, 9 insertions(+), 64 deletions(-)
Comments
On 1/5/2024 6:01 PM, Ulf Hansson wrote: > Let's avoid the boilerplate code to manage the multiple PM domain case, by > converting into using dev_pm_domain_attach|detach_list(). > > Cc: Mathieu Poirier <mathieu.poirier@linaro.org> > Cc: Bjorn Andersson <andersson@kernel.org> > Cc: Shawn Guo <shawnguo@kernel.org> > Cc: Sascha Hauer <s.hauer@pengutronix.de> > Cc: Iuliana Prodan <iuliana.prodan@nxp.com> > Cc: Daniel Baluta <daniel.baluta@nxp.com> > Cc: <linux-remoteproc@vger.kernel.org> > Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> > --- > > Changes in v2: > - None. > > Iuliana/Daniel I am ccing you to request help with test/review of this change. > Note that, you will need patch 1/5 in the series too, to be able to test this. > > Kind regards > Ulf Hansson Tested-by: Iuliana Prodan <iuliana.prodan@nxp.com> Reviewed-by: Iuliana Prodan <iuliana.prodan@nxp.com> Iulia > --- > drivers/remoteproc/imx_rproc.c | 73 +++++----------------------------- > 1 file changed, 9 insertions(+), 64 deletions(-) > > diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c > index 8bb293b9f327..3161f14442bc 100644 > --- a/drivers/remoteproc/imx_rproc.c > +++ b/drivers/remoteproc/imx_rproc.c > @@ -92,7 +92,6 @@ struct imx_rproc_mem { > > static int imx_rproc_xtr_mbox_init(struct rproc *rproc); > static void imx_rproc_free_mbox(struct rproc *rproc); > -static int imx_rproc_detach_pd(struct rproc *rproc); > > struct imx_rproc { > struct device *dev; > @@ -113,10 +112,8 @@ struct imx_rproc { > u32 rproc_pt; /* partition id */ > u32 rsrc_id; /* resource id */ > u32 entry; /* cpu start address */ > - int num_pd; > u32 core_index; > - struct device **pd_dev; > - struct device_link **pd_dev_link; > + struct dev_pm_domain_list *pd_list; > }; > > static const struct imx_rproc_att imx_rproc_att_imx93[] = { > @@ -853,7 +850,7 @@ static void imx_rproc_put_scu(struct rproc *rproc) > return; > > if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id)) { > - imx_rproc_detach_pd(rproc); > + dev_pm_domain_detach_list(priv->pd_list); > return; > } > > @@ -880,72 +877,20 @@ static int imx_rproc_partition_notify(struct notifier_block *nb, > static int imx_rproc_attach_pd(struct imx_rproc *priv) > { > struct device *dev = priv->dev; > - int ret, i; > - > - /* > - * If there is only one power-domain entry, the platform driver framework > - * will handle it, no need handle it in this driver. > - */ > - priv->num_pd = of_count_phandle_with_args(dev->of_node, "power-domains", > - "#power-domain-cells"); > - if (priv->num_pd <= 1) > - return 0; > - > - priv->pd_dev = devm_kmalloc_array(dev, priv->num_pd, sizeof(*priv->pd_dev), GFP_KERNEL); > - if (!priv->pd_dev) > - return -ENOMEM; > - > - priv->pd_dev_link = devm_kmalloc_array(dev, priv->num_pd, sizeof(*priv->pd_dev_link), > - GFP_KERNEL); > - > - if (!priv->pd_dev_link) > - return -ENOMEM; > - > - for (i = 0; i < priv->num_pd; i++) { > - priv->pd_dev[i] = dev_pm_domain_attach_by_id(dev, i); > - if (IS_ERR(priv->pd_dev[i])) { > - ret = PTR_ERR(priv->pd_dev[i]); > - goto detach_pd; > - } > - > - priv->pd_dev_link[i] = device_link_add(dev, priv->pd_dev[i], DL_FLAG_STATELESS | > - DL_FLAG_PM_RUNTIME | DL_FLAG_RPM_ACTIVE); > - if (!priv->pd_dev_link[i]) { > - dev_pm_domain_detach(priv->pd_dev[i], false); > - ret = -EINVAL; > - goto detach_pd; > - } > - } > - > - return 0; > - > -detach_pd: > - while (--i >= 0) { > - device_link_del(priv->pd_dev_link[i]); > - dev_pm_domain_detach(priv->pd_dev[i], false); > - } > - > - return ret; > -} > - > -static int imx_rproc_detach_pd(struct rproc *rproc) > -{ > - struct imx_rproc *priv = rproc->priv; > - int i; > + int ret; > + struct dev_pm_domain_attach_data pd_data = { > + .pd_flags = PD_FLAG_DEV_LINK_ON, > + }; > > /* > * If there is only one power-domain entry, the platform driver framework > * will handle it, no need handle it in this driver. > */ > - if (priv->num_pd <= 1) > + if (dev->pm_domain) > return 0; > > - for (i = 0; i < priv->num_pd; i++) { > - device_link_del(priv->pd_dev_link[i]); > - dev_pm_domain_detach(priv->pd_dev[i], false); > - } > - > - return 0; > + ret = dev_pm_domain_attach_list(dev, &pd_data, &priv->pd_list); > + return ret < 0 ? ret : 0; > } > > static int imx_rproc_detect_mode(struct imx_rproc *priv)
On Mon, 22 Jan 2024 at 10:51, Iuliana Prodan <iuliana.prodan@nxp.com> wrote: > > On 1/5/2024 6:01 PM, Ulf Hansson wrote: > > Let's avoid the boilerplate code to manage the multiple PM domain case, by > > converting into using dev_pm_domain_attach|detach_list(). > > > > Cc: Mathieu Poirier <mathieu.poirier@linaro.org> > > Cc: Bjorn Andersson <andersson@kernel.org> > > Cc: Shawn Guo <shawnguo@kernel.org> > > Cc: Sascha Hauer <s.hauer@pengutronix.de> > > Cc: Iuliana Prodan <iuliana.prodan@nxp.com> > > Cc: Daniel Baluta <daniel.baluta@nxp.com> > > Cc: <linux-remoteproc@vger.kernel.org> > > Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> > > --- > > > > Changes in v2: > > - None. > > > > Iuliana/Daniel I am ccing you to request help with test/review of this change. > > Note that, you will need patch 1/5 in the series too, to be able to test this. > > > > Kind regards > > Ulf Hansson > > Tested-by: Iuliana Prodan <iuliana.prodan@nxp.com> > Reviewed-by: Iuliana Prodan <iuliana.prodan@nxp.com> > Thanks for the leg-work on this. I'll pick this up in rc1 later this week. > Iulia > > > --- > > drivers/remoteproc/imx_rproc.c | 73 +++++----------------------------- > > 1 file changed, 9 insertions(+), 64 deletions(-) > > > > diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c > > index 8bb293b9f327..3161f14442bc 100644 > > --- a/drivers/remoteproc/imx_rproc.c > > +++ b/drivers/remoteproc/imx_rproc.c > > @@ -92,7 +92,6 @@ struct imx_rproc_mem { > > > > static int imx_rproc_xtr_mbox_init(struct rproc *rproc); > > static void imx_rproc_free_mbox(struct rproc *rproc); > > -static int imx_rproc_detach_pd(struct rproc *rproc); > > > > struct imx_rproc { > > struct device *dev; > > @@ -113,10 +112,8 @@ struct imx_rproc { > > u32 rproc_pt; /* partition id */ > > u32 rsrc_id; /* resource id */ > > u32 entry; /* cpu start address */ > > - int num_pd; > > u32 core_index; > > - struct device **pd_dev; > > - struct device_link **pd_dev_link; > > + struct dev_pm_domain_list *pd_list; > > }; > > > > static const struct imx_rproc_att imx_rproc_att_imx93[] = { > > @@ -853,7 +850,7 @@ static void imx_rproc_put_scu(struct rproc *rproc) > > return; > > > > if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id)) { > > - imx_rproc_detach_pd(rproc); > > + dev_pm_domain_detach_list(priv->pd_list); > > return; > > } > > > > @@ -880,72 +877,20 @@ static int imx_rproc_partition_notify(struct notifier_block *nb, > > static int imx_rproc_attach_pd(struct imx_rproc *priv) > > { > > struct device *dev = priv->dev; > > - int ret, i; > > - > > - /* > > - * If there is only one power-domain entry, the platform driver framework > > - * will handle it, no need handle it in this driver. > > - */ > > - priv->num_pd = of_count_phandle_with_args(dev->of_node, "power-domains", > > - "#power-domain-cells"); > > - if (priv->num_pd <= 1) > > - return 0; > > - > > - priv->pd_dev = devm_kmalloc_array(dev, priv->num_pd, sizeof(*priv->pd_dev), GFP_KERNEL); > > - if (!priv->pd_dev) > > - return -ENOMEM; > > - > > - priv->pd_dev_link = devm_kmalloc_array(dev, priv->num_pd, sizeof(*priv->pd_dev_link), > > - GFP_KERNEL); > > - > > - if (!priv->pd_dev_link) > > - return -ENOMEM; > > - > > - for (i = 0; i < priv->num_pd; i++) { > > - priv->pd_dev[i] = dev_pm_domain_attach_by_id(dev, i); > > - if (IS_ERR(priv->pd_dev[i])) { > > - ret = PTR_ERR(priv->pd_dev[i]); > > - goto detach_pd; > > - } > > - > > - priv->pd_dev_link[i] = device_link_add(dev, priv->pd_dev[i], DL_FLAG_STATELESS | > > - DL_FLAG_PM_RUNTIME | DL_FLAG_RPM_ACTIVE); > > - if (!priv->pd_dev_link[i]) { > > - dev_pm_domain_detach(priv->pd_dev[i], false); > > - ret = -EINVAL; > > - goto detach_pd; > > - } > > - } > > - > > - return 0; > > - > > -detach_pd: > > - while (--i >= 0) { > > - device_link_del(priv->pd_dev_link[i]); > > - dev_pm_domain_detach(priv->pd_dev[i], false); > > - } > > - > > - return ret; > > -} > > - > > -static int imx_rproc_detach_pd(struct rproc *rproc) > > -{ > > - struct imx_rproc *priv = rproc->priv; > > - int i; > > + int ret; > > + struct dev_pm_domain_attach_data pd_data = { > > + .pd_flags = PD_FLAG_DEV_LINK_ON, > > + }; > > > > /* > > * If there is only one power-domain entry, the platform driver framework > > * will handle it, no need handle it in this driver. > > */ > > - if (priv->num_pd <= 1) > > + if (dev->pm_domain) > > return 0; > > > > - for (i = 0; i < priv->num_pd; i++) { > > - device_link_del(priv->pd_dev_link[i]); > > - dev_pm_domain_detach(priv->pd_dev[i], false); > > - } > > - > > - return 0; > > + ret = dev_pm_domain_attach_list(dev, &pd_data, &priv->pd_list); > > + return ret < 0 ? ret : 0; > > } > > > > static int imx_rproc_detect_mode(struct imx_rproc *priv)
On Mon, Jan 22, 2024 at 01:02:08PM -0700, Mathieu Poirier wrote: > On Mon, 22 Jan 2024 at 10:51, Iuliana Prodan <iuliana.prodan@nxp.com> wrote: > > > > On 1/5/2024 6:01 PM, Ulf Hansson wrote: > > > Let's avoid the boilerplate code to manage the multiple PM domain case, by > > > converting into using dev_pm_domain_attach|detach_list(). > > > > > > Cc: Mathieu Poirier <mathieu.poirier@linaro.org> > > > Cc: Bjorn Andersson <andersson@kernel.org> > > > Cc: Shawn Guo <shawnguo@kernel.org> > > > Cc: Sascha Hauer <s.hauer@pengutronix.de> > > > Cc: Iuliana Prodan <iuliana.prodan@nxp.com> > > > Cc: Daniel Baluta <daniel.baluta@nxp.com> > > > Cc: <linux-remoteproc@vger.kernel.org> > > > Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> > > > --- > > > > > > Changes in v2: > > > - None. > > > > > > Iuliana/Daniel I am ccing you to request help with test/review of this change. > > > Note that, you will need patch 1/5 in the series too, to be able to test this. > > > > > > Kind regards > > > Ulf Hansson > > > > Tested-by: Iuliana Prodan <iuliana.prodan@nxp.com> > > Reviewed-by: Iuliana Prodan <iuliana.prodan@nxp.com> > > > > Thanks for the leg-work on this. I'll pick this up in rc1 later this week. Looking at the other files in this set, Ulf of perhaps Bjorn should take this set. for: drivers/remoteproc/imx_rproc.c drivers/remoteproc/imx_dsp_rproc.c Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> > > > Iulia > > > > > --- > > > drivers/remoteproc/imx_rproc.c | 73 +++++----------------------------- > > > 1 file changed, 9 insertions(+), 64 deletions(-) > > > > > > diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c > > > index 8bb293b9f327..3161f14442bc 100644 > > > --- a/drivers/remoteproc/imx_rproc.c > > > +++ b/drivers/remoteproc/imx_rproc.c > > > @@ -92,7 +92,6 @@ struct imx_rproc_mem { > > > > > > static int imx_rproc_xtr_mbox_init(struct rproc *rproc); > > > static void imx_rproc_free_mbox(struct rproc *rproc); > > > -static int imx_rproc_detach_pd(struct rproc *rproc); > > > > > > struct imx_rproc { > > > struct device *dev; > > > @@ -113,10 +112,8 @@ struct imx_rproc { > > > u32 rproc_pt; /* partition id */ > > > u32 rsrc_id; /* resource id */ > > > u32 entry; /* cpu start address */ > > > - int num_pd; > > > u32 core_index; > > > - struct device **pd_dev; > > > - struct device_link **pd_dev_link; > > > + struct dev_pm_domain_list *pd_list; > > > }; > > > > > > static const struct imx_rproc_att imx_rproc_att_imx93[] = { > > > @@ -853,7 +850,7 @@ static void imx_rproc_put_scu(struct rproc *rproc) > > > return; > > > > > > if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id)) { > > > - imx_rproc_detach_pd(rproc); > > > + dev_pm_domain_detach_list(priv->pd_list); > > > return; > > > } > > > > > > @@ -880,72 +877,20 @@ static int imx_rproc_partition_notify(struct notifier_block *nb, > > > static int imx_rproc_attach_pd(struct imx_rproc *priv) > > > { > > > struct device *dev = priv->dev; > > > - int ret, i; > > > - > > > - /* > > > - * If there is only one power-domain entry, the platform driver framework > > > - * will handle it, no need handle it in this driver. > > > - */ > > > - priv->num_pd = of_count_phandle_with_args(dev->of_node, "power-domains", > > > - "#power-domain-cells"); > > > - if (priv->num_pd <= 1) > > > - return 0; > > > - > > > - priv->pd_dev = devm_kmalloc_array(dev, priv->num_pd, sizeof(*priv->pd_dev), GFP_KERNEL); > > > - if (!priv->pd_dev) > > > - return -ENOMEM; > > > - > > > - priv->pd_dev_link = devm_kmalloc_array(dev, priv->num_pd, sizeof(*priv->pd_dev_link), > > > - GFP_KERNEL); > > > - > > > - if (!priv->pd_dev_link) > > > - return -ENOMEM; > > > - > > > - for (i = 0; i < priv->num_pd; i++) { > > > - priv->pd_dev[i] = dev_pm_domain_attach_by_id(dev, i); > > > - if (IS_ERR(priv->pd_dev[i])) { > > > - ret = PTR_ERR(priv->pd_dev[i]); > > > - goto detach_pd; > > > - } > > > - > > > - priv->pd_dev_link[i] = device_link_add(dev, priv->pd_dev[i], DL_FLAG_STATELESS | > > > - DL_FLAG_PM_RUNTIME | DL_FLAG_RPM_ACTIVE); > > > - if (!priv->pd_dev_link[i]) { > > > - dev_pm_domain_detach(priv->pd_dev[i], false); > > > - ret = -EINVAL; > > > - goto detach_pd; > > > - } > > > - } > > > - > > > - return 0; > > > - > > > -detach_pd: > > > - while (--i >= 0) { > > > - device_link_del(priv->pd_dev_link[i]); > > > - dev_pm_domain_detach(priv->pd_dev[i], false); > > > - } > > > - > > > - return ret; > > > -} > > > - > > > -static int imx_rproc_detach_pd(struct rproc *rproc) > > > -{ > > > - struct imx_rproc *priv = rproc->priv; > > > - int i; > > > + int ret; > > > + struct dev_pm_domain_attach_data pd_data = { > > > + .pd_flags = PD_FLAG_DEV_LINK_ON, > > > + }; > > > > > > /* > > > * If there is only one power-domain entry, the platform driver framework > > > * will handle it, no need handle it in this driver. > > > */ > > > - if (priv->num_pd <= 1) > > > + if (dev->pm_domain) > > > return 0; > > > > > > - for (i = 0; i < priv->num_pd; i++) { > > > - device_link_del(priv->pd_dev_link[i]); > > > - dev_pm_domain_detach(priv->pd_dev[i], false); > > > - } > > > - > > > - return 0; > > > + ret = dev_pm_domain_attach_list(dev, &pd_data, &priv->pd_list); > > > + return ret < 0 ? ret : 0; > > > } > > > > > > static int imx_rproc_detect_mode(struct imx_rproc *priv)
On Tue, 23 Jan 2024 at 02:27, Mathieu Poirier <mathieu.poirier@linaro.org> wrote: > > On Mon, Jan 22, 2024 at 01:02:08PM -0700, Mathieu Poirier wrote: > > On Mon, 22 Jan 2024 at 10:51, Iuliana Prodan <iuliana.prodan@nxp.com> wrote: > > > > > > On 1/5/2024 6:01 PM, Ulf Hansson wrote: > > > > Let's avoid the boilerplate code to manage the multiple PM domain case, by > > > > converting into using dev_pm_domain_attach|detach_list(). > > > > > > > > Cc: Mathieu Poirier <mathieu.poirier@linaro.org> > > > > Cc: Bjorn Andersson <andersson@kernel.org> > > > > Cc: Shawn Guo <shawnguo@kernel.org> > > > > Cc: Sascha Hauer <s.hauer@pengutronix.de> > > > > Cc: Iuliana Prodan <iuliana.prodan@nxp.com> > > > > Cc: Daniel Baluta <daniel.baluta@nxp.com> > > > > Cc: <linux-remoteproc@vger.kernel.org> > > > > Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> > > > > --- > > > > > > > > Changes in v2: > > > > - None. > > > > > > > > Iuliana/Daniel I am ccing you to request help with test/review of this change. > > > > Note that, you will need patch 1/5 in the series too, to be able to test this. > > > > > > > > Kind regards > > > > Ulf Hansson > > > > > > Tested-by: Iuliana Prodan <iuliana.prodan@nxp.com> > > > Reviewed-by: Iuliana Prodan <iuliana.prodan@nxp.com> > > > > > > > Thanks for the leg-work on this. I'll pick this up in rc1 later this week. > > Looking at the other files in this set, Ulf of perhaps Bjorn should take this > set. Yes, all patches in the series depend on the new helper function that is introduced in patch 1. I can certainly take the whole series via my pmdomain tree, if that's fine by everyone. Note that, there is also another series for genpd and qcom drivers that might make it for v6.9. It may be best to keep all these things together to avoid conflicts. Let's see what Greg/Rafael thinks about patch 1 first though. > > for: > > drivers/remoteproc/imx_rproc.c > drivers/remoteproc/imx_dsp_rproc.c > > Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org> Thanks Mathieu and Iuliana! [...] Kind regards Uffe [1] https://lore.kernel.org/all/20240122-gdsc-hwctrl-v4-0-9061e8a7aa07@linaro.org/
diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c index 8bb293b9f327..3161f14442bc 100644 --- a/drivers/remoteproc/imx_rproc.c +++ b/drivers/remoteproc/imx_rproc.c @@ -92,7 +92,6 @@ struct imx_rproc_mem { static int imx_rproc_xtr_mbox_init(struct rproc *rproc); static void imx_rproc_free_mbox(struct rproc *rproc); -static int imx_rproc_detach_pd(struct rproc *rproc); struct imx_rproc { struct device *dev; @@ -113,10 +112,8 @@ struct imx_rproc { u32 rproc_pt; /* partition id */ u32 rsrc_id; /* resource id */ u32 entry; /* cpu start address */ - int num_pd; u32 core_index; - struct device **pd_dev; - struct device_link **pd_dev_link; + struct dev_pm_domain_list *pd_list; }; static const struct imx_rproc_att imx_rproc_att_imx93[] = { @@ -853,7 +850,7 @@ static void imx_rproc_put_scu(struct rproc *rproc) return; if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id)) { - imx_rproc_detach_pd(rproc); + dev_pm_domain_detach_list(priv->pd_list); return; } @@ -880,72 +877,20 @@ static int imx_rproc_partition_notify(struct notifier_block *nb, static int imx_rproc_attach_pd(struct imx_rproc *priv) { struct device *dev = priv->dev; - int ret, i; - - /* - * If there is only one power-domain entry, the platform driver framework - * will handle it, no need handle it in this driver. - */ - priv->num_pd = of_count_phandle_with_args(dev->of_node, "power-domains", - "#power-domain-cells"); - if (priv->num_pd <= 1) - return 0; - - priv->pd_dev = devm_kmalloc_array(dev, priv->num_pd, sizeof(*priv->pd_dev), GFP_KERNEL); - if (!priv->pd_dev) - return -ENOMEM; - - priv->pd_dev_link = devm_kmalloc_array(dev, priv->num_pd, sizeof(*priv->pd_dev_link), - GFP_KERNEL); - - if (!priv->pd_dev_link) - return -ENOMEM; - - for (i = 0; i < priv->num_pd; i++) { - priv->pd_dev[i] = dev_pm_domain_attach_by_id(dev, i); - if (IS_ERR(priv->pd_dev[i])) { - ret = PTR_ERR(priv->pd_dev[i]); - goto detach_pd; - } - - priv->pd_dev_link[i] = device_link_add(dev, priv->pd_dev[i], DL_FLAG_STATELESS | - DL_FLAG_PM_RUNTIME | DL_FLAG_RPM_ACTIVE); - if (!priv->pd_dev_link[i]) { - dev_pm_domain_detach(priv->pd_dev[i], false); - ret = -EINVAL; - goto detach_pd; - } - } - - return 0; - -detach_pd: - while (--i >= 0) { - device_link_del(priv->pd_dev_link[i]); - dev_pm_domain_detach(priv->pd_dev[i], false); - } - - return ret; -} - -static int imx_rproc_detach_pd(struct rproc *rproc) -{ - struct imx_rproc *priv = rproc->priv; - int i; + int ret; + struct dev_pm_domain_attach_data pd_data = { + .pd_flags = PD_FLAG_DEV_LINK_ON, + }; /* * If there is only one power-domain entry, the platform driver framework * will handle it, no need handle it in this driver. */ - if (priv->num_pd <= 1) + if (dev->pm_domain) return 0; - for (i = 0; i < priv->num_pd; i++) { - device_link_del(priv->pd_dev_link[i]); - dev_pm_domain_detach(priv->pd_dev[i], false); - } - - return 0; + ret = dev_pm_domain_attach_list(dev, &pd_data, &priv->pd_list); + return ret < 0 ? ret : 0; } static int imx_rproc_detect_mode(struct imx_rproc *priv)