All of lore.kernel.org
 help / color / mirror / Atom feed
From: Peng Fan <peng.fan@nxp.com>
To: bjorn.andersson@linaro.org, mathieu.poirier@linaro.org,
	o.rempel@pengutronix.de, robh+dt@kernel.org
Cc: linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org,
	shawnguo@kernel.org, s.hauer@pengutronix.de,
	kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com,
	linux-arm-kernel@lists.infradead.org, Peng Fan <peng.fan@nxp.com>,
	Richard Zhu <hongxing.zhu@nxp.com>
Subject: [PATCH V2 2/7] remoteproc: imx_rproc: add elf memory hooks
Date: Sun, 27 Sep 2020 14:41:26 +0800	[thread overview]
Message-ID: <20200927064131.24101-3-peng.fan@nxp.com> (raw)
In-Reply-To: <20200927064131.24101-1-peng.fan@nxp.com>

Add elf memory hooks according to elf_mem_hook setting in the platform
configuration dcfg.

Acked-by: Richard Zhu <hongxing.zhu@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
 drivers/remoteproc/imx_rproc.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
index 8957ed271d20..d1abb253b499 100644
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -6,6 +6,7 @@
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/interrupt.h>
+#include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/mfd/syscon.h>
 #include <linux/module.h>
@@ -76,6 +77,7 @@ struct imx_rproc_dcfg {
 	u32				src_stop;
 	const struct imx_rproc_att	*att;
 	size_t				att_size;
+	bool				elf_mem_hook;
 };
 
 struct imx_rproc {
@@ -310,6 +312,16 @@ static int imx_rproc_addr_init(struct imx_rproc *priv,
 	return 0;
 }
 
+static void imx_rproc_memcpy(struct rproc *rproc, void *dest, const void *src, size_t count)
+{
+	memcpy_toio((void * __iomem)dest, src, count);
+}
+
+static void imx_rproc_memset(struct rproc *rproc, void *s, int c, size_t count)
+{
+	memset_io((void * __iomem)s, c, count);
+}
+
 static int imx_rproc_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
@@ -340,6 +352,11 @@ static int imx_rproc_probe(struct platform_device *pdev)
 		goto err_put_rproc;
 	}
 
+	if (dcfg->elf_mem_hook) {
+		rproc->ops->elf_memcpy = imx_rproc_memcpy;
+		rproc->ops->elf_memset = imx_rproc_memset;
+	}
+
 	priv = rproc->priv;
 	priv->rproc = rproc;
 	priv->regmap = regmap;
-- 
2.28.0


WARNING: multiple messages have this Message-ID (diff)
From: Peng Fan <peng.fan@nxp.com>
To: bjorn.andersson@linaro.org, mathieu.poirier@linaro.org,
	o.rempel@pengutronix.de, robh+dt@kernel.org
Cc: Peng Fan <peng.fan@nxp.com>, Richard Zhu <hongxing.zhu@nxp.com>,
	festevam@gmail.com, s.hauer@pengutronix.de,
	linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-imx@nxp.com, kernel@pengutronix.de, shawnguo@kernel.org,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH V2 2/7] remoteproc: imx_rproc: add elf memory hooks
Date: Sun, 27 Sep 2020 14:41:26 +0800	[thread overview]
Message-ID: <20200927064131.24101-3-peng.fan@nxp.com> (raw)
In-Reply-To: <20200927064131.24101-1-peng.fan@nxp.com>

Add elf memory hooks according to elf_mem_hook setting in the platform
configuration dcfg.

Acked-by: Richard Zhu <hongxing.zhu@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
 drivers/remoteproc/imx_rproc.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
index 8957ed271d20..d1abb253b499 100644
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -6,6 +6,7 @@
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/interrupt.h>
+#include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/mfd/syscon.h>
 #include <linux/module.h>
