From: "Peng Fan (OSS)" <peng.fan@oss.nxp.com>
To: bjorn.andersson@linaro.org, mathieu.poirier@linaro.org,
robh+dt@kernel.org, krzysztof.kozlowski@canonical.com
Cc: shawnguo@kernel.org, s.hauer@pengutronix.de,
kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com,
linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, Peng Fan <peng.fan@nxp.com>
Subject: [PATCH V2 4/6] remoteproc: imx_rproc: support kicking Mcore from Linux for i.MX8QXP
Date: Wed, 9 Mar 2022 18:21:16 +0800 [thread overview]
Message-ID: <20220309102118.8131-5-peng.fan@oss.nxp.com> (raw)
In-Reply-To: <20220309102118.8131-1-peng.fan@oss.nxp.com>
From: Peng Fan <peng.fan@nxp.com>
When M4 is in the same hardware partition with Cortex-A, it
could be start/stop by Linux.
Added power domain to make sure M4 could run, it requires several power
domains to work. Make clk always optional for i.MX8QXP, because
SCFW handles it when power up M4 core.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
drivers/remoteproc/imx_rproc.c | 69 +++++++++++++++++++++++++++++++++-
1 file changed, 67 insertions(+), 2 deletions(-)
diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
index 6ed53c660c18..7b84fb6d168f 100644
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -16,6 +16,7 @@
#include <linux/of_reserved_mem.h>
#include <linux/of_device.h>
#include <linux/platform_device.h>
+#include <linux/pm_domain.h>
#include <linux/regmap.h>
#include <linux/remoteproc.h>
#include <linux/workqueue.h>
@@ -96,6 +97,10 @@ struct imx_rproc {
struct notifier_block proc_nb;
u32 rproc_pt; /* partition id */
u32 rsrc; /* resource id */
+ u32 entry; /* cpu start address */
+ int num_pd;
+ struct device **pd_dev;
+ struct device_link **pd_dev_link;
};
static const struct imx_rproc_att imx_rproc_att_imx8qxp[] = {
@@ -304,6 +309,9 @@ static int imx_rproc_start(struct rproc *rproc)
arm_smccc_smc(IMX_SIP_RPROC, IMX_SIP_RPROC_START, 0, 0, 0, 0, 0, 0, &res);
ret = res.a0;
break;
+ case IMX_RPROC_SCU_API:
+ ret = imx_sc_pm_cpu_start(priv->ipc_handle, priv->rsrc, true, priv->entry);
+ break;
default:
return -EOPNOTSUPP;
}
@@ -333,6 +341,9 @@ static int imx_rproc_stop(struct rproc *rproc)
if (res.a1)
dev_info(dev, "Not in wfi, force stopped\n");
break;
+ case IMX_RPROC_SCU_API:
+ ret = imx_sc_pm_cpu_start(priv->ipc_handle, priv->rsrc, false, priv->entry);
+ break;
default:
return -EOPNOTSUPP;
}
@@ -703,6 +714,56 @@ static int imx_rproc_partition_notify(struct notifier_block *nb,
return 0;
}
+static int imx_rproc_attach_pd(struct imx_rproc *priv)
+{
+ struct device *dev = priv->dev;
+ int ret, i;
+
+ priv->num_pd = of_count_phandle_with_args(dev->of_node, "power-domains",
+ "#power-domain-cells");
+ if (priv->num_pd < 0)
+ return priv->num_pd;
+
+ if (!priv->num_pd)
+ 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_detect_mode(struct imx_rproc *priv)
{
struct regmap_config config = { .name = "imx-rproc" };
@@ -737,8 +798,12 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv)
* If Mcore resource is not owned by Acore partition, It is kicked by ROM,
* and Linux could only do IPC with Mcore and nothing else.
*/
- if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc))
- return 0;
+ if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc)) {
+ if (of_property_read_u32(dev->of_node, "entry", &priv->entry))
+ return -EINVAL;
+
+ return imx_rproc_attach_pd(priv);
+ }
rproc_set_feature(priv->rproc, RPROC_FEAT_ATTACH_RECOVERY);
priv->rproc->state = RPROC_DETACHED;
--
2.30.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-03-09 9:58 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-09 10:21 [PATCH V2 0/6] remoteproc: imx_rproc: support i.MX8QM/QXP Peng Fan (OSS)
2022-03-09 10:21 ` [PATCH V2 1/6] dt-bindings: remoteproc: imx_rproc: support i.MX8QXP Peng Fan (OSS)
2022-03-09 17:18 ` Krzysztof Kozlowski
2022-03-11 1:59 ` Peng Fan
2022-03-09 10:21 ` [PATCH V2 2/6] dt-bindings: remoteproc: imx_rproc: support i.MX8QM Peng Fan (OSS)
2022-03-10 23:09 ` Rob Herring
2022-03-11 1:58 ` Peng Fan
2022-03-14 22:38 ` Bjorn Andersson
2022-03-09 10:21 ` [PATCH V2 3/6] remoteproc: imx_rproc: support attaching to i.MX8QXP M4 Peng Fan (OSS)
2022-03-09 10:21 ` Peng Fan (OSS) [this message]
2022-03-09 10:21 ` [PATCH V2 5/6] remoteproc: imx_rproc: support i.MX8QM Peng Fan (OSS)
2022-03-09 10:21 ` [PATCH V2 6/6] remoteproc: imx_rproc: request mbox channel later Peng Fan (OSS)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220309102118.8131-5-peng.fan@oss.nxp.com \
--to=peng.fan@oss.nxp.com \
--cc=bjorn.andersson@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=festevam@gmail.com \
--cc=kernel@pengutronix.de \
--cc=krzysztof.kozlowski@canonical.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=mathieu.poirier@linaro.org \
--cc=peng.fan@nxp.com \
--cc=robh+dt@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).