[PATCH 1/4] remoteproc: fix the wrong default value of is_iomem

Subsystems: remote processor (remoteproc) subsystem, the rest

STALE1847d

13 messages, 5 authors, 2021-07-13 · open the first message on its own page

[PATCH 1/4] remoteproc: fix the wrong default value of is_iomem

From: Dong Aisheng <aisheng.dong@nxp.com>
Date: 2021-07-06 14:27:15

Currently the is_iomem is a random value in the stack which may
be default to true even on those platforms that not use iomem to
store firmware.

Cc: Bjorn Andersson <redacted>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Peng Fan <peng.fan@nxp.com>
Fixes: 40df0a91b2a5 ("remoteproc: add is_iomem to da_to_va")
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
---
 drivers/remoteproc/remoteproc_elf_loader.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/remoteproc/remoteproc_elf_loader.c b/drivers/remoteproc/remoteproc_elf_loader.c
index 469c52e62faf..2bee4d5a0995 100644
--- a/drivers/remoteproc/remoteproc_elf_loader.c
+++ b/drivers/remoteproc/remoteproc_elf_loader.c
@@ -178,8 +178,8 @@ int rproc_elf_load_segments(struct rproc *rproc, const struct firmware *fw)
 		u64 filesz = elf_phdr_get_p_filesz(class, phdr);
 		u64 offset = elf_phdr_get_p_offset(class, phdr);
 		u32 type = elf_phdr_get_p_type(class, phdr);
+		bool is_iomem = false;
 		void *ptr;
-		bool is_iomem;
 
 		if (type != PT_LOAD)
 			continue;
-- 
2.25.1


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

[PATCH 2/4] remoteproc: imx_rproc: fix TCM io memory type

From: Dong Aisheng <aisheng.dong@nxp.com>
Date: 2021-07-06 14:27:32