@@ -76,6 +77,7 @@ struct imx_rproc_dcfg {
 	u32				src_stop;
 	const struct imx_rproc_att	*att;
 	size_t				att_size;
+	bool				elf_mem_hook;
 };
 
 struct imx_rproc {
@@ -310,6 +312,16 @@ static int imx_rproc_addr_init(struct imx_rproc *priv,
 	return 0;
 }
 
+static void imx_rproc_memcpy(struct rproc *rproc, void *dest, const void *src, size_t count)
+{
+	memcpy_toio((void * __iomem)dest, src, count);
+}
+
+static void imx_rproc_memset(struct rproc *rproc, void *s, int c, size_t count)
+{
+	memset_io((void * __iomem)s, c, count);
+}
+
 static int imx_rproc_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
@@ -340,6 +352,11 @@ static int imx_rproc_probe(struct platform_device *pdev)
 		goto err_put_rproc;
 	}
 
+	if (dcfg->elf_mem_hook) {
+		rproc->ops->elf_memcpy = imx_rproc_memcpy;
+		rproc->ops->elf_memset = imx_rproc_memset;
+	}
+
 	priv = rproc->priv;
 	priv->rproc = rproc;
 	priv->regmap = regmap;
-- 
2.28.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2020-09-27  6:15 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-27  6:41 [PATCH V2 0/7] remoteproc: imx_rproc: support iMX8MQ/M Peng Fan
2020-09-27  6:41 ` Peng Fan
2020-09-27  6:41 ` [PATCH V2 1/7] remoteproc: elf: support platform specific memory hook Peng Fan
2020-09-27  6:41   ` Peng Fan
2020-10-19 16:58   ` Mathieu Poirier
2020-10-19 16:58     ` Mathieu Poirier
2020-09-27  6:41 ` Peng Fan [this message]
2020-09-27  6:41   ` [PATCH V2 2/7] remoteproc: imx_rproc: add elf memory hooks Peng Fan
2020-09-27  6:41 ` [PATCH V2 3/7] remoteproc: imx_rproc: correct err message Peng Fan
2020-09-27  6:41   ` Peng Fan
2020-09-27  6:41 ` [PATCH V2 4/7] remoteproc: imx_rproc: use devm_ioremap Peng Fan
2020-09-27  6:41   ` Peng Fan
2020-10-19 17:24   ` Mathieu Poirier
2020-10-19 17:24     ` Mathieu Poirier
2020-09-27  6:41 ` [PATCH V2 5/7] remoteproc: imx_rproc: add i.MX specific parse fw hook Peng Fan
2020-09-27  6:41   ` Peng Fan
2020-10-19 17:48   ` Mathieu Poirier
2020-10-19 17:48     ` Mathieu Poirier
2020-09-27  6:41 ` [PATCH V2 6/7] remoteproc: imx_rproc: support i.MX8MQ/M Peng Fan
2020-09-27  6:41   ` Peng Fan
2020-10-19 17:59   ` Mathieu Poirier
2020-10-19 17:59     ` Mathieu Poirier
2020-09-27  6:41 ` [PATCH V2 7/7] remoteproc: imx_proc: enable virtio/mailbox Peng Fan
2020-09-27  6:41   ` Peng Fan
2020-10-19 20:12   ` Mathieu Poirier
2020-10-19 20:12     ` Mathieu Poirier
2020-10-08  0:52 ` [PATCH V2 0/7] remoteproc: imx_rproc: support iMX8MQ/M Peng Fan
2020-10-08  0:52   ` Peng Fan
2020-10-08 14:40   ` Mathieu Poirier
2020-10-08 14:40     ` Mathieu Poirier
2020-10-09  2:02     ` Peng Fan
2020-10-09  2:02       ` Peng Fan

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=20200927064131.24101-3-peng.fan@nxp.com \
    --to=peng.fan@nxp.com \
    --cc=bjorn.andersson@linaro.org \
    --cc=festevam@gmail.com \
    --cc=hongxing.zhu@nxp.com \
    --cc=kernel@pengutronix.de \
    --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=o.rempel@pengutronix.de \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.