From nobody Fri Dec 26 11:23:21 2025 Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) (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 487B6321B9 for ; Fri, 5 Jan 2024 16:01:13 +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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="WrNEsD2k" Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-50eaa8b447bso1908004e87.1 for ; Fri, 05 Jan 2024 08:01:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1704470471; x=1705075271; 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=wNI1Oz48vQp4Hm9jFsOT4f7J+mpAOH6qfd1BBsjKsaA=; b=WrNEsD2k5FW4xLsue5ifzfhDU/Mz0SVJB070NPGwigme7y9tnzyTM2omqRxF9Q+o5c dgNYNMI/I19XKvH2J2gtisTqsk6LcL+xxuXkoiqKSBYnBOH2YLm/ti/7Y9oEpaXbbjqe C1L0sUJqbdsSTS02xgc+QPKHH8WYNC8FaihwAqLIxmZDY/1l3Zjl7DmDBQ97d3E5J7TF T5yPPzU8SRJaPXvQztXyNDHUHD/2T6thd9fb/uZQJT+Iu9fprEgoNjIQ0v7VXU7aH3E6 gZm/pr03AtuxywmKa5nKFD4GLJJ82HsssgXq6CP+8QMIeBwmXCWx68hPMT7KaNpktf3a SXmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704470471; x=1705075271; 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=wNI1Oz48vQp4Hm9jFsOT4f7J+mpAOH6qfd1BBsjKsaA=; b=hvO/4Rv6cADDEJd613dd2tDnVhilE9qCnSqZGg4uXsetVdA5tROm4ZdwtMmMHO7xjO xasF3bQKp8F/zXIBGntV6C4/i/KCcB2ee8ZgjADu1aGrdG2HhN3PcESawMfLty9doUzF RGbAS/a9ro2LD66atNkaRxg2O4DhJN8U6DKY0vsRRXxkQeViMoDvEvmzedxCVX1jV+Ir suXNjgneoU7JZzpizP+5umKD32GyhzQq1S5Nkd9Ygl7VRkyMS+JrUt85OIYFZoSHauqT rFy8P3cf/vScAynysPaKA3c4h3jljlSgMZKKH7GuCW57GCsK17Xc87WqCW6repNjKSRE qdqg== X-Gm-Message-State: AOJu0YyRd20zqVHmg9OVrEl9Llilk+bDESMixjyq8ECPOZTxsv9WG9+3 99na8dbzn69HJdP37s/g2I6kr50RItLNAQ== X-Google-Smtp-Source: AGHT+IFyphGz0Q6uyDmpcy3w7sNGqS+rbaFWXqKPDqcO5gErHcQWSgNAzPhrs714QaypH8/gnwBgJg== X-Received: by 2002:a05:6512:75:b0:50e:7bbc:b678 with SMTP id i21-20020a056512007500b0050e7bbcb678mr619227lfo.17.1704470471425; Fri, 05 Jan 2024 08:01:11 -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.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jan 2024 08:01:10 -0800 (PST) From: Ulf Hansson To: "Rafael J . Wysocki" , Greg Kroah-Hartman , Viresh Kumar , linux-pm@vger.kernel.org Cc: Ulf Hansson , Sudeep Holla , Kevin Hilman , Konrad Dybcio , Bjorn Andersson , Nikunj Kela , Prasad Sodagudi , Stephan Gerhold , Ben Horgan , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-remoteproc@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v2 1/5] PM: domains: Add helper functions to attach/detach multiple PM domains Date: Fri, 5 Jan 2024 17:00:59 +0100 Message-Id: <20240105160103.183092-2-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: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Attaching/detaching of a device to multiple PM domains has started to become a common operation for many drivers, typically during ->probe() and ->remove(). In most cases, this has lead to lots of boilerplate code in the drivers. To fixup up the situation, let's introduce a pair of helper functions, dev_pm_domain_attach|detach_list(), that driver can use instead of the open-coding. Note that, it seems reasonable to limit the support for these helpers to DT based platforms, at it's the only valid use case for now. Signed-off-by: Ulf Hansson --- Changes in v2: - Fix NULL pointer bug pointed out by Nikunj. --- drivers/base/power/common.c | 134 ++++++++++++++++++++++++++++++++++++ include/linux/pm_domain.h | 38 ++++++++++ 2 files changed, 172 insertions(+) diff --git a/drivers/base/power/common.c b/drivers/base/power/common.c index 44ec20918a4d..327d168dd37a 100644 --- a/drivers/base/power/common.c +++ b/drivers/base/power/common.c @@ -167,6 +167,115 @@ struct device *dev_pm_domain_attach_by_name(struct de= vice *dev, } EXPORT_SYMBOL_GPL(dev_pm_domain_attach_by_name); =20 +/** + * dev_pm_domain_attach_list - Associate a device with its PM domains. + * @dev: The device used to lookup the PM domains for. + * @data: The data used for attaching to the PM domains. + * @list: An out-parameter with an allocated list of attached PM domains. + * + * This function helps to attach a device to its multiple PM domains. The + * caller, which is typically a driver's probe function, may provide a lis= t of + * names for the PM domains that we should try to attach the device to, bu= t it + * may also provide an empty list, in case the attach should be done for a= ll of + * the available PM domains. + * + * Callers must ensure proper synchronization of this function with power + * management callbacks. + * + * Returns the number of attached PM domains or a negative error code in c= ase of + * a failure. Note that, to detach the list of PM domains, the driver shal= l call + * dev_pm_domain_detach_list(), typically during the remove phase. + */ +int dev_pm_domain_attach_list(struct device *dev, + const struct dev_pm_domain_attach_data *data, + struct dev_pm_domain_list **list) +{ + struct device_node *np =3D dev->of_node; + struct dev_pm_domain_list *pds; + struct device *pd_dev =3D NULL; + int ret, i, num_pds =3D 0; + bool by_id =3D true; + u32 pd_flags =3D data ? data->pd_flags : 0; + u32 link_flags =3D pd_flags & PD_FLAG_NO_DEV_LINK ? 0 : + DL_FLAG_STATELESS | DL_FLAG_PM_RUNTIME; + + if (dev->pm_domain) + return -EEXIST; + + /* For now this is limited to OF based platforms. */ + if (!np) + return 0; + + if (data && data->pd_names) { + num_pds =3D data->num_pd_names; + by_id =3D false; + } else { + num_pds =3D of_count_phandle_with_args(np, "power-domains", + "#power-domain-cells"); + } + + if (num_pds <=3D 0) + return 0; + + pds =3D devm_kzalloc(dev, sizeof(*pds), GFP_KERNEL); + if (!pds) + return -ENOMEM; + + pds->pd_devs =3D devm_kcalloc(dev, num_pds, sizeof(*pds->pd_devs), + GFP_KERNEL); + if (!pds->pd_devs) + return -ENOMEM; + + pds->pd_links =3D devm_kcalloc(dev, num_pds, sizeof(*pds->pd_links), + GFP_KERNEL); + if (!pds->pd_links) + return -ENOMEM; + + if (link_flags && pd_flags & PD_FLAG_DEV_LINK_ON) + link_flags |=3D DL_FLAG_RPM_ACTIVE; + + for (i =3D 0; i < num_pds; i++) { + if (by_id) + pd_dev =3D dev_pm_domain_attach_by_id(dev, i); + else + pd_dev =3D dev_pm_domain_attach_by_name(dev, + data->pd_names[i]); + if (IS_ERR_OR_NULL(pd_dev)) { + ret =3D pd_dev ? PTR_ERR(pd_dev) : -ENODEV; + goto err_attach; + } + + if (link_flags) { + struct device_link *link; + + link =3D device_link_add(dev, pd_dev, link_flags); + if (!link) { + ret =3D -ENODEV; + goto err_link; + } + + pds->pd_links[i] =3D link; + } + + pds->pd_devs[i] =3D pd_dev; + } + + pds->num_pds =3D num_pds; + *list =3D pds; + return num_pds; + +err_link: + dev_pm_domain_detach(pd_dev, true); +err_attach: + while (--i >=3D 0) { + if (pds->pd_links[i]) + device_link_del(pds->pd_links[i]); + dev_pm_domain_detach(pds->pd_devs[i], true); + } + return ret; +} +EXPORT_SYMBOL_GPL(dev_pm_domain_attach_list); + /** * dev_pm_domain_detach - Detach a device from its PM domain. * @dev: Device to detach. @@ -187,6 +296,31 @@ void dev_pm_domain_detach(struct device *dev, bool pow= er_off) } EXPORT_SYMBOL_GPL(dev_pm_domain_detach); =20 +/** + * dev_pm_domain_detach_list - Detach a list of PM domains. + * @list: The list of PM domains to detach. + * + * This function reverse the actions from dev_pm_domain_attach_list(). + * Typically it should be invoked during the remove phase from drivers. + * + * Callers must ensure proper synchronization of this function with power + * management callbacks. + */ +void dev_pm_domain_detach_list(struct dev_pm_domain_list *list) +{ + int i; + + if (!list) + return; + + for (i =3D 0; i < list->num_pds; i++) { + if (list->pd_links[i]) + device_link_del(list->pd_links[i]); + dev_pm_domain_detach(list->pd_devs[i], true); + } +} +EXPORT_SYMBOL_GPL(dev_pm_domain_detach_list); + /** * dev_pm_domain_start - Start the device through its PM domain. * @dev: Device to start. diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index 34663d0d5c55..6b71fb69c349 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -19,6 +19,33 @@ #include #include =20 +/* + * Flags to control the behaviour when attaching a device to its PM domain= s. + * + * PD_FLAG_NO_DEV_LINK: As the default behaviour creates a device-link + * for every PM domain that gets attached, this + * flag can be used to skip that. + * + * PD_FLAG_DEV_LINK_ON: Add the DL_FLAG_RPM_ACTIVE to power-on the + * supplier and its PM domain when creating the + * device-links. + * + */ +#define PD_FLAG_NO_DEV_LINK BIT(0) +#define PD_FLAG_DEV_LINK_ON BIT(1) + +struct dev_pm_domain_attach_data { + const char * const *pd_names; + const u32 num_pd_names; + const u32 pd_flags; +}; + +struct dev_pm_domain_list { + struct device **pd_devs; + struct device_link **pd_links; + u32 num_pds; +}; + /* * Flags to control the behaviour of a genpd. * @@ -432,7 +459,11 @@ struct device *dev_pm_domain_attach_by_id(struct devic= e *dev, unsigned int index); struct device *dev_pm_domain_attach_by_name(struct device *dev, const char *name); +int dev_pm_domain_attach_list(struct device *dev, + const struct dev_pm_domain_attach_data *data, + struct dev_pm_domain_list **list); void dev_pm_domain_detach(struct device *dev, bool power_off); +void dev_pm_domain_detach_list(struct dev_pm_domain_list *list); int dev_pm_domain_start(struct device *dev); void dev_pm_domain_set(struct device *dev, struct dev_pm_domain *pd); int dev_pm_domain_set_performance_state(struct device *dev, unsigned int s= tate); @@ -451,7 +482,14 @@ static inline struct device *dev_pm_domain_attach_by_n= ame(struct device *dev, { return NULL; } +static inline int dev_pm_domain_attach_list(struct device *dev, + const struct dev_pm_domain_attach_data *data, + struct dev_pm_domain_list **list) +{ + return 0; +} static inline void dev_pm_domain_detach(struct device *dev, bool power_off= ) {} +static inline void dev_pm_domain_detach_list(struct dev_pm_domain_list *li= st) {} static inline int dev_pm_domain_start(struct device *dev) { return 0; --=20 2.34.1 From nobody Fri Dec 26 11:23:21 2025 Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) (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 BB99534CD6 for ; Fri, 5 Jan 2024 16:01:16 +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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="pDJCNLOm" Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-50ea226bda8so1843649e87.2 for ; Fri, 05 Jan 2024 08:01:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1704470475; x=1705075275; 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=v4adrkCiXynUojze/iFBMYeb+HEd5tnQA25jx/jo/fM=; b=pDJCNLOmnVHYDXvHROz/V9ko6aJEgCq6Mk/RM1GQoR55XbYiZkLMj7OWP4YvzxwPQl x+1HIf1GTrMPAF6IVk/ua5iuEG0gF2pmX3KaNDo6cBtxtb7dlj/XMPSpeNirAV9Dl/Gy mY1/V1Lp6HEZOzt8HKNg4equRumpkRP29YlmjBLbqgVPlopSuIGuGrM4rD9HkGrY2R6O xpV3ilduH1rAGWwqoh/wfZt5WEv6J9xgMlpaorFufT+uZfs2VihTbLeHv4SsnNXVphqt I7qroly+i/uonLq8ADXHOhCH/GeSwECmT9m8ES4G8jx2jlVYwhsSHaAyFZDoAAGjIlVg MRGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704470475; x=1705075275; 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=v4adrkCiXynUojze/iFBMYeb+HEd5tnQA25jx/jo/fM=; b=GS2vbCVKrogqBTht57DtNsxKwpE9XjMYwLD1iWh71rvEJsy0btN1I4+sa6yysamMiW z/3Hm32KoHg8di821BTinROpADgXdOXmdEPOyPUesamyUcnYTSPIcaBJNcWgI7mp7sru 7w4iyQmdnzvqMu5jNyCV1BlFFm7Ss3oU110MaLNjfFrozeaRl1QJGXAUZ5APZ6Sy7yFu EooxPdiooFHnwuI+6bRduZY+tUBONinx9zO2LPdEp5AbTickG7OcKzf9xDoc4LIUbrKy GrZyZ7Uk0SI3rI0Ejp3QJ2ZDyuS4lp13oPW5vkwYzOUelBAAOTClNraoW1P6DZTzwMQK SX+A== X-Gm-Message-State: AOJu0YxMNefs26H9h6bBjz8+lloR5ny4U0Zd2vNnJ0VnYHAwiuhb+24r P6uSbNZ0egrRHJn4Xcr03pPJqmQJFSl4ZA== X-Google-Smtp-Source: AGHT+IGoYR9dNkx0TbEbTrZoz2zQHdVbLCqUuOHGn2IdJYr+CWUdepckfD72bhLcMFYSTGkVG//8iA== X-Received: by 2002:a19:6447:0:b0:50e:3d5b:cfef with SMTP id b7-20020a196447000000b0050e3d5bcfefmr869108lfj.53.1704470474915; Fri, 05 Jan 2024 08:01:14 -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.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jan 2024 08:01:12 -0800 (PST) From: Ulf Hansson To: "Rafael J . Wysocki" , Greg Kroah-Hartman , Viresh Kumar , linux-pm@vger.kernel.org Cc: Ulf Hansson , Sudeep Holla , Kevin Hilman , Konrad Dybcio , Bjorn Andersson , Nikunj Kela , Prasad Sodagudi , Stephan Gerhold , Ben Horgan , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-remoteproc@vger.kernel.org, linux-media@vger.kernel.org, Mathieu Poirier , Shawn Guo , Sascha Hauer , Iuliana Prodan , Daniel Baluta Subject: [PATCH v2 2/5] remoteproc: imx_dsp_rproc: Convert to dev_pm_domain_attach|detach_list() Date: Fri, 5 Jan 2024 17:01:00 +0100 Message-Id: <20240105160103.183092-3-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: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Cc: Bjorn Andersson Cc: Shawn Guo Cc: Sascha Hauer Cc: Iuliana Prodan Cc: Daniel Baluta Cc: Signed-off-by: Ulf Hansson Reviewed-by: Iuliana Prodan Tested-by: Iuliana Prodan --- Changes in v2: - None. Iuliana/Daniel I am ccing you to request help with test/review of this chan= ge. Note that, you will need patch 1/5 in the series too, to be able to test th= is. Kind regards Ulf Hansson --- drivers/remoteproc/imx_dsp_rproc.c | 82 ++++-------------------------- 1 file changed, 9 insertions(+), 73 deletions(-) diff --git a/drivers/remoteproc/imx_dsp_rproc.c b/drivers/remoteproc/imx_ds= p_rproc.c index 8fcda9b74545..0409b7c47d5c 100644 --- a/drivers/remoteproc/imx_dsp_rproc.c +++ b/drivers/remoteproc/imx_dsp_rproc.c @@ -103,12 +103,10 @@ enum imx_dsp_rp_mbox_messages { * @tx_ch: mailbox tx channel handle * @rx_ch: mailbox rx channel handle * @rxdb_ch: mailbox rx doorbell channel handle - * @pd_dev: power domain device - * @pd_dev_link: power domain device link + * @pd_list: power domain list * @ipc_handle: System Control Unit ipc handle * @rproc_work: work for processing virtio interrupts * @pm_comp: completion primitive to sync for suspend response - * @num_domains: power domain number * @flags: control flags */ struct imx_dsp_rproc { @@ -121,12 +119,10 @@ struct imx_dsp_rproc { struct mbox_chan *tx_ch; struct mbox_chan *rx_ch; struct mbox_chan *rxdb_ch; - struct device **pd_dev; - struct device_link **pd_dev_link; + struct dev_pm_domain_list *pd_list; struct imx_sc_ipc *ipc_handle; struct work_struct rproc_work; struct completion pm_comp; - int num_domains; u32 flags; }; =20 @@ -954,74 +950,14 @@ static const struct rproc_ops imx_dsp_rproc_ops =3D { static int imx_dsp_attach_pm_domains(struct imx_dsp_rproc *priv) { struct device *dev =3D priv->rproc->dev.parent; - int ret, i; - - priv->num_domains =3D of_count_phandle_with_args(dev->of_node, - "power-domains", - "#power-domain-cells"); - - /* If only one domain, then no need to link the device */ - if (priv->num_domains <=3D 1) - return 0; - - priv->pd_dev =3D devm_kmalloc_array(dev, priv->num_domains, - sizeof(*priv->pd_dev), - GFP_KERNEL); - if (!priv->pd_dev) - return -ENOMEM; - - priv->pd_dev_link =3D devm_kmalloc_array(dev, priv->num_domains, - sizeof(*priv->pd_dev_link), - GFP_KERNEL); - if (!priv->pd_dev_link) - return -ENOMEM; - - for (i =3D 0; i < priv->num_domains; i++) { - priv->pd_dev[i] =3D dev_pm_domain_attach_by_id(dev, i); - if (IS_ERR(priv->pd_dev[i])) { - ret =3D PTR_ERR(priv->pd_dev[i]); - goto detach_pm; - } - - /* - * device_link_add will check priv->pd_dev[i], if it is - * NULL, then will break. - */ - priv->pd_dev_link[i] =3D device_link_add(dev, - priv->pd_dev[i], - DL_FLAG_STATELESS | - DL_FLAG_PM_RUNTIME); - if (!priv->pd_dev_link[i]) { - dev_pm_domain_detach(priv->pd_dev[i], false); - ret =3D -EINVAL; - goto detach_pm; - } - } - - return 0; - -detach_pm: - while (--i >=3D 0) { - device_link_del(priv->pd_dev_link[i]); - dev_pm_domain_detach(priv->pd_dev[i], false); - } - - return ret; -} - -static int imx_dsp_detach_pm_domains(struct imx_dsp_rproc *priv) -{ - int i; + int ret; =20 - if (priv->num_domains <=3D 1) + /* A single PM domain is already attached. */ + if (dev->pm_domain) return 0; =20 - for (i =3D 0; i < priv->num_domains; i++) { - device_link_del(priv->pd_dev_link[i]); - dev_pm_domain_detach(priv->pd_dev[i], false); - } - - return 0; + ret =3D dev_pm_domain_attach_list(dev, NULL, &priv->pd_list); + return ret < 0 ? ret : 0; } =20 /** @@ -1153,7 +1089,7 @@ static int imx_dsp_rproc_probe(struct platform_device= *pdev) return 0; =20 err_detach_domains: - imx_dsp_detach_pm_domains(priv); + dev_pm_domain_detach_list(priv->pd_list); err_put_rproc: rproc_free(rproc); =20 @@ -1167,7 +1103,7 @@ static void imx_dsp_rproc_remove(struct platform_devi= ce *pdev) =20 pm_runtime_disable(&pdev->dev); rproc_del(rproc); - imx_dsp_detach_pm_domains(priv); + dev_pm_domain_detach_list(priv->pd_list); rproc_free(rproc); } =20 --=20 2.34.1 From nobody Fri Dec 26 11:23:21 2025 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 ; 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="YDmBF7lF" Received: by mail-lf1-f47.google.com with SMTP id 2adb3069b0e04-50ea9daac4cso1963304e87.3 for ; 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-Google-Smtp-Source: AGHT+IEhceusxqe38aK6YSRaF0oSmtJx101dr5UFrhN3EnDzMmqdMwFzHk96/G1pK1okalt2N+42DA== 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 To: "Rafael J . Wysocki" , Greg Kroah-Hartman , Viresh Kumar , linux-pm@vger.kernel.org Cc: Ulf Hansson , Sudeep Holla , Kevin Hilman , Konrad Dybcio , Bjorn Andersson , Nikunj Kela , Prasad Sodagudi , Stephan Gerhold , Ben Horgan , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-remoteproc@vger.kernel.org, linux-media@vger.kernel.org, Mathieu Poirier , Shawn Guo , Sascha Hauer , Iuliana Prodan , Daniel Baluta 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: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Cc: Bjorn Andersson Cc: Shawn Guo Cc: Sascha Hauer Cc: Iuliana Prodan Cc: Daniel Baluta Cc: Signed-off-by: Ulf Hansson Reviewed-by: Iuliana Prodan Reviewed-by: Mathieu Poirier Tested-by: Iuliana Prodan --- Changes in v2: - None. Iuliana/Daniel I am ccing you to request help with test/review of this chan= ge. Note that, you will need patch 1/5 in the series too, to be able to test th= is. Kind regards Ulf Hansson --- 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 { =20 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); =20 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; }; =20 static const struct imx_rproc_att imx_rproc_att_imx93[] =3D { @@ -853,7 +850,7 @@ static void imx_rproc_put_scu(struct rproc *rproc) return; =20 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; } =20 @@ -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 =3D 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 =3D of_count_phandle_with_args(dev->of_node, "power-domains", - "#power-domain-cells"); - if (priv->num_pd <=3D 1) - return 0; - - priv->pd_dev =3D devm_kmalloc_array(dev, priv->num_pd, sizeof(*priv->pd_d= ev), GFP_KERNEL); - if (!priv->pd_dev) - return -ENOMEM; - - priv->pd_dev_link =3D devm_kmalloc_array(dev, priv->num_pd, sizeof(*priv-= >pd_dev_link), - GFP_KERNEL); - - if (!priv->pd_dev_link) - return -ENOMEM; - - for (i =3D 0; i < priv->num_pd; i++) { - priv->pd_dev[i] =3D dev_pm_domain_attach_by_id(dev, i); - if (IS_ERR(priv->pd_dev[i])) { - ret =3D PTR_ERR(priv->pd_dev[i]); - goto detach_pd; - } - - priv->pd_dev_link[i] =3D device_link_add(dev, priv->pd_dev[i], DL_FLAG_S= TATELESS | - DL_FLAG_PM_RUNTIME | DL_FLAG_RPM_ACTIVE); - if (!priv->pd_dev_link[i]) { - dev_pm_domain_detach(priv->pd_dev[i], false); - ret =3D -EINVAL; - goto detach_pd; - } - } - - return 0; - -detach_pd: - while (--i >=3D 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 =3D rproc->priv; - int i; + int ret; + struct dev_pm_domain_attach_data pd_data =3D { + .pd_flags =3D PD_FLAG_DEV_LINK_ON, + }; =20 /* * 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 <=3D 1) + if (dev->pm_domain) return 0; =20 - for (i =3D 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 =3D dev_pm_domain_attach_list(dev, &pd_data, &priv->pd_list); + return ret < 0 ? ret : 0; } =20 static int imx_rproc_detect_mode(struct imx_rproc *priv) --=20 2.34.1 From nobody Fri Dec 26 11:23:21 2025 Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) (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 4511F35EE2 for ; Fri, 5 Jan 2024 16:01:24 +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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Ycxnnd62" Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-50eaabc36bcso2072863e87.2 for ; Fri, 05 Jan 2024 08:01:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1704470482; x=1705075282; 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=8L0r+j4QHpjBNKOc8LHPOJeBJ7cd09qGloI5UK65eK8=; b=Ycxnnd62LwjllLHMqhoOBI5hoM/2xeVT3AFSW83rg/VGWlTtX08peVZobmX6w3SuPF qWZmPTvQNXIsPxXMOHWNDex5nt/ncjJJG8GHjY4uQsxFFrzxmxJzV0gM74V6gwVRiPpr 0G6GV6nLvx2zuYHU2O92cZ08N7agdXS5BYkCQFIXBVA9Ohy+Kg6qPfYY5cZF8cMNAcdq B7iU+wmavt6x1uNFOuMpFVfGWYCIHTIwmlMNcPBeVNYOGVrA3rOsG9uZb4iLQ4t9qqge kSkIJzRSaU1jvtQE+30KA2YP0oLyEeC2jS4A8Fm/rvpyiACij1PA/yRva01ZCAzc2YvM KZ7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704470482; x=1705075282; 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=8L0r+j4QHpjBNKOc8LHPOJeBJ7cd09qGloI5UK65eK8=; b=GU+5FP0hO3OnkEyz3wbtptwIZlTcTC+UQESMi90NSwOWsUCkoah5569vd2s6UW4zuQ K9+59vP0QHWWecCJlQAcRhnS93vihmpgSCERRsxSyeD5lKoHRsxLay2TPgxsEa7TaQsy IaQG85R7YtYOOWsmmHN4KVfoU8UYj6kIUFVj3WBCVwMRRPzv5iAuLPywk7t+r7kXa/DY w+GEwkwgz10Ml2xRJ66wr1fE++oW9V3VvcsxgpoaaZ3atSxtT+Jm2COJE7s2hMuw2gbs jSYbvgYmObDJjJU8YsR5P0P4qtyRFIxkyG2CrzpLss+GptoJlVT3Ku+linuurWHrUGpv LCfg== X-Gm-Message-State: AOJu0YxkHqu/94j2+gCmEHiHVn3zCn6vh4OAAK6SdH2urMkhtzuUKDzi BzV51iNg1gwraEKUT6ThECY/UH5x9CGIFQ== X-Google-Smtp-Source: AGHT+IFY8QPFwT3PY8M0RvC5lrijiDKhxLr7OdAEz9xvV4euoz5pxeW0sYQSK/KqUIzreBJFVWCGVQ== X-Received: by 2002:ac2:58c1:0:b0:50e:7b4e:f7e8 with SMTP id u1-20020ac258c1000000b0050e7b4ef7e8mr1019442lfo.6.1704470482505; Fri, 05 Jan 2024 08:01:22 -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.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jan 2024 08:01:19 -0800 (PST) From: Ulf Hansson To: "Rafael J . Wysocki" , Greg Kroah-Hartman , Viresh Kumar , linux-pm@vger.kernel.org Cc: Ulf Hansson , Sudeep Holla , Kevin Hilman , Konrad Dybcio , Bjorn Andersson , Nikunj Kela , Prasad Sodagudi , Stephan Gerhold , Ben Horgan , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-remoteproc@vger.kernel.org, linux-media@vger.kernel.org, Mathieu Poirier Subject: [PATCH v2 4/5] remoteproc: qcom_q6v5_adsp: Convert to dev_pm_domain_attach|detach_list() Date: Fri, 5 Jan 2024 17:01:02 +0100 Message-Id: <20240105160103.183092-5-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: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Let's avoid some of the boilerplate code to manage the various PM domain cases, by converting into using dev_pm_domain_attach|detach_list(). As a part of the conversion, we are moving over to use device_links, which simplifies the runtime PM support too. Moreover, while attaching let's trust that an already attached single PM domain is the correct one. Cc: Mathieu Poirier Cc: Bjorn Andersson Cc: Konrad Dybcio Cc: Signed-off-by: Ulf Hansson --- Changes in v2: - None. Kind regards Ulf Hansson --- drivers/remoteproc/qcom_q6v5_adsp.c | 160 +++++++++++++--------------- 1 file changed, 73 insertions(+), 87 deletions(-) diff --git a/drivers/remoteproc/qcom_q6v5_adsp.c b/drivers/remoteproc/qcom_= q6v5_adsp.c index 6c67514cc493..93f9a1537ec6 100644 --- a/drivers/remoteproc/qcom_q6v5_adsp.c +++ b/drivers/remoteproc/qcom_q6v5_adsp.c @@ -55,8 +55,6 @@ #define QDSP6SS_CORE_CBCR 0x20 #define QDSP6SS_SLEEP_CBCR 0x3c =20 -#define QCOM_Q6V5_RPROC_PROXY_PD_MAX 3 - #define LPASS_BOOT_CORE_START BIT(0) #define LPASS_BOOT_CMD_START BIT(0) #define LPASS_EFUSE_Q6SS_EVB_SEL 0x0 @@ -74,7 +72,8 @@ struct adsp_pil_data { =20 const char **clk_ids; int num_clks; - const char **proxy_pd_names; + const char **pd_names; + unsigned int num_pds; const char *load_state; }; =20 @@ -110,8 +109,7 @@ struct qcom_adsp { size_t mem_size; bool has_iommu; =20 - struct device *proxy_pds[QCOM_Q6V5_RPROC_PROXY_PD_MAX]; - size_t proxy_pd_count; + struct dev_pm_domain_list *pd_list; =20 struct qcom_rproc_glink glink_subdev; struct qcom_rproc_ssr ssr_subdev; @@ -120,98 +118,92 @@ struct qcom_adsp { int (*shutdown)(struct qcom_adsp *adsp); }; =20 -static int qcom_rproc_pds_attach(struct device *dev, struct qcom_adsp *ads= p, - const char **pd_names) +static int qcom_rproc_pds_attach(struct qcom_adsp *adsp, const char **pd_n= ames, + unsigned int num_pds) { - struct device **devs =3D adsp->proxy_pds; - size_t num_pds =3D 0; + struct device *dev =3D adsp->dev; + struct dev_pm_domain_attach_data pd_data =3D { + .pd_names =3D pd_names, + .num_pd_names =3D num_pds, + }; int ret; - int i; - - if (!pd_names) - return 0; =20 /* Handle single power domain */ - if (dev->pm_domain) { - devs[0] =3D dev; - pm_runtime_enable(dev); - return 1; - } + if (dev->pm_domain) + goto out; =20 - while (pd_names[num_pds]) - num_pds++; + if (!pd_names) + return 0; =20 - if (num_pds > ARRAY_SIZE(adsp->proxy_pds)) - return -E2BIG; + ret =3D dev_pm_domain_attach_list(dev, &pd_data, &adsp->pd_list); + if (ret < 0) + return ret; =20 - for (i =3D 0; i < num_pds; i++) { - devs[i] =3D dev_pm_domain_attach_by_name(dev, pd_names[i]); - if (IS_ERR_OR_NULL(devs[i])) { - ret =3D PTR_ERR(devs[i]) ? : -ENODATA; - goto unroll_attach; - } - } +out: + pm_runtime_enable(dev); + return 0; +} =20 - return num_pds; +static void qcom_rproc_pds_detach(struct qcom_adsp *adsp) +{ + struct device *dev =3D adsp->dev; + struct dev_pm_domain_list *pds =3D adsp->pd_list; =20 -unroll_attach: - for (i--; i >=3D 0; i--) - dev_pm_domain_detach(devs[i], false); + dev_pm_domain_detach_list(pds); =20 - return ret; + if (dev->pm_domain || pds) + pm_runtime_disable(adsp->dev); } =20 -static void qcom_rproc_pds_detach(struct qcom_adsp *adsp, struct device **= pds, - size_t pd_count) +static int qcom_rproc_pds_enable(struct qcom_adsp *adsp) { struct device *dev =3D adsp->dev; - int i; + struct dev_pm_domain_list *pds =3D adsp->pd_list; + int ret, i =3D 0; =20 - /* Handle single power domain */ - if (dev->pm_domain && pd_count) { - pm_runtime_disable(dev); - return; - } + if (!dev->pm_domain && !pds) + return 0; =20 - for (i =3D 0; i < pd_count; i++) - dev_pm_domain_detach(pds[i], false); -} + if (dev->pm_domain) + dev_pm_genpd_set_performance_state(dev, INT_MAX); =20 -static int qcom_rproc_pds_enable(struct qcom_adsp *adsp, struct device **p= ds, - size_t pd_count) -{ - int ret; - int i; - - for (i =3D 0; i < pd_count; i++) { - dev_pm_genpd_set_performance_state(pds[i], INT_MAX); - ret =3D pm_runtime_resume_and_get(pds[i]); - if (ret < 0) { - dev_pm_genpd_set_performance_state(pds[i], 0); - goto unroll_pd_votes; - } + while (pds && i < pds->num_pds) { + dev_pm_genpd_set_performance_state(pds->pd_devs[i], INT_MAX); + i++; } =20 - return 0; + ret =3D pm_runtime_resume_and_get(dev); + if (ret < 0) { + while (pds && i > 0) { + i--; + dev_pm_genpd_set_performance_state(pds->pd_devs[i], 0); + } =20 -unroll_pd_votes: - for (i--; i >=3D 0; i--) { - dev_pm_genpd_set_performance_state(pds[i], 0); - pm_runtime_put(pds[i]); + if (dev->pm_domain) + dev_pm_genpd_set_performance_state(dev, 0); } =20 return ret; } =20 -static void qcom_rproc_pds_disable(struct qcom_adsp *adsp, struct device *= *pds, - size_t pd_count) +static void qcom_rproc_pds_disable(struct qcom_adsp *adsp) { - int i; + struct device *dev =3D adsp->dev; + struct dev_pm_domain_list *pds =3D adsp->pd_list; + int i =3D 0; + + if (!dev->pm_domain && !pds) + return; + + if (dev->pm_domain) + dev_pm_genpd_set_performance_state(dev, 0); =20 - for (i =3D 0; i < pd_count; i++) { - dev_pm_genpd_set_performance_state(pds[i], 0); - pm_runtime_put(pds[i]); + while (pds && i < pds->num_pds) { + dev_pm_genpd_set_performance_state(pds->pd_devs[i], 0); + i++; } + + pm_runtime_put(dev); } =20 static int qcom_wpss_shutdown(struct qcom_adsp *adsp) @@ -397,8 +389,7 @@ static int adsp_start(struct rproc *rproc) if (ret) goto adsp_smmu_unmap; =20 - ret =3D qcom_rproc_pds_enable(adsp, adsp->proxy_pds, - adsp->proxy_pd_count); + ret =3D qcom_rproc_pds_enable(adsp); if (ret < 0) goto disable_xo_clk; =20 @@ -448,7 +439,7 @@ static int adsp_start(struct rproc *rproc) disable_adsp_clks: clk_bulk_disable_unprepare(adsp->num_clks, adsp->clks); disable_power_domain: - qcom_rproc_pds_disable(adsp, adsp->proxy_pds, adsp->proxy_pd_count); + qcom_rproc_pds_disable(adsp); disable_xo_clk: clk_disable_unprepare(adsp->xo); adsp_smmu_unmap: @@ -464,7 +455,7 @@ static void qcom_adsp_pil_handover(struct qcom_q6v5 *q6= v5) struct qcom_adsp *adsp =3D container_of(q6v5, struct qcom_adsp, q6v5); =20 clk_disable_unprepare(adsp->xo); - qcom_rproc_pds_disable(adsp, adsp->proxy_pds, adsp->proxy_pd_count); + qcom_rproc_pds_disable(adsp); } =20 static int adsp_stop(struct rproc *rproc) @@ -715,13 +706,11 @@ static int adsp_probe(struct platform_device *pdev) if (ret) goto free_rproc; =20 - ret =3D qcom_rproc_pds_attach(adsp->dev, adsp, - desc->proxy_pd_names); + ret =3D qcom_rproc_pds_attach(adsp, desc->pd_names, desc->num_pds); if (ret < 0) { dev_err(&pdev->dev, "Failed to attach proxy power domains\n"); goto free_rproc; } - adsp->proxy_pd_count =3D ret; =20 ret =3D adsp_init_reset(adsp); if (ret) @@ -753,7 +742,7 @@ static int adsp_probe(struct platform_device *pdev) return 0; =20 disable_pm: - qcom_rproc_pds_detach(adsp, adsp->proxy_pds, adsp->proxy_pd_count); + qcom_rproc_pds_detach(adsp); =20 free_rproc: rproc_free(rproc); @@ -771,7 +760,7 @@ static void adsp_remove(struct platform_device *pdev) qcom_remove_glink_subdev(adsp->rproc, &adsp->glink_subdev); qcom_remove_sysmon_subdev(adsp->sysmon); qcom_remove_ssr_subdev(adsp->rproc, &adsp->ssr_subdev); - qcom_rproc_pds_detach(adsp, adsp->proxy_pds, adsp->proxy_pd_count); + qcom_rproc_pds_detach(adsp); rproc_free(adsp->rproc); } =20 @@ -788,9 +777,8 @@ static const struct adsp_pil_data adsp_resource_init = =3D { "qdsp6ss_xo", "qdsp6ss_sleep", "qdsp6ss_core", NULL }, .num_clks =3D 7, - .proxy_pd_names =3D (const char*[]) { - "cx", NULL - }, + .pd_names =3D (const char*[]) { "cx" }, + .num_pds =3D 1, }; =20 static const struct adsp_pil_data adsp_sc7280_resource_init =3D { @@ -821,9 +809,8 @@ static const struct adsp_pil_data cdsp_resource_init = =3D { "q6_axim", NULL }, .num_clks =3D 7, - .proxy_pd_names =3D (const char*[]) { - "cx", NULL - }, + .pd_names =3D (const char*[]) { "cx" }, + .num_pds =3D 1, }; =20 static const struct adsp_pil_data wpss_resource_init =3D { @@ -839,9 +826,8 @@ static const struct adsp_pil_data wpss_resource_init = =3D { "ahb_bdg", "ahb", "rscp", NULL }, .num_clks =3D 3, - .proxy_pd_names =3D (const char*[]) { - "cx", "mx", NULL - }, + .pd_names =3D (const char*[]) { "cx", "mx" }, + .num_pds =3D 2, }; =20 static const struct of_device_id adsp_of_match[] =3D { --=20 2.34.1 From nobody Fri Dec 26 11:23:21 2025 Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) (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 91E1F2E84C for ; Fri, 5 Jan 2024 16:01:32 +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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="XAE5DJyC" Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-50e5a9bcec9so2191750e87.3 for ; Fri, 05 Jan 2024 08:01:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1704470491; x=1705075291; 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=hfaPY3yQfoH2pfubd1hE0qyxl2OsnhSkHMvbF5d+3SA=; b=XAE5DJyC9E+rrEowooFFOx7nmKW2PremJaCQKWX0YZTMThEkbcEmUFklJMJrSs23Kz pAlme/dL4ExxbkIE3Tu2ccjY6YbF6kIPT2M08D+H0v+AMu8m5NO1I09KqcppYWcKLJSr +litKAuEFX3ZOfHFZjJSVB2XiEKUR2YbJhI616L8XXRClWeeltKb5h1c9+6ptn/VWT5a eYeEgavlR7J6GmeAGe/C+KSkqMnMZEKSCfupHXbOrtUhmBBOu+HeQuT8x6gL066bnzmI jKnGhP0qRer7gTi0hW+bxbnWjfQelXcLh9BghvMLg48vEynzeqekUjIe43/QfCddgjHF 3y9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704470491; x=1705075291; 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=hfaPY3yQfoH2pfubd1hE0qyxl2OsnhSkHMvbF5d+3SA=; b=kxjWa079BgJPQ+MjekSSk8Uf7Ca9V7IRL6/G0F8XZdW+BNpmXCBYuybFYbkgU76oCp spLlWfWj+7MVjyCV5dQ43x3tim0BocqwGolqVbEf8y/Zy+ZTHbNN+8yqqXYbSriyNHQe pxTqaKy2srOo5KA9b2wtgz8e4vDKG6KlvlWETwyWF6cSLtSTma2Q4nVIMflfd885zAWB xN0pzBOIITneC2ft5ychuhfPda6s5lnpSQEfTIEDrGhliAQrbXGoPCJDR2RsBsSb6BrO 7qoX2LAw2qqQkE4j9RgB8hSQhZejkAvzKObg+XOvzZabRxC0ItDsATuYlrJWEAoKPv18 h1hw== X-Gm-Message-State: AOJu0YxQ8NljRT37jo3AcuZ8AxaGHHXkA46OHD+TdJntjKLF+WYPx+lN Y/J3/FdM57h+uHrEJd4RZuqjjYPEyPyqLaYOLft2ALTCqA8= X-Google-Smtp-Source: AGHT+IERdn5J2WMksCV2xwOZSB4UlNaSC9hjgX2okCC+u7HZvOM32yjjwGik6ASHsLufYsrr/E57Ww== X-Received: by 2002:ac2:46e1:0:b0:50e:80d3:4fd4 with SMTP id q1-20020ac246e1000000b0050e80d34fd4mr1191950lfo.51.1704470490597; Fri, 05 Jan 2024 08:01:30 -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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jan 2024 08:01:23 -0800 (PST) From: Ulf Hansson To: "Rafael J . Wysocki" , Greg Kroah-Hartman , Viresh Kumar , linux-pm@vger.kernel.org Cc: Ulf Hansson , Sudeep Holla , Kevin Hilman , Konrad Dybcio , Bjorn Andersson , Nikunj Kela , Prasad Sodagudi , Stephan Gerhold , Ben Horgan , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-remoteproc@vger.kernel.org, linux-media@vger.kernel.org, Mauro Carvalho Chehab , Stanimir Varbanov , Vikash Garodia , "Bryan O'Donoghue" Subject: [PATCH v2 5/5] media: venus: Convert to dev_pm_domain_attach|detach_list() for vcodec Date: Fri, 5 Jan 2024 17:01:03 +0100 Message-Id: <20240105160103.183092-6-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: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Let's avoid some of the boilerplate code to manage the vcodec PM domains, by converting into using dev_pm_domain_attach|detach_list(). Cc: Mauro Carvalho Chehab Cc: Stanimir Varbanov Cc: Vikash Garodia Cc: "Bryan O'Donoghue" Cc: Bjorn Andersson Cc: Konrad Dybcio Cc: Tested-by: Bryan O'Donoghue Reviewed-by: Bryan O'Donoghue Signed-off-by: Ulf Hansson --- Changes in v2: - Added tags Bryan's tags. --- drivers/media/platform/qcom/venus/core.c | 12 +++-- drivers/media/platform/qcom/venus/core.h | 7 ++- .../media/platform/qcom/venus/pm_helpers.c | 48 +++++++------------ 3 files changed, 26 insertions(+), 41 deletions(-) diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platf= orm/qcom/venus/core.c index 9cffe975581b..bd9b474280e4 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -114,7 +115,8 @@ static void venus_sys_error_handler(struct work_struct = *work) pm_runtime_put_sync(core->dev); =20 for (i =3D 0; i < max_attempts; i++) { - if (!core->pmdomains[0] || !pm_runtime_active(core->pmdomains[0])) + if (!core->pmdomains || + !pm_runtime_active(core->pmdomains->pd_devs[0])) break; usleep_range(1000, 1500); } @@ -705,7 +707,7 @@ static const struct venus_resources sdm845_res_v2 =3D { .vcodec0_clks =3D { "vcodec0_core", "vcodec0_bus" }, .vcodec1_clks =3D { "vcodec1_core", "vcodec1_bus" }, .vcodec_clks_num =3D 2, - .vcodec_pmdomains =3D { "venus", "vcodec0", "vcodec1" }, + .vcodec_pmdomains =3D (const char *[]) { "venus", "vcodec0", "vcodec1" }, .vcodec_pmdomains_num =3D 3, .opp_pmdomain =3D (const char *[]) { "cx", NULL }, .vcodec_num =3D 2, @@ -754,7 +756,7 @@ static const struct venus_resources sc7180_res =3D { .clks_num =3D 3, .vcodec0_clks =3D { "vcodec0_core", "vcodec0_bus" }, .vcodec_clks_num =3D 2, - .vcodec_pmdomains =3D { "venus", "vcodec0" }, + .vcodec_pmdomains =3D (const char *[]) { "venus", "vcodec0" }, .vcodec_pmdomains_num =3D 2, .opp_pmdomain =3D (const char *[]) { "cx", NULL }, .vcodec_num =3D 1, @@ -811,7 +813,7 @@ static const struct venus_resources sm8250_res =3D { .resets_num =3D 2, .vcodec0_clks =3D { "vcodec0_core" }, .vcodec_clks_num =3D 1, - .vcodec_pmdomains =3D { "venus", "vcodec0" }, + .vcodec_pmdomains =3D (const char *[]) { "venus", "vcodec0" }, .vcodec_pmdomains_num =3D 2, .opp_pmdomain =3D (const char *[]) { "mx", NULL }, .vcodec_num =3D 1, @@ -870,7 +872,7 @@ static const struct venus_resources sc7280_res =3D { .clks_num =3D 3, .vcodec0_clks =3D {"vcodec_core", "vcodec_bus"}, .vcodec_clks_num =3D 2, - .vcodec_pmdomains =3D { "venus", "vcodec0" }, + .vcodec_pmdomains =3D (const char *[]) { "venus", "vcodec0" }, .vcodec_pmdomains_num =3D 2, .opp_pmdomain =3D (const char *[]) { "cx", NULL }, .vcodec_num =3D 1, diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platf= orm/qcom/venus/core.h index 4a633261ece4..7ef341bf21cc 100644 --- a/drivers/media/platform/qcom/venus/core.h +++ b/drivers/media/platform/qcom/venus/core.h @@ -25,7 +25,6 @@ =20 #define VIDC_CLKS_NUM_MAX 4 #define VIDC_VCODEC_CLKS_NUM_MAX 2 -#define VIDC_PMDOMAINS_NUM_MAX 3 #define VIDC_RESETS_NUM_MAX 2 =20 extern int venus_fw_debug; @@ -72,7 +71,7 @@ struct venus_resources { const char * const vcodec0_clks[VIDC_VCODEC_CLKS_NUM_MAX]; const char * const vcodec1_clks[VIDC_VCODEC_CLKS_NUM_MAX]; unsigned int vcodec_clks_num; - const char * const vcodec_pmdomains[VIDC_PMDOMAINS_NUM_MAX]; + const char **vcodec_pmdomains; unsigned int vcodec_pmdomains_num; const char **opp_pmdomain; unsigned int vcodec_num; @@ -134,7 +133,7 @@ struct venus_format { * @video_path: an interconnect handle to video to/from memory path * @cpucfg_path: an interconnect handle to cpu configuration path * @has_opp_table: does OPP table exist - * @pmdomains: an array of pmdomains struct device pointers + * @pmdomains: a pointer to a list of pmdomains * @opp_dl_venus: an device-link for device OPP * @opp_pmdomain: an OPP power-domain * @resets: an array of reset signals @@ -187,7 +186,7 @@ struct venus_core { struct icc_path *video_path; struct icc_path *cpucfg_path; bool has_opp_table; - struct device *pmdomains[VIDC_PMDOMAINS_NUM_MAX]; + struct dev_pm_domain_list *pmdomains; struct device_link *opp_dl_venus; struct device *opp_pmdomain; struct reset_control *resets[VIDC_RESETS_NUM_MAX]; diff --git a/drivers/media/platform/qcom/venus/pm_helpers.c b/drivers/media= /platform/qcom/venus/pm_helpers.c index a1b127caa90a..502822059498 100644 --- a/drivers/media/platform/qcom/venus/pm_helpers.c +++ b/drivers/media/platform/qcom/venus/pm_helpers.c @@ -455,7 +455,7 @@ static int poweroff_coreid(struct venus_core *core, uns= igned int coreid_mask) if (ret) return ret; =20 - ret =3D pm_runtime_put_sync(core->pmdomains[1]); + ret =3D pm_runtime_put_sync(core->pmdomains->pd_devs[1]); if (ret < 0) return ret; } @@ -471,7 +471,7 @@ static int poweroff_coreid(struct venus_core *core, uns= igned int coreid_mask) if (ret) return ret; =20 - ret =3D pm_runtime_put_sync(core->pmdomains[2]); + ret =3D pm_runtime_put_sync(core->pmdomains->pd_devs[2]); if (ret < 0) return ret; } @@ -484,7 +484,7 @@ static int poweron_coreid(struct venus_core *core, unsi= gned int coreid_mask) int ret; =20 if (coreid_mask & VIDC_CORE_ID_1) { - ret =3D pm_runtime_get_sync(core->pmdomains[1]); + ret =3D pm_runtime_get_sync(core->pmdomains->pd_devs[1]); if (ret < 0) return ret; =20 @@ -502,7 +502,7 @@ static int poweron_coreid(struct venus_core *core, unsi= gned int coreid_mask) } =20 if (coreid_mask & VIDC_CORE_ID_2) { - ret =3D pm_runtime_get_sync(core->pmdomains[2]); + ret =3D pm_runtime_get_sync(core->pmdomains->pd_devs[2]); if (ret < 0) return ret; =20 @@ -860,19 +860,18 @@ static int vcodec_domains_get(struct venus_core *core) struct device **opp_virt_dev; struct device *dev =3D core->dev; const struct venus_resources *res =3D core->res; - struct device *pd; - unsigned int i; + struct dev_pm_domain_attach_data vcodec_data =3D { + .pd_names =3D res->vcodec_pmdomains, + .num_pd_names =3D res->vcodec_pmdomains_num, + .pd_flags =3D PD_FLAG_NO_DEV_LINK, + }; =20 if (!res->vcodec_pmdomains_num) goto skip_pmdomains; =20 - for (i =3D 0; i < res->vcodec_pmdomains_num; i++) { - pd =3D dev_pm_domain_attach_by_name(dev, - res->vcodec_pmdomains[i]); - if (IS_ERR_OR_NULL(pd)) - return pd ? PTR_ERR(pd) : -ENODATA; - core->pmdomains[i] =3D pd; - } + ret =3D dev_pm_domain_attach_list(dev, &vcodec_data, &core->pmdomains); + if (ret < 0) + return ret; =20 skip_pmdomains: if (!core->res->opp_pmdomain) @@ -896,30 +895,14 @@ static int vcodec_domains_get(struct venus_core *core) return 0; =20 opp_attach_err: - for (i =3D 0; i < res->vcodec_pmdomains_num; i++) { - if (IS_ERR_OR_NULL(core->pmdomains[i])) - continue; - dev_pm_domain_detach(core->pmdomains[i], true); - } - + dev_pm_domain_detach_list(core->pmdomains); return ret; } =20 static void vcodec_domains_put(struct venus_core *core) { - const struct venus_resources *res =3D core->res; - unsigned int i; + dev_pm_domain_detach_list(core->pmdomains); =20 - if (!res->vcodec_pmdomains_num) - goto skip_pmdomains; - - for (i =3D 0; i < res->vcodec_pmdomains_num; i++) { - if (IS_ERR_OR_NULL(core->pmdomains[i])) - continue; - dev_pm_domain_detach(core->pmdomains[i], true); - } - -skip_pmdomains: if (!core->has_opp_table) return; =20 @@ -1035,7 +1018,8 @@ static void core_put_v4(struct venus_core *core) static int core_power_v4(struct venus_core *core, int on) { struct device *dev =3D core->dev; - struct device *pmctrl =3D core->pmdomains[0]; + struct device *pmctrl =3D core->pmdomains ? + core->pmdomains->pd_devs[0] : NULL; int ret =3D 0; =20 if (on =3D=3D POWER_ON) { --=20 2.34.1