is_iomem was introduced in the commit 40df0a91b2a5 ("remoteproc: add
is_iomem to da_to_va"), but the driver seemed missed to provide the io
type correctly.
This patch updates remoteproc driver to indicate the TCM on IMX are io
memories. Without the change, remoteroc kick will fail.

Cc: Bjorn Andersson <redacted>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Peng Fan <peng.fan@nxp.com>
Fixes: 40df0a91b2a5 ("remoteproc: add is_iomem to da_to_va")
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
---
 drivers/remoteproc/imx_rproc.c | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
index d88f76f5305e..752f8ab258cf 100644
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -71,6 +71,7 @@ struct imx_rproc_mem {
 /* att flags */
 /* M4 own area. Can be mapped at probe */
 #define ATT_OWN		BIT(1)
+#define ATT_IOMEM	BIT(2)
 
 /* address translation table */
 struct imx_rproc_att {
@@ -117,7 +118,7 @@ struct imx_rproc {
 static const struct imx_rproc_att imx_rproc_att_imx8mn[] = {
 	/* dev addr , sys addr  , size	    , flags */
 	/* ITCM   */
-	{ 0x00000000, 0x007E0000, 0x00020000, ATT_OWN },
+	{ 0x00000000, 0x007E0000, 0x00020000, ATT_OWN | ATT_IOMEM },
 	/* OCRAM_S */
 	{ 0x00180000, 0x00180000, 0x00009000, 0 },
 	/* OCRAM */
@@ -131,7 +132,7 @@ static const struct imx_rproc_att imx_rproc_att_imx8mn[] = {
 	/* DDR (Code) - alias */
 	{ 0x10000000, 0x40000000, 0x0FFE0000, 0 },
 	/* DTCM */
-	{ 0x20000000, 0x00800000, 0x00020000, ATT_OWN },
+	{ 0x20000000, 0x00800000, 0x00020000, ATT_OWN | ATT_IOMEM },
 	/* OCRAM_S - alias */
 	{ 0x20180000, 0x00180000, 0x00008000, ATT_OWN },
 	/* OCRAM */
@@ -147,7 +148,7 @@ static const struct imx_rproc_att imx_rproc_att_imx8mn[] = {
 static const struct imx_rproc_att imx_rproc_att_imx8mq[] = {
 	/* dev addr , sys addr  , size	    , flags */
 	/* TCML - alias */
-	{ 0x00000000, 0x007e0000, 0x00020000, 0 },
+	{ 0x00000000, 0x007e0000, 0x00020000, ATT_IOMEM},
 	/* OCRAM_S */
 	{ 0x00180000, 0x00180000, 0x00008000, 0 },
 	/* OCRAM */
@@ -159,9 +160,9 @@ static const struct imx_rproc_att imx_rproc_att_imx8mq[] = {
 	/* DDR (Code) - alias */
 	{ 0x10000000, 0x80000000, 0x0FFE0000, 0 },
 	/* TCML */
-	{ 0x1FFE0000, 0x007E0000, 0x00020000, ATT_OWN },
+	{ 0x1FFE0000, 0x007E0000, 0x00020000, ATT_OWN  | ATT_IOMEM},
 	/* TCMU */
-	{ 0x20000000, 0x00800000, 0x00020000, ATT_OWN },
+	{ 0x20000000, 0x00800000, 0x00020000, ATT_OWN  | ATT_IOMEM},
 	/* OCRAM_S */
 	{ 0x20180000, 0x00180000, 0x00008000, ATT_OWN },
 	/* OCRAM */
@@ -199,12 +200,12 @@ static const struct imx_rproc_att imx_rproc_att_imx7d[] = {
 	/* OCRAM_PXP (Code) - alias */
 	{ 0x00940000, 0x00940000, 0x00008000, 0 },
 	/* TCML (Code) */
-	{ 0x1FFF8000, 0x007F8000, 0x00008000, ATT_OWN },
+	{ 0x1FFF8000, 0x007F8000, 0x00008000, ATT_OWN | ATT_IOMEM },
 	/* DDR (Code) - alias, first part of DDR (Data) */
 	{ 0x10000000, 0x80000000, 0x0FFF0000, 0 },
 
 	/* TCMU (Data) */
-	{ 0x20000000, 0x00800000, 0x00008000, ATT_OWN },
+	{ 0x20000000, 0x00800000, 0x00008000, ATT_OWN | ATT_IOMEM },
 	/* OCRAM (Data) */
 	{ 0x20200000, 0x00900000, 0x00020000, 0 },
 	/* OCRAM_EPDC (Data) */
@@ -218,18 +219,18 @@ static const struct imx_rproc_att imx_rproc_att_imx7d[] = {
 static const struct imx_rproc_att imx_rproc_att_imx6sx[] = {
 	/* dev addr , sys addr  , size	    , flags */
 	/* TCML (M4 Boot Code) - alias */
-	{ 0x00000000, 0x007F8000, 0x00008000, 0 },
+	{ 0x00000000, 0x007F8000, 0x00008000, ATT_IOMEM },
 	/* OCRAM_S (Code) */
 	{ 0x00180000, 0x008F8000, 0x00004000, 0 },
 	/* OCRAM_S (Code) - alias */
 	{ 0x00180000, 0x008FC000, 0x00004000, 0 },
 	/* TCML (Code) */
-	{ 0x1FFF8000, 0x007F8000, 0x00008000, ATT_OWN },
+	{ 0x1FFF8000, 0x007F8000, 0x00008000, ATT_OWN | ATT_IOMEM },
 	/* DDR (Code) - alias, first part of DDR (Data) */
 	{ 0x10000000, 0x80000000, 0x0FFF8000, 0 },
 
 	/* TCMU (Data) */
-	{ 0x20000000, 0x00800000, 0x00008000, ATT_OWN },
+	{ 0x20000000, 0x00800000, 0x00008000, ATT_OWN | ATT_IOMEM },
 	/* OCRAM_S (Data) - alias? */
 	{ 0x208F8000, 0x008F8000, 0x00004000, 0 },
 	/* DDR (Data) */
@@ -341,7 +342,7 @@ static int imx_rproc_stop(struct rproc *rproc)
 }
 
 static int imx_rproc_da_to_sys(struct imx_rproc *priv, u64 da,
-			       size_t len, u64 *sys)
+			       size_t len, u64 *sys, bool *is_iomem)
 {
 	const struct imx_rproc_dcfg *dcfg = priv->dcfg;
 	int i;
@@ -354,6 +355,8 @@ static int imx_rproc_da_to_sys(struct imx_rproc *priv, u64 da,
 			unsigned int offset = da - att->da;
 
 			*sys = att->sa + offset;
+			if (is_iomem)
+				*is_iomem = att->flags & ATT_IOMEM;
 			return 0;
 		}
 	}
@@ -377,7 +380,7 @@ static void *imx_rproc_da_to_va(struct rproc *rproc, u64 da, size_t len, bool *i
 	 * On device side we have many aliases, so we need to convert device
 	 * address (M4) to system bus address first.
 	 */
-	if (imx_rproc_da_to_sys(priv, da, len, &sys))
+	if (imx_rproc_da_to_sys(priv, da, len, &sys, is_iomem))
 		return NULL;
 
 	for (i = 0; i < IMX_RPROC_MEM_MAX; i++) {
-- 
2.25.1


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

[PATCH 3/4] remoteproc: imx_rproc: fix ignoring mapping vdev regions

From: Dong Aisheng <aisheng.dong@nxp.com>
Date: 2021-07-06 14:27:42

vdev regions are typically named vdev0buffer, vdev0ring0, vdev0ring1 and
etc. Change to strncmp to cover them all.

Fixes: 8f2d8961640f ("remoteproc: imx_rproc: ignore mapping vdev regions")
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
---
 drivers/remoteproc/imx_rproc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
index 752f8ab258cf..12de153abb2d 100644
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -578,8 +578,8 @@ static int imx_rproc_addr_init(struct imx_rproc *priv,
 		struct resource res;
 
 		node = of_parse_phandle(np, "memory-region", a);
-		/* Not map vdev region */
-		if (!strcmp(node->name, "vdev"))
+		/* Not map vdevbuffer, vdevring region */
+		if (!strncmp(node->name, "vdev", strlen("vdev")))
 			continue;
 		err = of_address_to_resource(node, 0, &res);
 		if (err) {
-- 
2.25.1


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

[PATCH 4/4] remoteproc: imx_rproc: fix rsc-table name

From: Dong Aisheng <aisheng.dong@nxp.com>
Date: 2021-07-06 14:28:01

Usually the dash '-'  is preferred in node name.
So far, not dts in upstream kernel, so we just update node name
in driver.

Cc: Bjorn Andersson <redacted>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Peng Fan <peng.fan@nxp.com>
Fixes: 5e4c1243071d ("remoteproc: imx_rproc: support remote cores booted before Linux Kernel")
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
---
 drivers/remoteproc/imx_rproc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
index 12de153abb2d..26eb130f3263 100644
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -600,7 +600,7 @@ static int imx_rproc_addr_init(struct imx_rproc *priv,
 		}
 		priv->mem[b].sys_addr = res.start;
 		priv->mem[b].size = resource_size(&res);
-		if (!strcmp(node->name, "rsc_table"))
+		if (!strcmp(node->name, "rsc-table"))
 			priv->rsc_table = priv->mem[b].cpu_addr;
 		b++;
 	}
-- 
2.25.1


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

RE: [PATCH 1/4] remoteproc: fix the wrong default value of is_iomem

From: Peng Fan <peng.fan@nxp.com>
Date: 2021-07-07 02:16:34

Subject: [PATCH 1/4] remoteproc: fix the wrong default value of is_iomem

Currently the is_iomem is a random value in the stack which may be default
to true even on those platforms that not use iomem to store firmware.

Cc: Bjorn Andersson <redacted>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Peng Fan <peng.fan@nxp.com>
Fixes: 40df0a91b2a5 ("remoteproc: add is_iomem to da_to_va")
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
---
Please also include rproc_copy_segment.

Thanks,
Peng.
quoted hunk
 drivers/remoteproc/remoteproc_elf_loader.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/remoteproc/remoteproc_elf_loader.c
b/drivers/remoteproc/remoteproc_elf_loader.c
index 469c52e62faf..2bee4d5a0995 100644
--- a/drivers/remoteproc/remoteproc_elf_loader.c
+++ b/drivers/remoteproc/remoteproc_elf_loader.c
@@ -178,8 +178,8 @@ int rproc_elf_load_segments(struct rproc *rproc,
const struct firmware *fw)
 		u64 filesz = elf_phdr_get_p_filesz(class, phdr);
 		u64 offset = elf_phdr_get_p_offset(class, phdr);
 		u32 type = elf_phdr_get_p_type(class, phdr);
+		bool is_iomem = false;
 		void *ptr;
-		bool is_iomem;

 		if (type != PT_LOAD)
 			continue;
--
2.25.1

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

RE: [PATCH 2/4] remoteproc: imx_rproc: fix TCM io memory type

From: Peng Fan <peng.fan@nxp.com>
Date: 2021-07-07 02:22:21

Subject: [PATCH 2/4] remoteproc: imx_rproc: fix TCM io memory type

is_iomem was introduced in the commit 40df0a91b2a5 ("remoteproc: add
is_iomem to da_to_va"), but the driver seemed missed to provide the io type
correctly.
This patch updates remoteproc driver to indicate the TCM on IMX are io
memories. Without the change, remoteroc kick will fail.
All ATT_OWN memory are mapped using devm_ioremap, so only mark
TCM as io memories is not enough.

You could force all as iomem or update to use other map variants.
Cc: Bjorn Andersson <redacted>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Peng Fan <peng.fan@nxp.com>
Fixes: 40df0a91b2a5 ("remoteproc: add is_iomem to da_to_va")
The i.MX8MN/Q is later that the patch, please update the fix.

Regards,
Peng.
quoted hunk
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
---
 drivers/remoteproc/imx_rproc.c | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/drivers/remoteproc/imx_rproc.c
b/drivers/remoteproc/imx_rproc.c index d88f76f5305e..752f8ab258cf
100644
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -71,6 +71,7 @@ struct imx_rproc_mem {
 /* att flags */
 /* M4 own area. Can be mapped at probe */
 #define ATT_OWN		BIT(1)
+#define ATT_IOMEM	BIT(2)

 /* address translation table */
 struct imx_rproc_att {
@@ -117,7 +118,7 @@ struct imx_rproc {
 static const struct imx_rproc_att imx_rproc_att_imx8mn[] = {
 	/* dev addr , sys addr  , size	    , flags */
 	/* ITCM   */
-	{ 0x00000000, 0x007E0000, 0x00020000, ATT_OWN },
+	{ 0x00000000, 0x007E0000, 0x00020000, ATT_OWN | ATT_IOMEM },
 	/* OCRAM_S */
 	{ 0x00180000, 0x00180000, 0x00009000, 0 },
 	/* OCRAM */
@@ -131,7 +132,7 @@ static const struct imx_rproc_att
imx_rproc_att_imx8mn[] = {
 	/* DDR (Code) - alias */
 	{ 0x10000000, 0x40000000, 0x0FFE0000, 0 },
 	/* DTCM */
-	{ 0x20000000, 0x00800000, 0x00020000, ATT_OWN },
+	{ 0x20000000, 0x00800000, 0x00020000, ATT_OWN | ATT_IOMEM },
 	/* OCRAM_S - alias */
 	{ 0x20180000, 0x00180000, 0x00008000, ATT_OWN },
 	/* OCRAM */
@@ -147,7 +148,7 @@ static const struct imx_rproc_att
imx_rproc_att_imx8mn[] = {  static const struct imx_rproc_att
imx_rproc_att_imx8mq[] = {
 	/* dev addr , sys addr  , size	    , flags */
 	/* TCML - alias */
-	{ 0x00000000, 0x007e0000, 0x00020000, 0 },
+	{ 0x00000000, 0x007e0000, 0x00020000, ATT_IOMEM},
 	/* OCRAM_S */
 	{ 0x00180000, 0x00180000, 0x00008000, 0 },
 	/* OCRAM */
@@ -159,9 +160,9 @@ static const struct imx_rproc_att
imx_rproc_att_imx8mq[] = {
 	/* DDR (Code) - alias */
 	{ 0x10000000, 0x80000000, 0x0FFE0000, 0 },
 	/* TCML */
-	{ 0x1FFE0000, 0x007E0000, 0x00020000, ATT_OWN },
+	{ 0x1FFE0000, 0x007E0000, 0x00020000, ATT_OWN  | ATT_IOMEM},
 	/* TCMU */
-	{ 0x20000000, 0x00800000, 0x00020000, ATT_OWN },
+	{ 0x20000000, 0x00800000, 0x00020000, ATT_OWN  | ATT_IOMEM},
 	/* OCRAM_S */
 	{ 0x20180000, 0x00180000, 0x00008000, ATT_OWN },
 	/* OCRAM */
@@ -199,12 +200,12 @@ static const struct imx_rproc_att
imx_rproc_att_imx7d[] = {
 	/* OCRAM_PXP (Code) - alias */
 	{ 0x00940000, 0x00940000, 0x00008000, 0 },
 	/* TCML (Code) */
-	{ 0x1FFF8000, 0x007F8000, 0x00008000, ATT_OWN },
+	{ 0x1FFF8000, 0x007F8000, 0x00008000, ATT_OWN | ATT_IOMEM },
 	/* DDR (Code) - alias, first part of DDR (Data) */
 	{ 0x10000000, 0x80000000, 0x0FFF0000, 0 },

 	/* TCMU (Data) */
-	{ 0x20000000, 0x00800000, 0x00008000, ATT_OWN },
+	{ 0x20000000, 0x00800000, 0x00008000, ATT_OWN | ATT_IOMEM },
 	/* OCRAM (Data) */
 	{ 0x20200000, 0x00900000, 0x00020000, 0 },
 	/* OCRAM_EPDC (Data) */
@@ -218,18 +219,18 @@ static const struct imx_rproc_att
imx_rproc_att_imx7d[] = {  static const struct imx_rproc_att
imx_rproc_att_imx6sx[] = {
 	/* dev addr , sys addr  , size	    , flags */
 	/* TCML (M4 Boot Code) - alias */
-	{ 0x00000000, 0x007F8000, 0x00008000, 0 },
+	{ 0x00000000, 0x007F8000, 0x00008000, ATT_IOMEM },
 	/* OCRAM_S (Code) */
 	{ 0x00180000, 0x008F8000, 0x00004000, 0 },
 	/* OCRAM_S (Code) - alias */
 	{ 0x00180000, 0x008FC000, 0x00004000, 0 },
 	/* TCML (Code) */
-	{ 0x1FFF8000, 0x007F8000, 0x00008000, ATT_OWN },
+	{ 0x1FFF8000, 0x007F8000, 0x00008000, ATT_OWN | ATT_IOMEM },
 	/* DDR (Code) - alias, first part of DDR (Data) */
 	{ 0x10000000, 0x80000000, 0x0FFF8000, 0 },

 	/* TCMU (Data) */
-	{ 0x20000000, 0x00800000, 0x00008000, ATT_OWN },
+	{ 0x20000000, 0x00800000, 0x00008000, ATT_OWN | ATT_IOMEM },
 	/* OCRAM_S (Data) - alias? */
 	{ 0x208F8000, 0x008F8000, 0x00004000, 0 },
 	/* DDR (Data) */
@@ -341,7 +342,7 @@ static int imx_rproc_stop(struct rproc *rproc)  }

 static int imx_rproc_da_to_sys(struct imx_rproc *priv, u64 da,
-			       size_t len, u64 *sys)
+			       size_t len, u64 *sys, bool *is_iomem)
 {
 	const struct imx_rproc_dcfg *dcfg = priv->dcfg;
 	int i;
@@ -354,6 +355,8 @@ static int imx_rproc_da_to_sys(struct imx_rproc *priv,
u64 da,
 			unsigned int offset = da - att->da;

 			*sys = att->sa + offset;
+			if (is_iomem)
+				*is_iomem = att->flags & ATT_IOMEM;
 			return 0;
 		}
 	}
@@ -377,7 +380,7 @@ static void *imx_rproc_da_to_va(struct rproc *rproc,
u64 da, size_t len, bool *i
 	 * On device side we have many aliases, so we need to convert device
 	 * address (M4) to system bus address first.
 	 */
-	if (imx_rproc_da_to_sys(priv, da, len, &sys))
+	if (imx_rproc_da_to_sys(priv, da, len, &sys, is_iomem))
 		return NULL;

 	for (i = 0; i < IMX_RPROC_MEM_MAX; i++) {
--
2.25.1

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

RE: [PATCH 4/4] remoteproc: imx_rproc: fix rsc-table name

From: Peng Fan (OSS) <hidden>
Date: 2021-07-07 02:22:52

quoted hunk
Subject: [PATCH 4/4] remoteproc: imx_rproc: fix rsc-table name

Usually the dash '-'  is preferred in node name.
So far, not dts in upstream kernel, so we just update node name in driver.

Cc: Bjorn Andersson <redacted>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Peng Fan <peng.fan@nxp.com>
Fixes: 5e4c1243071d ("remoteproc: imx_rproc: support remote cores booted
before Linux Kernel")
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
---
 drivers/remoteproc/imx_rproc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/remoteproc/imx_rproc.c
b/drivers/remoteproc/imx_rproc.c index 12de153abb2d..26eb130f3263
100644
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -600,7 +600,7 @@ static int imx_rproc_addr_init(struct imx_rproc *priv,
 		}
 		priv->mem[b].sys_addr = res.start;
 		priv->mem[b].size = resource_size(&res);
-		if (!strcmp(node->name, "rsc_table"))
+		if (!strcmp(node->name, "rsc-table"))
 			priv->rsc_table = priv->mem[b].cpu_addr;
 		b++;
 	}
Reviewed-by: Peng Fan <peng.fan@nxp.com>
--
2.25.1

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

RE: [PATCH 3/4] remoteproc: imx_rproc: fix ignoring mapping vdev regions

From: Peng Fan (OSS) <hidden>
Date: 2021-07-07 02:25:17

quoted hunk
Subject: [PATCH 3/4] remoteproc: imx_rproc: fix ignoring mapping vdev
regions

vdev regions are typically named vdev0buffer, vdev0ring0, vdev0ring1 and etc.
Change to strncmp to cover them all.

Fixes: 8f2d8961640f ("remoteproc: imx_rproc: ignore mapping vdev regions")
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
---
 drivers/remoteproc/imx_rproc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/remoteproc/imx_rproc.c
b/drivers/remoteproc/imx_rproc.c index 752f8ab258cf..12de153abb2d
100644
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -578,8 +578,8 @@ static int imx_rproc_addr_init(struct imx_rproc *priv,
 		struct resource res;

 		node = of_parse_phandle(np, "memory-region", a);
-		/* Not map vdev region */
-		if (!strcmp(node->name, "vdev"))
+		/* Not map vdevbuffer, vdevring region */
+		if (!strncmp(node->name, "vdev", strlen("vdev")))
 			continue;
 		err = of_address_to_resource(node, 0, &res);
 		if (err) {
Reviewed-by: Peng Fan <peng.fan@nxp.com>
--
2.25.1

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

Re: [PATCH 1/4] remoteproc: fix the wrong default value of is_iomem

From: Dong Aisheng <hidden>
Date: 2021-07-07 03:29:46

On Wed, Jul 7, 2021 at 10:14 AM Peng Fan [off-list ref] wrote:
quoted
Subject: [PATCH 1/4] remoteproc: fix the wrong default value of is_iomem

Currently the is_iomem is a random value in the stack which may be default
to true even on those platforms that not use iomem to store firmware.

Cc: Bjorn Andersson <redacted>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Peng Fan <peng.fan@nxp.com>
Fixes: 40df0a91b2a5 ("remoteproc: add is_iomem to da_to_va")
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
---
Please also include rproc_copy_segment.
Thanks for catching this
WIll update

Regards
Aisheng
Thanks,
Peng.
quoted
 drivers/remoteproc/remoteproc_elf_loader.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/remoteproc/remoteproc_elf_loader.c
b/drivers/remoteproc/remoteproc_elf_loader.c
index 469c52e62faf..2bee4d5a0995 100644
--- a/drivers/remoteproc/remoteproc_elf_loader.c
+++ b/drivers/remoteproc/remoteproc_elf_loader.c
@@ -178,8 +178,8 @@ int rproc_elf_load_segments(struct rproc *rproc,
const struct firmware *fw)
              u64 filesz = elf_phdr_get_p_filesz(class, phdr);
              u64 offset = elf_phdr_get_p_offset(class, phdr);
              u32 type = elf_phdr_get_p_type(class, phdr);
+             bool is_iomem = false;
              void *ptr;
-             bool is_iomem;

              if (type != PT_LOAD)
                      continue;
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 2/4] remoteproc: imx_rproc: fix TCM io memory type

From: Dong Aisheng <hidden>
Date: 2021-07-07 06:09:16

On Wed, Jul 7, 2021 at 10:20 AM Peng Fan [off-list ref] wrote:
quoted
Subject: [PATCH 2/4] remoteproc: imx_rproc: fix TCM io memory type

is_iomem was introduced in the commit 40df0a91b2a5 ("remoteproc: add
is_iomem to da_to_va"), but the driver seemed missed to provide the io type
correctly.
This patch updates remoteproc driver to indicate the TCM on IMX are io
memories. Without the change, remoteroc kick will fail.
All ATT_OWN memory are mapped using devm_ioremap, so only mark
TCM as io memories is not enough.

You could force all as iomem or update to use other map variants.
Will update, thanks.

Regards
Aisheng
quoted
Cc: Bjorn Andersson <redacted>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Peng Fan <peng.fan@nxp.com>
Fixes: 40df0a91b2a5 ("remoteproc: add is_iomem to da_to_va")
The i.MX8MN/Q is later that the patch, please update the fix.

Regards,
Peng.
quoted
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
---
 drivers/remoteproc/imx_rproc.c | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/drivers/remoteproc/imx_rproc.c
b/drivers/remoteproc/imx_rproc.c index d88f76f5305e..752f8ab258cf
100644
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -71,6 +71,7 @@ struct imx_rproc_mem {
 /* att flags */
 /* M4 own area. Can be mapped at probe */
 #define ATT_OWN              BIT(1)
+#define ATT_IOMEM    BIT(2)

 /* address translation table */
 struct imx_rproc_att {
@@ -117,7 +118,7 @@ struct imx_rproc {
 static const struct imx_rproc_att imx_rproc_att_imx8mn[] = {
      /* dev addr , sys addr  , size      , flags */
      /* ITCM   */
-     { 0x00000000, 0x007E0000, 0x00020000, ATT_OWN },
+     { 0x00000000, 0x007E0000, 0x00020000, ATT_OWN | ATT_IOMEM },
      /* OCRAM_S */
      { 0x00180000, 0x00180000, 0x00009000, 0 },
      /* OCRAM */
@@ -131,7 +132,7 @@ static const struct imx_rproc_att
imx_rproc_att_imx8mn[] = {
      /* DDR (Code) - alias */
      { 0x10000000, 0x40000000, 0x0FFE0000, 0 },
      /* DTCM */
-     { 0x20000000, 0x00800000, 0x00020000, ATT_OWN },
+     { 0x20000000, 0x00800000, 0x00020000, ATT_OWN | ATT_IOMEM },
      /* OCRAM_S - alias */
      { 0x20180000, 0x00180000, 0x00008000, ATT_OWN },
      /* OCRAM */
@@ -147,7 +148,7 @@ static const struct imx_rproc_att
imx_rproc_att_imx8mn[] = {  static const struct imx_rproc_att
imx_rproc_att_imx8mq[] = {
      /* dev addr , sys addr  , size      , flags */
      /* TCML - alias */
-     { 0x00000000, 0x007e0000, 0x00020000, 0 },
+     { 0x00000000, 0x007e0000, 0x00020000, ATT_IOMEM},
      /* OCRAM_S */
      { 0x00180000, 0x00180000, 0x00008000, 0 },
      /* OCRAM */
@@ -159,9 +160,9 @@ static const struct imx_rproc_att
imx_rproc_att_imx8mq[] = {
      /* DDR (Code) - alias */
      { 0x10000000, 0x80000000, 0x0FFE0000, 0 },
      /* TCML */
-     { 0x1FFE0000, 0x007E0000, 0x00020000, ATT_OWN },
+     { 0x1FFE0000, 0x007E0000, 0x00020000, ATT_OWN  | ATT_IOMEM},
      /* TCMU */
-     { 0x20000000, 0x00800000, 0x00020000, ATT_OWN },
+     { 0x20000000, 0x00800000, 0x00020000, ATT_OWN  | ATT_IOMEM},
      /* OCRAM_S */
      { 0x20180000, 0x00180000, 0x00008000, ATT_OWN },
      /* OCRAM */
@@ -199,12 +200,12 @@ static const struct imx_rproc_att
imx_rproc_att_imx7d[] = {
      /* OCRAM_PXP (Code) - alias */
      { 0x00940000, 0x00940000, 0x00008000, 0 },
      /* TCML (Code) */
-     { 0x1FFF8000, 0x007F8000, 0x00008000, ATT_OWN },
+     { 0x1FFF8000, 0x007F8000, 0x00008000, ATT_OWN | ATT_IOMEM },
      /* DDR (Code) - alias, first part of DDR (Data) */
      { 0x10000000, 0x80000000, 0x0FFF0000, 0 },

      /* TCMU (Data) */
-     { 0x20000000, 0x00800000, 0x00008000, ATT_OWN },
+     { 0x20000000, 0x00800000, 0x00008000, ATT_OWN | ATT_IOMEM },
      /* OCRAM (Data) */
      { 0x20200000, 0x00900000, 0x00020000, 0 },
      /* OCRAM_EPDC (Data) */
@@ -218,18 +219,18 @@ static const struct imx_rproc_att
imx_rproc_att_imx7d[] = {  static const struct imx_rproc_att
imx_rproc_att_imx6sx[] = {
      /* dev addr , sys addr  , size      , flags */
      /* TCML (M4 Boot Code) - alias */
-     { 0x00000000, 0x007F8000, 0x00008000, 0 },
+     { 0x00000000, 0x007F8000, 0x00008000, ATT_IOMEM },
      /* OCRAM_S (Code) */
      { 0x00180000, 0x008F8000, 0x00004000, 0 },
      /* OCRAM_S (Code) - alias */
      { 0x00180000, 0x008FC000, 0x00004000, 0 },
      /* TCML (Code) */
-     { 0x1FFF8000, 0x007F8000, 0x00008000, ATT_OWN },
+     { 0x1FFF8000, 0x007F8000, 0x00008000, ATT_OWN | ATT_IOMEM },
      /* DDR (Code) - alias, first part of DDR (Data) */
      { 0x10000000, 0x80000000, 0x0FFF8000, 0 },

      /* TCMU (Data) */
-     { 0x20000000, 0x00800000, 0x00008000, ATT_OWN },
+     { 0x20000000, 0x00800000, 0x00008000, ATT_OWN | ATT_IOMEM },
      /* OCRAM_S (Data) - alias? */
      { 0x208F8000, 0x008F8000, 0x00004000, 0 },
      /* DDR (Data) */
@@ -341,7 +342,7 @@ static int imx_rproc_stop(struct rproc *rproc)  }

 static int imx_rproc_da_to_sys(struct imx_rproc *priv, u64 da,
-                            size_t len, u64 *sys)
+                            size_t len, u64 *sys, bool *is_iomem)
 {
      const struct imx_rproc_dcfg *dcfg = priv->dcfg;
      int i;
@@ -354,6 +355,8 @@ static int imx_rproc_da_to_sys(struct imx_rproc *priv,
u64 da,
                      unsigned int offset = da - att->da;

                      *sys = att->sa + offset;
+                     if (is_iomem)
+                             *is_iomem = att->flags & ATT_IOMEM;
                      return 0;
              }
      }
@@ -377,7 +380,7 @@ static void *imx_rproc_da_to_va(struct rproc *rproc,
u64 da, size_t len, bool *i
       * On device side we have many aliases, so we need to convert device
       * address (M4) to system bus address first.
       */
-     if (imx_rproc_da_to_sys(priv, da, len, &sys))
+     if (imx_rproc_da_to_sys(priv, da, len, &sys, is_iomem))
              return NULL;

      for (i = 0; i < IMX_RPROC_MEM_MAX; i++) {
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 4/4] remoteproc: imx_rproc: fix rsc-table name

From: Mathieu Poirier <mathieu.poirier@linaro.org>
Date: 2021-07-12 18:10:54

On Tue, Jul 06, 2021 at 10:23:35PM +0800, Dong Aisheng wrote:
Usually the dash '-'  is preferred in node name.
... And yet the DT binding shows &m4_reserved_sysmem1 and
&m4_reserved_sysmem2.

Either change it all or leave as is.

Thanks,
Mathieu
quoted hunk
So far, not dts in upstream kernel, so we just update node name
in driver.

Cc: Bjorn Andersson <redacted>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Peng Fan <peng.fan@nxp.com>
Fixes: 5e4c1243071d ("remoteproc: imx_rproc: support remote cores booted before Linux Kernel")
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
---
 drivers/remoteproc/imx_rproc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
index 12de153abb2d..26eb130f3263 100644
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -600,7 +600,7 @@ static int imx_rproc_addr_init(struct imx_rproc *priv,
 		}
 		priv->mem[b].sys_addr = res.start;
 		priv->mem[b].size = resource_size(&res);
-		if (!strcmp(node->name, "rsc_table"))
+		if (!strcmp(node->name, "rsc-table"))
 			priv->rsc_table = priv->mem[b].cpu_addr;
 		b++;
 	}
-- 
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

RE: [PATCH 4/4] remoteproc: imx_rproc: fix rsc-table name

From: Aisheng Dong <aisheng.dong@nxp.com>
Date: 2021-07-13 02:49:23

Hi Mathieu,

Thanks for the feedback.
From: Mathieu Poirier <mathieu.poirier@linaro.org>
Sent: Tuesday, July 13, 2021 2:09 AM

On Tue, Jul 06, 2021 at 10:23:35PM +0800, Dong Aisheng wrote:
quoted
Usually the dash '-'  is preferred in node name.
... And yet the DT binding shows &m4_reserved_sysmem1 and
&m4_reserved_sysmem2.

Either change it all or leave as is.
These are phandles and not node names.
So should be ok.

BTW, I've sent V2, could you help review V2 series?
https://patchwork.kernel.org/project/linux-arm-kernel/patch/20210707094033.1959752-1-aisheng.dong@nxp.com/

Regards
Aisheng
Thanks,
Mathieu
quoted
So far, not dts in upstream kernel, so we just update node name in
driver.

Cc: Bjorn Andersson <redacted>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Peng Fan <peng.fan@nxp.com>
Fixes: 5e4c1243071d ("remoteproc: imx_rproc: support remote cores
booted before Linux Kernel")
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
---
 drivers/remoteproc/imx_rproc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/remoteproc/imx_rproc.c
b/drivers/remoteproc/imx_rproc.c index 12de153abb2d..26eb130f3263
100644
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -600,7 +600,7 @@ static int imx_rproc_addr_init(struct imx_rproc
*priv,
quoted
 		}
 		priv->mem[b].sys_addr = res.start;
 		priv->mem[b].size = resource_size(&res);
-		if (!strcmp(node->name, "rsc_table"))
+		if (!strcmp(node->name, "rsc-table"))
 			priv->rsc_table = priv->mem[b].cpu_addr;
 		b++;
 	}
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 4/4] remoteproc: imx_rproc: fix rsc-table name

From: Mathieu Poirier <mathieu.poirier@linaro.org>
Date: 2021-07-13 17:08:51

On Tue, Jul 13, 2021 at 02:47:44AM +0000, Aisheng Dong wrote:
Hi Mathieu,

Thanks for the feedback.
quoted
From: Mathieu Poirier <mathieu.poirier@linaro.org>
Sent: Tuesday, July 13, 2021 2:09 AM

On Tue, Jul 06, 2021 at 10:23:35PM +0800, Dong Aisheng wrote:
quoted
Usually the dash '-'  is preferred in node name.
... And yet the DT binding shows &m4_reserved_sysmem1 and
&m4_reserved_sysmem2.

Either change it all or leave as is.
These are phandles and not node names.
So should be ok.

BTW, I've sent V2, could you help review V2 series?
https://patchwork.kernel.org/project/linux-arm-kernel/patch/20210707094033.1959752-1-aisheng.dong@nxp.com/
Looks like I reviewed the wrong version...
Regards
Aisheng
quoted
Thanks,
Mathieu
quoted
So far, not dts in upstream kernel, so we just update node name in
driver.

Cc: Bjorn Andersson <redacted>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Peng Fan <peng.fan@nxp.com>
Fixes: 5e4c1243071d ("remoteproc: imx_rproc: support remote cores
booted before Linux Kernel")
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
---
 drivers/remoteproc/imx_rproc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/remoteproc/imx_rproc.c
b/drivers/remoteproc/imx_rproc.c index 12de153abb2d..26eb130f3263
100644
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -600,7 +600,7 @@ static int imx_rproc_addr_init(struct imx_rproc
*priv,
quoted
 		}
 		priv->mem[b].sys_addr = res.start;
 		priv->mem[b].size = resource_size(&res);
-		if (!strcmp(node->name, "rsc_table"))
+		if (!strcmp(node->name, "rsc-table"))
 			priv->rsc_table = priv->mem[b].cpu_addr;
 		b++;
 	}
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help