* [PATCH 1/4] remoteproc: fix the wrong default value of is_iomem
@ 2021-07-06 14:23 ` Dong Aisheng
0 siblings, 0 replies; 26+ messages in thread
From: Dong Aisheng @ 2021-07-06 14:23 UTC (permalink / raw)
To: linux-remoteproc
Cc: linux-arm-kernel, ohad, dongas86, bjorn.andersson,
mathieu.poirier, Dong Aisheng, Peng Fan
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 <bjorn.andersson@linaro.org>
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
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 1/4] remoteproc: fix the wrong default value of is_iomem @ 2021-07-06 14:23 ` Dong Aisheng 0 siblings, 0 replies; 26+ messages in thread From: Dong Aisheng @ 2021-07-06 14:23 UTC (permalink / raw) To: linux-remoteproc Cc: linux-arm-kernel, ohad, dongas86, bjorn.andersson, mathieu.poirier, Dong Aisheng, Peng Fan 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 <bjorn.andersson@linaro.org> 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 ^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 2/4] remoteproc: imx_rproc: fix TCM io memory type 2021-07-06 14:23 ` Dong Aisheng @ 2021-07-06 14:23 ` Dong Aisheng -1 siblings, 0 replies; 26+ messages in thread From: Dong Aisheng @ 2021-07-06 14:23 UTC (permalink / raw) To: linux-remoteproc Cc: linux-arm-kernel, ohad, dongas86, bjorn.andersson, mathieu.poirier, Dong Aisheng, Peng Fan 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 <bjorn.andersson@linaro.org> 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 ^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 2/4] remoteproc: imx_rproc: fix TCM io memory type @ 2021-07-06 14:23 ` Dong Aisheng 0 siblings, 0 replies; 26+ messages in thread From: Dong Aisheng @ 2021-07-06 14:23 UTC (permalink / raw) To: linux-remoteproc Cc: linux-arm-kernel, ohad, dongas86, bjorn.andersson, mathieu.poirier, Dong Aisheng, Peng Fan 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 <bjorn.andersson@linaro.org> 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 ^ permalink raw reply related [flat|nested] 26+ messages in thread
* RE: [PATCH 2/4] remoteproc: imx_rproc: fix TCM io memory type 2021-07-06 14:23 ` Dong Aisheng @ 2021-07-07 2:20 ` Peng Fan -1 siblings, 0 replies; 26+ messages in thread From: Peng Fan @ 2021-07-07 2:20 UTC (permalink / raw) To: Aisheng Dong, linux-remoteproc Cc: linux-arm-kernel, ohad, dongas86, bjorn.andersson, mathieu.poirier > 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 <bjorn.andersson@linaro.org> > 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. > 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 ^ permalink raw reply [flat|nested] 26+ messages in thread
* RE: [PATCH 2/4] remoteproc: imx_rproc: fix TCM io memory type @ 2021-07-07 2:20 ` Peng Fan 0 siblings, 0 replies; 26+ messages in thread From: Peng Fan @ 2021-07-07 2:20 UTC (permalink / raw) To: Aisheng Dong, linux-remoteproc Cc: linux-arm-kernel, ohad, dongas86, bjorn.andersson, mathieu.poirier > 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 <bjorn.andersson@linaro.org> > 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. > 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 ^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 2/4] remoteproc: imx_rproc: fix TCM io memory type 2021-07-07 2:20 ` Peng Fan @ 2021-07-07 6:05 ` Dong Aisheng -1 siblings, 0 replies; 26+ messages in thread From: Dong Aisheng @ 2021-07-07 6:05 UTC (permalink / raw) To: Peng Fan Cc: Aisheng Dong, linux-remoteproc, linux-arm-kernel, ohad, bjorn.andersson, mathieu.poirier On Wed, Jul 7, 2021 at 10:20 AM Peng Fan <peng.fan@nxp.com> wrote: > > > 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 > > > > Cc: Bjorn Andersson <bjorn.andersson@linaro.org> > > 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. > > > 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 > ^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 2/4] remoteproc: imx_rproc: fix TCM io memory type @ 2021-07-07 6:05 ` Dong Aisheng 0 siblings, 0 replies; 26+ messages in thread From: Dong Aisheng @ 2021-07-07 6:05 UTC (permalink / raw) To: Peng Fan Cc: Aisheng Dong, linux-remoteproc, linux-arm-kernel, ohad, bjorn.andersson, mathieu.poirier On Wed, Jul 7, 2021 at 10:20 AM Peng Fan <peng.fan@nxp.com> wrote: > > > 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 > > > > Cc: Bjorn Andersson <bjorn.andersson@linaro.org> > > 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. > > > 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 ^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH 3/4] remoteproc: imx_rproc: fix ignoring mapping vdev regions 2021-07-06 14:23 ` Dong Aisheng @ 2021-07-06 14:23 ` Dong Aisheng -1 siblings, 0 replies; 26+ messages in thread From: Dong Aisheng @ 2021-07-06 14:23 UTC (permalink / raw) To: linux-remoteproc Cc: linux-arm-kernel, ohad, dongas86, bjorn.andersson, mathieu.poirier, Dong Aisheng 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 ^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 3/4] remoteproc: imx_rproc: fix ignoring mapping vdev regions @ 2021-07-06 14:23 ` Dong Aisheng 0 siblings, 0 replies; 26+ messages in thread From: Dong Aisheng @ 2021-07-06 14:23 UTC (permalink / raw) To: linux-remoteproc Cc: linux-arm-kernel, ohad, dongas86, bjorn.andersson, mathieu.poirier, Dong Aisheng 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 ^ permalink raw reply related [flat|nested] 26+ messages in thread
* RE: [PATCH 3/4] remoteproc: imx_rproc: fix ignoring mapping vdev regions 2021-07-06 14:23 ` Dong Aisheng @ 2021-07-07 2:23 ` Peng Fan (OSS) -1 siblings, 0 replies; 26+ messages in thread From: Peng Fan (OSS) @ 2021-07-07 2:23 UTC (permalink / raw) To: Aisheng Dong, linux-remoteproc Cc: linux-arm-kernel, ohad, dongas86, bjorn.andersson, mathieu.poirier, Aisheng Dong > 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 ^ permalink raw reply [flat|nested] 26+ messages in thread
* RE: [PATCH 3/4] remoteproc: imx_rproc: fix ignoring mapping vdev regions @ 2021-07-07 2:23 ` Peng Fan (OSS) 0 siblings, 0 replies; 26+ messages in thread From: Peng Fan (OSS) @ 2021-07-07 2:23 UTC (permalink / raw) To: Aisheng Dong, linux-remoteproc Cc: linux-arm-kernel, ohad, dongas86, bjorn.andersson, mathieu.poirier, Aisheng Dong > 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 ^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH 4/4] remoteproc: imx_rproc: fix rsc-table name 2021-07-06 14:23 ` Dong Aisheng @ 2021-07-06 14:23 ` Dong Aisheng -1 siblings, 0 replies; 26+ messages in thread From: Dong Aisheng @ 2021-07-06 14:23 UTC (permalink / raw) To: linux-remoteproc Cc: linux-arm-kernel, ohad, dongas86, bjorn.andersson, mathieu.poirier, Dong Aisheng, Peng Fan 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 <bjorn.andersson@linaro.org> 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 ^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH 4/4] remoteproc: imx_rproc: fix rsc-table name @ 2021-07-06 14:23 ` Dong Aisheng 0 siblings, 0 replies; 26+ messages in thread From: Dong Aisheng @ 2021-07-06 14:23 UTC (permalink / raw) To: linux-remoteproc Cc: linux-arm-kernel, ohad, dongas86, bjorn.andersson, mathieu.poirier, Dong Aisheng, Peng Fan 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 <bjorn.andersson@linaro.org> 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 ^ permalink raw reply related [flat|nested] 26+ messages in thread
* RE: [PATCH 4/4] remoteproc: imx_rproc: fix rsc-table name 2021-07-06 14:23 ` Dong Aisheng @ 2021-07-07 2:21 ` Peng Fan (OSS) -1 siblings, 0 replies; 26+ messages in thread From: Peng Fan (OSS) @ 2021-07-07 2:21 UTC (permalink / raw) To: Aisheng Dong, linux-remoteproc Cc: linux-arm-kernel, ohad, dongas86, bjorn.andersson, mathieu.poirier > 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 <bjorn.andersson@linaro.org> > 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 ^ permalink raw reply [flat|nested] 26+ messages in thread
* RE: [PATCH 4/4] remoteproc: imx_rproc: fix rsc-table name @ 2021-07-07 2:21 ` Peng Fan (OSS) 0 siblings, 0 replies; 26+ messages in thread From: Peng Fan (OSS) @ 2021-07-07 2:21 UTC (permalink / raw) To: Aisheng Dong, linux-remoteproc Cc: linux-arm-kernel, ohad, dongas86, bjorn.andersson, mathieu.poirier > 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 <bjorn.andersson@linaro.org> > 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 ^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 4/4] remoteproc: imx_rproc: fix rsc-table name 2021-07-06 14:23 ` Dong Aisheng @ 2021-07-12 18:08 ` Mathieu Poirier -1 siblings, 0 replies; 26+ messages in thread From: Mathieu Poirier @ 2021-07-12 18:08 UTC (permalink / raw) To: Dong Aisheng Cc: linux-remoteproc, linux-arm-kernel, ohad, dongas86, bjorn.andersson, Peng Fan 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 > So far, not dts in upstream kernel, so we just update node name > in driver. > > Cc: Bjorn Andersson <bjorn.andersson@linaro.org> > 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 > ^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 4/4] remoteproc: imx_rproc: fix rsc-table name @ 2021-07-12 18:08 ` Mathieu Poirier 0 siblings, 0 replies; 26+ messages in thread From: Mathieu Poirier @ 2021-07-12 18:08 UTC (permalink / raw) To: Dong Aisheng Cc: linux-remoteproc, linux-arm-kernel, ohad, dongas86, bjorn.andersson, Peng Fan 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 > So far, not dts in upstream kernel, so we just update node name > in driver. > > Cc: Bjorn Andersson <bjorn.andersson@linaro.org> > 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 ^ permalink raw reply [flat|nested] 26+ messages in thread
* RE: [PATCH 4/4] remoteproc: imx_rproc: fix rsc-table name 2021-07-12 18:08 ` Mathieu Poirier @ 2021-07-13 2:47 ` Aisheng Dong -1 siblings, 0 replies; 26+ messages in thread From: Aisheng Dong @ 2021-07-13 2:47 UTC (permalink / raw) To: Mathieu Poirier Cc: linux-remoteproc, linux-arm-kernel, ohad, dongas86, bjorn.andersson, Peng Fan 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: > > 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 > > > So far, not dts in upstream kernel, so we just update node name in > > driver. > > > > Cc: Bjorn Andersson <bjorn.andersson@linaro.org> > > 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 > > ^ permalink raw reply [flat|nested] 26+ messages in thread
* RE: [PATCH 4/4] remoteproc: imx_rproc: fix rsc-table name @ 2021-07-13 2:47 ` Aisheng Dong 0 siblings, 0 replies; 26+ messages in thread From: Aisheng Dong @ 2021-07-13 2:47 UTC (permalink / raw) To: Mathieu Poirier Cc: linux-remoteproc, linux-arm-kernel, ohad, dongas86, bjorn.andersson, Peng Fan 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: > > 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 > > > So far, not dts in upstream kernel, so we just update node name in > > driver. > > > > Cc: Bjorn Andersson <bjorn.andersson@linaro.org> > > 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 ^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 4/4] remoteproc: imx_rproc: fix rsc-table name 2021-07-13 2:47 ` Aisheng Dong @ 2021-07-13 17:07 ` Mathieu Poirier -1 siblings, 0 replies; 26+ messages in thread From: Mathieu Poirier @ 2021-07-13 17:07 UTC (permalink / raw) To: Aisheng Dong Cc: linux-remoteproc, linux-arm-kernel, ohad, dongas86, bjorn.andersson, Peng Fan On Tue, Jul 13, 2021 at 02:47:44AM +0000, Aisheng Dong wrote: > 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: > > > 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 > > > > > Thanks, > > Mathieu > > > > > So far, not dts in upstream kernel, so we just update node name in > > > driver. > > > > > > Cc: Bjorn Andersson <bjorn.andersson@linaro.org> > > > 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 > > > ^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 4/4] remoteproc: imx_rproc: fix rsc-table name @ 2021-07-13 17:07 ` Mathieu Poirier 0 siblings, 0 replies; 26+ messages in thread From: Mathieu Poirier @ 2021-07-13 17:07 UTC (permalink / raw) To: Aisheng Dong Cc: linux-remoteproc, linux-arm-kernel, ohad, dongas86, bjorn.andersson, Peng Fan On Tue, Jul 13, 2021 at 02:47:44AM +0000, Aisheng Dong wrote: > 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: > > > 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 > > > > > Thanks, > > Mathieu > > > > > So far, not dts in upstream kernel, so we just update node name in > > > driver. > > > > > > Cc: Bjorn Andersson <bjorn.andersson@linaro.org> > > > 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 ^ permalink raw reply [flat|nested] 26+ messages in thread
* RE: [PATCH 1/4] remoteproc: fix the wrong default value of is_iomem 2021-07-06 14:23 ` Dong Aisheng @ 2021-07-07 2:14 ` Peng Fan -1 siblings, 0 replies; 26+ messages in thread From: Peng Fan @ 2021-07-07 2:14 UTC (permalink / raw) To: Aisheng Dong, linux-remoteproc Cc: linux-arm-kernel, ohad, dongas86, bjorn.andersson, mathieu.poirier > 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 <bjorn.andersson@linaro.org> > 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. > 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 ^ permalink raw reply [flat|nested] 26+ messages in thread
* RE: [PATCH 1/4] remoteproc: fix the wrong default value of is_iomem @ 2021-07-07 2:14 ` Peng Fan 0 siblings, 0 replies; 26+ messages in thread From: Peng Fan @ 2021-07-07 2:14 UTC (permalink / raw) To: Aisheng Dong, linux-remoteproc Cc: linux-arm-kernel, ohad, dongas86, bjorn.andersson, mathieu.poirier > 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 <bjorn.andersson@linaro.org> > 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. > 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 ^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 1/4] remoteproc: fix the wrong default value of is_iomem 2021-07-07 2:14 ` Peng Fan @ 2021-07-07 3:25 ` Dong Aisheng -1 siblings, 0 replies; 26+ messages in thread From: Dong Aisheng @ 2021-07-07 3:25 UTC (permalink / raw) To: Peng Fan Cc: Aisheng Dong, linux-remoteproc, linux-arm-kernel, ohad, bjorn.andersson, mathieu.poirier On Wed, Jul 7, 2021 at 10:14 AM Peng Fan <peng.fan@nxp.com> wrote: > > > 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 <bjorn.andersson@linaro.org> > > 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. > > > 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 > ^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 1/4] remoteproc: fix the wrong default value of is_iomem @ 2021-07-07 3:25 ` Dong Aisheng 0 siblings, 0 replies; 26+ messages in thread From: Dong Aisheng @ 2021-07-07 3:25 UTC (permalink / raw) To: Peng Fan Cc: Aisheng Dong, linux-remoteproc, linux-arm-kernel, ohad, bjorn.andersson, mathieu.poirier On Wed, Jul 7, 2021 at 10:14 AM Peng Fan <peng.fan@nxp.com> wrote: > > > 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 <bjorn.andersson@linaro.org> > > 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. > > > 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 ^ permalink raw reply [flat|nested] 26+ messages in thread
end of thread, other threads:[~2021-07-13 17:08 UTC | newest] Thread overview: 26+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-07-06 14:23 [PATCH 1/4] remoteproc: fix the wrong default value of is_iomem Dong Aisheng 2021-07-06 14:23 ` Dong Aisheng 2021-07-06 14:23 ` [PATCH 2/4] remoteproc: imx_rproc: fix TCM io memory type Dong Aisheng 2021-07-06 14:23 ` Dong Aisheng 2021-07-07 2:20 ` Peng Fan 2021-07-07 2:20 ` Peng Fan 2021-07-07 6:05 ` Dong Aisheng 2021-07-07 6:05 ` Dong Aisheng 2021-07-06 14:23 ` [PATCH 3/4] remoteproc: imx_rproc: fix ignoring mapping vdev regions Dong Aisheng 2021-07-06 14:23 ` Dong Aisheng 2021-07-07 2:23 ` Peng Fan (OSS) 2021-07-07 2:23 ` Peng Fan (OSS) 2021-07-06 14:23 ` [PATCH 4/4] remoteproc: imx_rproc: fix rsc-table name Dong Aisheng 2021-07-06 14:23 ` Dong Aisheng 2021-07-07 2:21 ` Peng Fan (OSS) 2021-07-07 2:21 ` Peng Fan (OSS) 2021-07-12 18:08 ` Mathieu Poirier 2021-07-12 18:08 ` Mathieu Poirier 2021-07-13 2:47 ` Aisheng Dong 2021-07-13 2:47 ` Aisheng Dong 2021-07-13 17:07 ` Mathieu Poirier 2021-07-13 17:07 ` Mathieu Poirier 2021-07-07 2:14 ` [PATCH 1/4] remoteproc: fix the wrong default value of is_iomem Peng Fan 2021-07-07 2:14 ` Peng Fan 2021-07-07 3:25 ` Dong Aisheng 2021-07-07 3:25 ` Dong Aisheng
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.