remoteproc: imx_rproc: support iMX8MQ/M
Subsystems (6)
cover remoteproc: imx_rproc: support iMX8MQ/M
From: Peng Fan <[email protected]>
V4:
According to Bjorn's comments, add is_iomem for da to va usage
1/8, 2/8 is new patch
3/8, follow Bjorn's comments to correct/update the err msg.
6/8, new patch
8/8, use dev_err_probe to simplify code, use queue_work instead schedule_delayed_work
https://lkml.org/lkml/2020/12/4/82
V3:
Since I was quite busy in the past days, V3 is late
Rebased on Linux-next
Add R-b tags
1/7: Add R-b tag of Mathieu, add comments
4/7: Typo fix
5/7: Add R-b tag of Mathieu, drop index Per Mathieu's comments 6/7: Add R-b tag of Mathieu
7/7: Add comment for vqid << 16, drop unneeded timeout settings of mailbox
Use queue_work instead of schedule_delayed_work
free mbox channels when remove
V2:
Rebased on linux-next
Dropped early boot feature to make patchset simple. Drop rsc-da
https://patchwork.kernel.org/project/linux-remoteproc/cover/[email protected]/
V1:
https://patchwork.kernel.org/cover/11682461/
This patchset is to support i.MX8MQ/M coproc.
The early boot feature was dropped to make the patchset small in V2.
Since i.MX specific TCM memory requirement, add elf platform hook. Several patches have got reviewed by Oleksij and Mathieu in v1.
Peng Fan (8):
remoteproc: introduce is_iomem to rproc_mem_entry
remoteproc: add is_iomem to da_to_va
remoteproc: imx_rproc: correct err message
remoteproc: imx_rproc: use devm_ioremap
remoteproc: imx_rproc: add i.MX specific parse fw hook
remoteproc: imx_rproc: support i.MX8MQ/M
remoteproc: imx_rproc: ignore mapping vdev regions
remoteproc: imx_proc: enable virtio/mailbox
drivers/remoteproc/imx_rproc.c | 259 ++++++++++++++++++++- drivers/remoteproc/ingenic_rproc.c | 2 +- drivers/remoteproc/keystone_remoteproc.c | 2 +- drivers/remoteproc/mtk_scp.c | 6 +- drivers/remoteproc/omap_remoteproc.c | 2 +- drivers/remoteproc/pru_rproc.c | 2 +- drivers/remoteproc/qcom_q6v5_adsp.c | 2 +- drivers/remoteproc/qcom_q6v5_pas.c | 2 +- drivers/remoteproc/qcom_q6v5_wcss.c | 2 +- drivers/remoteproc/qcom_wcnss.c | 2 +- drivers/remoteproc/remoteproc_core.c | 7 +- drivers/remoteproc/remoteproc_coredump.c | 8 +- drivers/remoteproc/remoteproc_debugfs.c | 2 +- drivers/remoteproc/remoteproc_elf_loader.c | 21 +- drivers/remoteproc/remoteproc_internal.h | 2 +- drivers/remoteproc/st_slim_rproc.c | 2 +- drivers/remoteproc/ti_k3_dsp_remoteproc.c | 2 +- drivers/remoteproc/ti_k3_r5_remoteproc.c | 2 +- drivers/remoteproc/wkup_m3_rproc.c | 2 +- include/linux/remoteproc.h | 4 +- 20 files changed, 298 insertions(+), 35 deletions(-)
Signature · 7 lines
2.28.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 1/8 remoteproc: introduce is_iomem to rproc_mem_entry
From: Peng Fan <[email protected]>
Introduce is_iomem to indicate this piece memory is iomem or not.
---
V4:
New patch
include/linux/remoteproc.h | 2 ++ 1 file changed, 2 insertions(+)
include/linux/remoteproc.h +2 -0
@@ -315,6 +315,7 @@ struct rproc;/** * struct rproc_mem_entry - memory entry descriptor * @va: virtual address +* @is_iomem: io memory * @dma: dma address * @len: length, in bytes * @da: device address
@@ -329,6 +330,7 @@ struct rproc;*/ struct rproc_mem_entry {void *va; +bool is_iomem;dma_addr_t dma;size_t len;u32 da;
Signature · 7 lines
2.28.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 1/8] remoteproc: introduce is_iomem to rproc_mem_entry
Quoted 4 lines · Peng Fan (OSS)
From: Peng Fan <[email protected]>
Introduce
is_iomemto indicate this piece memory is iomem or not.
Quoted 32 lines
Signed-off-by Peng Fan <[email protected]>---
V4:
New patchinclude/linux/remoteproc.h | 2 ++ 1 file changed, 2 insertions(+)include/linux/remoteproc.h +2
-0@@ -315,6 +315,7 @@ struct rproc;/** * struct rproc_mem_entry - memory entry descriptor * @va: virtual address +* @is_iomem: io memory * @dma: dma address * @len: length, in bytes * @da: device address @@ -329,6 +330,7 @@ struct rproc;*/ struct rproc_mem_entry {void *va; +bool is_iomem;dma_addr_t dma;size_t len;u32 da;Signature · 1 line
2.28.0
PATCH 2/8 remoteproc: add is_iomem to da_to_va
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
Introduce an extra parameter is_iomem to da_to_va, then the caller could take the memory as normal memory or io mapped memory.
---
V4:
New patch
drivers/remoteproc/imx_rproc.c | 2 +- drivers/remoteproc/ingenic_rproc.c | 2 +- drivers/remoteproc/keystone_remoteproc.c | 2 +- drivers/remoteproc/mtk_scp.c | 6 +++--- drivers/remoteproc/omap_remoteproc.c | 2 +- drivers/remoteproc/pru_rproc.c | 2 +- drivers/remoteproc/qcom_q6v5_adsp.c | 2 +- drivers/remoteproc/qcom_q6v5_pas.c | 2 +- drivers/remoteproc/qcom_q6v5_wcss.c | 2 +- drivers/remoteproc/qcom_wcnss.c | 2 +- drivers/remoteproc/remoteproc_core.c | 7 +++++-- drivers/remoteproc/remoteproc_coredump.c | 8 ++++++-- drivers/remoteproc/remoteproc_debugfs.c | 2 +- drivers/remoteproc/remoteproc_elf_loader.c | 21 +++++++++++++++------ drivers/remoteproc/remoteproc_internal.h | 2 +- drivers/remoteproc/st_slim_rproc.c | 2 +- drivers/remoteproc/ti_k3_dsp_remoteproc.c | 2 +- drivers/remoteproc/ti_k3_r5_remoteproc.c | 2 +- drivers/remoteproc/wkup_m3_rproc.c | 2 +- include/linux/remoteproc.h | 2 +- 20 files changed, 45 insertions(+), 29 deletions(-)
drivers/remoteproc/imx_rproc.c +1 -1
@@ -208,7 +208,7 @@ static int imx_rproc_da_to_sys(struct imx_rproc *priv, u64 da,return -ENOENT ; } -static void *imx_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len) +static void *imx_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len,bool *is_iomem) {struct imx_rproc *priv = rproc->priv;void *va =NULL ;
drivers/remoteproc/ingenic_rproc.c +1 -1
@@ -116,7 +116,7 @@ static void ingenic_rproc_kick(struct rproc *rproc, int vqid)writel (vqid, vpu->aux_base +REG_CORE_MSG ); } -static void *ingenic_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len) +static void *ingenic_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len,bool *is_iomem) {struct vpu *vpu = rproc->priv;void __iomem *va =NULL ;
drivers/remoteproc/keystone_remoteproc.c +1 -1
@@ -246,7 +246,7 @@ static void keystone_rproc_kick(struct rproc *rproc, int vqid)* can be used either by the remoteproc core for loading (when using kernel * remoteproc loader), or by any rpmsg bus drivers. */ -static void *keystone_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len) +static void *keystone_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len,bool *is_iomem) {struct keystone_rproc *ksproc = rproc->priv;void __iomem *va =NULL ;
drivers/remoteproc/mtk_scp.c +3 -3
@@ -270,7 +270,7 @@ static int scp_elf_load_segments(struct rproc *rproc, const struct firmware *fw) }/* grab the kernel address for this device address */ - ptr = (void __iomem *)rproc_da_to_va (rproc, da, memsz); + ptr = (void __iomem *)rproc_da_to_va (rproc, da, memsz,NULL );if (!ptr) {dev_err (dev,"bad phdr da 0x%x mem 0x%x\n" , da, memsz); ret = -EINVAL ;
@@ -458,7 +458,7 @@ static int scp_start(struct rproc *rproc)return ret; } -static void *scp_da_to_va (struct rproc *rproc,u64 da,size_t len) +static void *scp_da_to_va (struct rproc *rproc,u64 da,size_t len,bool *is_iomem) {struct mtk_scp *scp = (struct mtk_scp *)rproc->priv;int offset;
@@ -587,7 +587,7 @@ void *scp_mapping_dm_addr(struct mtk_scp *scp, u32 mem_addr) {void *ptr; - ptr =scp_da_to_va (scp->rproc, mem_addr,0 ); + ptr =scp_da_to_va (scp->rproc, mem_addr,0 ,NULL );if (!ptr)return ERR_PTR (-EINVAL );
drivers/remoteproc/omap_remoteproc.c +1 -1
@@ -728,7 +728,7 @@ static int omap_rproc_stop(struct rproc *rproc)* Return: translated virtual address in kernel memory space on success, * or NULL on failure. */ -static void *omap_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len) +static void *omap_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len,bool *is_iomem) {struct omap_rproc *oproc = rproc->priv;int i;
drivers/remoteproc/pru_rproc.c +1 -1
@@ -465,7 +465,7 @@ static void *pru_i_da_to_va(struct pru_rproc *pru, u32 da, size_t len)* core for any PRU client drivers. The PRU Instruction RAM access is restricted * only to the PRU loader code. */ -static void *pru_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len) +static void *pru_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len,bool *is_iomem) {struct pru_rproc *pru = rproc->priv;
drivers/remoteproc/qcom_q6v5_adsp.c +1 -1
@@ -281,7 +281,7 @@ static int adsp_stop(struct rproc *rproc)return ret; } -static void *adsp_da_to_va (struct rproc *rproc,u64 da,size_t len) +static void *adsp_da_to_va (struct rproc *rproc,u64 da,size_t len,bool *is_iomem) {struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv;int offset;
drivers/remoteproc/qcom_q6v5_pas.c +1 -1
@@ -242,7 +242,7 @@ static int adsp_stop(struct rproc *rproc)return ret; } -static void *adsp_da_to_va (struct rproc *rproc,u64 da,size_t len) +static void *adsp_da_to_va (struct rproc *rproc,u64 da,size_t len,bool *is_iomem) {struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv;int offset;
drivers/remoteproc/qcom_q6v5_wcss.c +1 -1
@@ -410,7 +410,7 @@ static int q6v5_wcss_stop(struct rproc *rproc)return 0 ; } -static void *q6v5_wcss_da_to_va (struct rproc *rproc,u64 da,size_t len) +static void *q6v5_wcss_da_to_va (struct rproc *rproc,u64 da,size_t len,bool *is_iomem) {struct q6v5_wcss *wcss = rproc->priv;int offset;
drivers/remoteproc/qcom_wcnss.c +1 -1
@@ -320,7 +320,7 @@ static int wcnss_stop(struct rproc *rproc)return ret; } -static void *wcnss_da_to_va (struct rproc *rproc,u64 da,size_t len) +static void *wcnss_da_to_va (struct rproc *rproc,u64 da,size_t len,bool *is_iomem) {struct qcom_wcnss *wcnss = (struct qcom_wcnss *)rproc->priv;int offset;
drivers/remoteproc/remoteproc_core.c +5 -2
@@ -189,13 +189,13 @@ EXPORT_SYMBOL(rproc_va_to_pa);* here the output of the DMA API for the carveouts, which should be more * correct. */ -void *rproc_da_to_va (struct rproc *rproc,u64 da,size_t len) +void *rproc_da_to_va (struct rproc *rproc,u64 da,size_t len,bool *is_iomem) {struct rproc_mem_entry *carveout;void *ptr =NULL ;if (rproc->ops->da_to_va) { - ptr = rproc->ops->da_to_va (rproc, da, len); + ptr = rproc->ops->da_to_va (rproc, da, len, is_iomem);if (ptr) goto out; }
@@ -217,6 +217,9 @@ void *rproc_da_to_va(struct rproc *rproc, u64 da, size_t len) ptr = carveout->va + offset; +if (is_iomem) + *is_iomem = carveout->is_iomem; +break ; }
drivers/remoteproc/remoteproc_coredump.c +6 -2
@@ -153,18 +153,22 @@ static void rproc_copy_segment(struct rproc *rproc, void *dest, size_t offset, size_t size) { void *ptr; +bool is_iomem;if (segment->dump) { segment->dump (rproc, segment, dest, offset, size); }else { - ptr =rproc_da_to_va (rproc, segment->da + offset, size); + ptr =rproc_da_to_va (rproc, segment->da + offset, size, &is_iomem);if (!ptr) {dev_err (&rproc->dev,"invalid copy request for segment %pad with offset %zu and size %zu)\n" , &segment->da, offset, size);memset (dest,0xff , size); }else { -memcpy (dest, ptr, size); +if (is_iomem) +memcpy_fromio (dest, ptr, size); +else +memcpy (dest, ptr, size); } } }
drivers/remoteproc/remoteproc_debugfs.c +1 -1
@@ -132,7 +132,7 @@ static ssize_t rproc_trace_read(struct file *filp, char __user *userbuf,char buf[100 ];int len; - va =rproc_da_to_va (data->rproc, trace->da, trace->len); + va =rproc_da_to_va (data->rproc, trace->da, trace->len,NULL );if (!va) { len = scnprintf(buf, sizeof(buf), "Trace %s not available\n",
drivers/remoteproc/remoteproc_elf_loader.c +15 -6
@@ -175,6 +175,7 @@ int rproc_elf_load_segments(struct rproc *rproc, const struct firmware *fw)u64 offset =elf_phdr_get_p_offset (class, phdr);u32 type =elf_phdr_get_p_type (class, phdr);void *ptr; +bool is_iomem;if (type !=PT_LOAD )continue ;
@@ -204,7 +205,7 @@ int rproc_elf_load_segments(struct rproc *rproc, const struct firmware *fw) }/* grab the kernel address for this device address */ - ptr =rproc_da_to_va (rproc, da, memsz); + ptr =rproc_da_to_va (rproc, da, memsz, &is_iomem);if (!ptr) {dev_err (dev,"bad phdr da 0x%llx mem 0x%llx\n" , da, memsz);
@@ -213,8 +214,12 @@ int rproc_elf_load_segments(struct rproc *rproc, const struct firmware *fw) }/* put the segment where the remote processor expects it */ -if (filesz) -memcpy (ptr, elf_data + offset, filesz); +if (filesz) { +if (is_iomem) +memcpy_fromio (ptr, elf_data + offset, filesz); +else +memcpy (ptr, elf_data + offset, filesz); + }/* * Zero out remaining memory for this segment.
@@ -223,8 +228,12 @@ int rproc_elf_load_segments(struct rproc *rproc, const struct firmware *fw)* did this for us. albeit harmless, we may consider removing * this. */ -if (memsz > filesz) -memset (ptr + filesz,0 , memsz - filesz); +if (memsz > filesz) { +if (is_iomem) +memset_io (ptr + filesz,0 , memsz - filesz); +else +memset (ptr + filesz,0 , memsz - filesz); + } }return ret;
@@ -377,6 +386,6 @@ struct resource_table *rproc_elf_find_loaded_rsc_table(struct rproc *rproc,return NULL ; } -return rproc_da_to_va (rproc, sh_addr, sh_size); +return rproc_da_to_va (rproc, sh_addr, sh_size,NULL ); }EXPORT_SYMBOL (rproc_elf_find_loaded_rsc_table);
drivers/remoteproc/remoteproc_internal.h +1 -1
@@ -84,7 +84,7 @@ static inline void rproc_char_device_remove(struct rproc *rproc)void rproc_free_vring (struct rproc_vring *rvring);int rproc_alloc_vring (struct rproc_vdev *rvdev,int i); -void *rproc_da_to_va (struct rproc *rproc,u64 da,size_t len); +void *rproc_da_to_va (struct rproc *rproc,u64 da,size_t len,bool *is_iomem);phys_addr_t rproc_va_to_pa (void *cpu_addr);int rproc_trigger_recovery (struct rproc *rproc);
drivers/remoteproc/st_slim_rproc.c +1 -1
@@ -174,7 +174,7 @@ static int slim_rproc_stop(struct rproc *rproc)return 0 ; } -static void *slim_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len) +static void *slim_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len,bool *is_iomem) {struct st_slim_rproc *slim_rproc = rproc->priv;void *va =NULL ;
drivers/remoteproc/ti_k3_dsp_remoteproc.c +1 -1
@@ -354,7 +354,7 @@ static int k3_dsp_rproc_stop(struct rproc *rproc)* can be used either by the remoteproc core for loading (when using kernel * remoteproc loader), or by any rpmsg bus drivers. */ -static void *k3_dsp_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len) +static void *k3_dsp_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len,bool *is_iomem) {struct k3_dsp_rproc *kproc = rproc->priv;void __iomem *va =NULL ;
drivers/remoteproc/ti_k3_r5_remoteproc.c +1 -1
@@ -590,7 +590,7 @@ static int k3_r5_rproc_stop(struct rproc *rproc)* present in a DSP or IPU device). The translated addresses can be used * either by the remoteproc core for loading, or by any rpmsg bus drivers. */ -static void *k3_r5_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len) +static void *k3_r5_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len,bool *is_iomem) {struct k3_r5_rproc *kproc = rproc->priv;struct k3_r5_core *core = kproc->core;
drivers/remoteproc/wkup_m3_rproc.c +1 -1
@@ -89,7 +89,7 @@ static int wkup_m3_rproc_stop(struct rproc *rproc)return error; } -static void *wkup_m3_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len) +static void *wkup_m3_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len,bool *is_iomem) {struct wkup_m3_rproc *wkupm3 = rproc->priv;void *va =NULL ;
include/linux/remoteproc.h +1 -1
@@ -386,7 +386,7 @@ struct rproc_ops {int (*stop)(struct rproc *rproc);int (*attach)(struct rproc *rproc);void (*kick)(struct rproc *rproc,int vqid); -void * (*da_to_va)(struct rproc *rproc,u64 da,size_t len); +void * (*da_to_va)(struct rproc *rproc,u64 da,size_t len,bool *is_iomem);int (*parse_fw)(struct rproc *rproc,const struct firmware *fw);int (*handle_rsc)(struct rproc *rproc,u32 rsc_type,void *rsc,int offset,int avail);
Signature · 7 lines
2.28.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 2/8] remoteproc: add is_iomem to da_to_va
Quoted 5 lines · Peng Fan (OSS)
From: Peng Fan <[email protected]>
Introduce an extra parameter
is_iomemtoda_to_va, then the caller could take the memory as normal memory or io mapped memory.
Regards,
Bjorn
Quoted 388 lines
Signed-off-by Peng Fan <[email protected]>---
V4:
New patchdrivers/remoteproc/imx_rproc.c | 2 +- drivers/remoteproc/ingenic_rproc.c | 2 +- drivers/remoteproc/keystone_remoteproc.c | 2 +- drivers/remoteproc/mtk_scp.c | 6 +++--- drivers/remoteproc/omap_remoteproc.c | 2 +- drivers/remoteproc/pru_rproc.c | 2 +- drivers/remoteproc/qcom_q6v5_adsp.c | 2 +- drivers/remoteproc/qcom_q6v5_pas.c | 2 +- drivers/remoteproc/qcom_q6v5_wcss.c | 2 +- drivers/remoteproc/qcom_wcnss.c | 2 +- drivers/remoteproc/remoteproc_core.c | 7 +++++-- drivers/remoteproc/remoteproc_coredump.c | 8 ++++++-- drivers/remoteproc/remoteproc_debugfs.c | 2 +- drivers/remoteproc/remoteproc_elf_loader.c | 21 +++++++++++++++------ drivers/remoteproc/remoteproc_internal.h | 2 +- drivers/remoteproc/st_slim_rproc.c | 2 +- drivers/remoteproc/ti_k3_dsp_remoteproc.c | 2 +- drivers/remoteproc/ti_k3_r5_remoteproc.c | 2 +- drivers/remoteproc/wkup_m3_rproc.c | 2 +- include/linux/remoteproc.h | 2 +- 20 files changed, 45 insertions(+), 29 deletions(-)drivers/remoteproc/imx_rproc.c +1
-1@@ -208,7 +208,7 @@ static int imx_rproc_da_to_sys(struct imx_rproc *priv, u64 da,return -ENOENT ; } -static void *imx_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len) +static void *imx_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len,bool *is_iomem) {struct imx_rproc *priv = rproc->priv;void *va =NULL ;drivers/remoteproc/ingenic_rproc.c +1
-1@@ -116,7 +116,7 @@ static void ingenic_rproc_kick(struct rproc *rproc, int vqid)writel (vqid, vpu->aux_base +REG_CORE_MSG ); } -static void *ingenic_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len) +static void *ingenic_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len,bool *is_iomem) {struct vpu *vpu = rproc->priv;void __iomem *va =NULL ;drivers/remoteproc/keystone_remoteproc.c +1
-1@@ -246,7 +246,7 @@ static void keystone_rproc_kick(struct rproc *rproc, int vqid)* can be used either by the remoteproc core for loading (when using kernel * remoteproc loader), or by any rpmsg bus drivers. */ -static void *keystone_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len) +static void *keystone_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len,bool *is_iomem) {struct keystone_rproc *ksproc = rproc->priv;void __iomem *va =NULL ;drivers/remoteproc/mtk_scp.c +3
-3@@ -270,7 +270,7 @@ static int scp_elf_load_segments(struct rproc *rproc, const struct firmware *fw) }/* grab the kernel address for this device address */ - ptr = (void __iomem *)rproc_da_to_va (rproc, da, memsz); + ptr = (void __iomem *)rproc_da_to_va (rproc, da, memsz,NULL );if (!ptr) {dev_err (dev,"bad phdr da 0x%x mem 0x%x\n" , da, memsz); ret = -EINVAL ;@@ -458,7 +458,7 @@ static int scp_start(struct rproc *rproc)return ret; } -static void *scp_da_to_va (struct rproc *rproc,u64 da,size_t len) +static void *scp_da_to_va (struct rproc *rproc,u64 da,size_t len,bool *is_iomem) {struct mtk_scp *scp = (struct mtk_scp *)rproc->priv;int offset;@@ -587,7 +587,7 @@ void *scp_mapping_dm_addr(struct mtk_scp *scp, u32 mem_addr) {void *ptr; - ptr =scp_da_to_va (scp->rproc, mem_addr,0 ); + ptr =scp_da_to_va (scp->rproc, mem_addr,0 ,NULL );if (!ptr)return ERR_PTR (-EINVAL );drivers/remoteproc/omap_remoteproc.c +1
-1@@ -728,7 +728,7 @@ static int omap_rproc_stop(struct rproc *rproc)* Return: translated virtual address in kernel memory space on success, * or NULL on failure. */ -static void *omap_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len) +static void *omap_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len,bool *is_iomem) {struct omap_rproc *oproc = rproc->priv;int i;drivers/remoteproc/pru_rproc.c +1
-1@@ -465,7 +465,7 @@ static void *pru_i_da_to_va(struct pru_rproc *pru, u32 da, size_t len)* core for any PRU client drivers. The PRU Instruction RAM access is restricted * only to the PRU loader code. */ -static void *pru_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len) +static void *pru_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len,bool *is_iomem) {struct pru_rproc *pru = rproc->priv;drivers/remoteproc/qcom_q6v5_adsp.c +1
-1@@ -281,7 +281,7 @@ static int adsp_stop(struct rproc *rproc)return ret; } -static void *adsp_da_to_va (struct rproc *rproc,u64 da,size_t len) +static void *adsp_da_to_va (struct rproc *rproc,u64 da,size_t len,bool *is_iomem) {struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv;int offset;drivers/remoteproc/qcom_q6v5_pas.c +1
-1@@ -242,7 +242,7 @@ static int adsp_stop(struct rproc *rproc)return ret; } -static void *adsp_da_to_va (struct rproc *rproc,u64 da,size_t len) +static void *adsp_da_to_va (struct rproc *rproc,u64 da,size_t len,bool *is_iomem) {struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv;int offset;drivers/remoteproc/qcom_q6v5_wcss.c +1
-1@@ -410,7 +410,7 @@ static int q6v5_wcss_stop(struct rproc *rproc)return 0 ; } -static void *q6v5_wcss_da_to_va (struct rproc *rproc,u64 da,size_t len) +static void *q6v5_wcss_da_to_va (struct rproc *rproc,u64 da,size_t len,bool *is_iomem) {struct q6v5_wcss *wcss = rproc->priv;int offset;drivers/remoteproc/qcom_wcnss.c +1
-1@@ -320,7 +320,7 @@ static int wcnss_stop(struct rproc *rproc)return ret; } -static void *wcnss_da_to_va (struct rproc *rproc,u64 da,size_t len) +static void *wcnss_da_to_va (struct rproc *rproc,u64 da,size_t len,bool *is_iomem) {struct qcom_wcnss *wcnss = (struct qcom_wcnss *)rproc->priv;int offset;drivers/remoteproc/remoteproc_core.c +5
-2@@ -189,13 +189,13 @@ EXPORT_SYMBOL(rproc_va_to_pa);* here the output of the DMA API for the carveouts, which should be more * correct. */ -void *rproc_da_to_va (struct rproc *rproc,u64 da,size_t len) +void *rproc_da_to_va (struct rproc *rproc,u64 da,size_t len,bool *is_iomem) {struct rproc_mem_entry *carveout;void *ptr =NULL ;if (rproc->ops->da_to_va) { - ptr = rproc->ops->da_to_va (rproc, da, len); + ptr = rproc->ops->da_to_va (rproc, da, len, is_iomem);if (ptr) goto out; }@@ -217,6 +217,9 @@ void *rproc_da_to_va(struct rproc *rproc, u64 da, size_t len) ptr = carveout->va + offset; +if (is_iomem) + *is_iomem = carveout->is_iomem; +break ; }drivers/remoteproc/remoteproc_coredump.c +6
-2@@ -153,18 +153,22 @@ static void rproc_copy_segment(struct rproc *rproc, void *dest, size_t offset, size_t size) { void *ptr; +bool is_iomem;if (segment->dump) { segment->dump (rproc, segment, dest, offset, size); }else { - ptr =rproc_da_to_va (rproc, segment->da + offset, size); + ptr =rproc_da_to_va (rproc, segment->da + offset, size, &is_iomem);if (!ptr) {dev_err (&rproc->dev,"invalid copy request for segment %pad with offset %zu and size %zu)\n" , &segment->da, offset, size);memset (dest,0xff , size); }else { -memcpy (dest, ptr, size); +if (is_iomem) +memcpy_fromio (dest, ptr, size); +else +memcpy (dest, ptr, size); } } }drivers/remoteproc/remoteproc_debugfs.c +1
-1@@ -132,7 +132,7 @@ static ssize_t rproc_trace_read(struct file *filp, char __user *userbuf,char buf[100 ];int len; - va =rproc_da_to_va (data->rproc, trace->da, trace->len); + va =rproc_da_to_va (data->rproc, trace->da, trace->len,NULL );if (!va) { len = scnprintf(buf, sizeof(buf), "Trace %s not available\n",drivers/remoteproc/remoteproc_elf_loader.c +15
-6@@ -175,6 +175,7 @@ int rproc_elf_load_segments(struct rproc *rproc, const struct firmware *fw)u64 offset =elf_phdr_get_p_offset (class, phdr);u32 type =elf_phdr_get_p_type (class, phdr);void *ptr; +bool is_iomem;if (type !=PT_LOAD )continue ;@@ -204,7 +205,7 @@ int rproc_elf_load_segments(struct rproc *rproc, const struct firmware *fw) }/* grab the kernel address for this device address */ - ptr =rproc_da_to_va (rproc, da, memsz); + ptr =rproc_da_to_va (rproc, da, memsz, &is_iomem);if (!ptr) {dev_err (dev,"bad phdr da 0x%llx mem 0x%llx\n" , da, memsz);@@ -213,8 +214,12 @@ int rproc_elf_load_segments(struct rproc *rproc, const struct firmware *fw) }/* put the segment where the remote processor expects it */ -if (filesz) -memcpy (ptr, elf_data + offset, filesz); +if (filesz) { +if (is_iomem) +memcpy_fromio (ptr, elf_data + offset, filesz); +else +memcpy (ptr, elf_data + offset, filesz); + }/* * Zero out remaining memory for this segment. @@ -223,8 +228,12 @@ int rproc_elf_load_segments(struct rproc *rproc, const struct firmware *fw)* did this for us. albeit harmless, we may consider removing * this. */ -if (memsz > filesz) -memset (ptr + filesz,0 , memsz - filesz); +if (memsz > filesz) { +if (is_iomem) +memset_io (ptr + filesz,0 , memsz - filesz); +else +memset (ptr + filesz,0 , memsz - filesz); + } }return ret;@@ -377,6 +386,6 @@ struct resource_table *rproc_elf_find_loaded_rsc_table(struct rproc *rproc,return NULL ; } -return rproc_da_to_va (rproc, sh_addr, sh_size); +return rproc_da_to_va (rproc, sh_addr, sh_size,NULL ); }EXPORT_SYMBOL (rproc_elf_find_loaded_rsc_table);drivers/remoteproc/remoteproc_internal.h +1
-1@@ -84,7 +84,7 @@ static inline void rproc_char_device_remove(struct rproc *rproc)void rproc_free_vring (struct rproc_vring *rvring);int rproc_alloc_vring (struct rproc_vdev *rvdev,int i); -void *rproc_da_to_va (struct rproc *rproc,u64 da,size_t len); +void *rproc_da_to_va (struct rproc *rproc,u64 da,size_t len,bool *is_iomem);phys_addr_t rproc_va_to_pa (void *cpu_addr);int rproc_trigger_recovery (struct rproc *rproc);drivers/remoteproc/st_slim_rproc.c +1
-1@@ -174,7 +174,7 @@ static int slim_rproc_stop(struct rproc *rproc)return 0 ; } -static void *slim_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len) +static void *slim_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len,bool *is_iomem) {struct st_slim_rproc *slim_rproc = rproc->priv;void *va =NULL ;drivers/remoteproc/ti_k3_dsp_remoteproc.c +1
-1@@ -354,7 +354,7 @@ static int k3_dsp_rproc_stop(struct rproc *rproc)* can be used either by the remoteproc core for loading (when using kernel * remoteproc loader), or by any rpmsg bus drivers. */ -static void *k3_dsp_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len) +static void *k3_dsp_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len,bool *is_iomem) {struct k3_dsp_rproc *kproc = rproc->priv;void __iomem *va =NULL ;drivers/remoteproc/ti_k3_r5_remoteproc.c +1
-1@@ -590,7 +590,7 @@ static int k3_r5_rproc_stop(struct rproc *rproc)* present in a DSP or IPU device). The translated addresses can be used * either by the remoteproc core for loading, or by any rpmsg bus drivers. */ -static void *k3_r5_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len) +static void *k3_r5_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len,bool *is_iomem) {struct k3_r5_rproc *kproc = rproc->priv;struct k3_r5_core *core = kproc->core;drivers/remoteproc/wkup_m3_rproc.c +1
-1@@ -89,7 +89,7 @@ static int wkup_m3_rproc_stop(struct rproc *rproc)return error; } -static void *wkup_m3_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len) +static void *wkup_m3_rproc_da_to_va (struct rproc *rproc,u64 da,size_t len,bool *is_iomem) {struct wkup_m3_rproc *wkupm3 = rproc->priv;void *va =NULL ;include/linux/remoteproc.h +1
-1@@ -386,7 +386,7 @@ struct rproc_ops {int (*stop)(struct rproc *rproc);int (*attach)(struct rproc *rproc);void (*kick)(struct rproc *rproc,int vqid); -void * (*da_to_va)(struct rproc *rproc,u64 da,size_t len); +void * (*da_to_va)(struct rproc *rproc,u64 da,size_t len,bool *is_iomem);int (*parse_fw)(struct rproc *rproc,const struct firmware *fw);int (*handle_rsc)(struct rproc *rproc,u32 rsc_type,void *rsc,int offset,int avail);Signature · 1 line
2.28.0
PATCH 3/8 remoteproc: imx_rproc: correct err message
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
It is using devm_ioremap, so not devm_ioremap_resource. Correct the error message and print out sa/size.
---
V4:
Drop the R-b tag
Follow Bjorn's comments, correct/update the err msg.
drivers/remoteproc/imx_rproc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/remoteproc/imx_rproc.c +2 -2
@@ -268,7 +268,7 @@ static int imx_rproc_addr_init(struct imx_rproc *priv, priv->mem[b].cpu_addr =devm_ioremap (&pdev->dev, att->sa, att->size);if (!priv->mem[b].cpu_addr) { -dev_err (dev,"devm_ioremap_resource failed\n" ); +dev_err (dev,"failed to remap %#x bytes from %#x\n" , att->size, att->sa);return -ENOMEM ; } priv->mem[b].sys_addr = att->sa;
@@ -298,7 +298,7 @@ static int imx_rproc_addr_init(struct imx_rproc *priv, priv->mem[b].cpu_addr =devm_ioremap_resource (&pdev->dev, &res);if (IS_ERR (priv->mem[b].cpu_addr)) { -dev_err (dev,"devm_ioremap_resource failed\n" ); +dev_err (dev,"failed to remap %pr\n" , &res); err =PTR_ERR (priv->mem[b].cpu_addr);return err; }
Signature · 7 lines
2.28.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 3/8] remoteproc: imx_rproc: correct err message
Quoted 5 lines · Peng Fan (OSS)
From: Peng Fan <[email protected]>
It is using
devm_ioremap, so notdevm_ioremap_resource. Correct the error message and print out sa/size.
Quoted 35 lines
Signed-off-by Peng Fan <[email protected]>---
V4:
Drop the R-b tag
Follow Bjorn's comments, correct/update the err msg.drivers/remoteproc/imx_rproc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/remoteproc/imx_rproc.c +2
-2@@ -268,7 +268,7 @@ static int imx_rproc_addr_init(struct imx_rproc *priv, priv->mem[b].cpu_addr =devm_ioremap (&pdev->dev, att->sa, att->size);if (!priv->mem[b].cpu_addr) { -dev_err (dev,"devm_ioremap_resource failed\n" ); +dev_err (dev,"failed to remap %#x bytes from %#x\n" , att->size, att->sa);return -ENOMEM ; } priv->mem[b].sys_addr = att->sa;@@ -298,7 +298,7 @@ static int imx_rproc_addr_init(struct imx_rproc *priv, priv->mem[b].cpu_addr =devm_ioremap_resource (&pdev->dev, &res);if (IS_ERR (priv->mem[b].cpu_addr)) { -dev_err (dev,"devm_ioremap_resource failed\n" ); +dev_err (dev,"failed to remap %pr\n" , &res); err =PTR_ERR (priv->mem[b].cpu_addr);return err; }Signature · 1 line
2.28.0
PATCH 4/8 remoteproc: imx_rproc: use devm_ioremap
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
We might need to map an region multiple times, becaue the region might be shared between remote processors, such i.MX8QM with dual M4 cores. So use devm_ioremap, not devm_ioremap_resource.
---
V4:
None
drivers/remoteproc/imx_rproc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/remoteproc/imx_rproc.c +2 -1
@@ -296,7 +296,8 @@ static int imx_rproc_addr_init(struct imx_rproc *priv,if (b >=IMX7D_RPROC_MEM_MAX )break ; - priv->mem[b].cpu_addr =devm_ioremap_resource (&pdev->dev, &res); +/* Not use resource version, because we might share region */ + priv->mem[b].cpu_addr =devm_ioremap (&pdev->dev, res.start,resource_size (&res));if (IS_ERR (priv->mem[b].cpu_addr)) {dev_err (dev,"failed to remap %pr \n" , &res); err =PTR_ERR (priv->mem[b].cpu_addr);
Signature · 7 lines
2.28.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 5/8 remoteproc: imx_rproc: add i.MX specific parse fw hook
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
The hook is used to parse memory-regions and load resource table from the address the remote processor published.
---
V4:
None
drivers/remoteproc/imx_rproc.c | 93 ++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+)
drivers/remoteproc/imx_rproc.c +93 -0
@@ -10,6 +10,7 @@#include <linux/mfd/syscon.h> #include <linux/module.h> #include <linux/of_address.h> +#include <linux/of_reserved_mem.h> #include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/regmap.h>
@@ -241,10 +242,102 @@ static void *imx_rproc_da_to_va(struct rproc *rproc, u64 da, size_t len, bool *ireturn va; } +static int imx_rproc_mem_alloc (struct rproc *rproc, +struct rproc_mem_entry *mem) +{ +struct device *dev = rproc->dev.parent; +void *va; + +dev_dbg (dev,"map memory: %p+%zx\n" , &mem->dma, mem->len); + va =ioremap_wc (mem->dma, mem->len); +if (IS_ERR_OR_NULL (va)) { +dev_err (dev,"Unable to map memory region: %p+%zx\n" , + &mem->dma, mem->len); +return -ENOMEM ; + } + +/* Update memory entry va */ + mem->va = va; + +return 0 ; +} + +static int imx_rproc_mem_release (struct rproc *rproc, +struct rproc_mem_entry *mem) +{ +dev_dbg (rproc->dev.parent,"unmap memory: %pa\n" , &mem->dma); +iounmap (mem->va); + +return 0 ; +} + +static int imx_rproc_parse_memory_regions (struct rproc *rproc) +{ +struct imx_rproc *priv = rproc->priv; +struct device_node *np = priv->dev->of_node; +struct of_phandle_iterator it; +struct rproc_mem_entry *mem; +struct reserved_mem *rmem; +u32 da; + +/* Register associated reserved memory regions */ +of_phandle_iterator_init (&it, np,"memory-region" ,NULL ,0 ); +while (of_phandle_iterator_next (&it) ==0 ) { +/* +* Ignore the first memory region which will be used vdev buffer. +* No need to do extra handlings, rproc_add_virtio_dev will handle it. +*/ +if (!strcmp (it.node->name,"vdevbuffer" )) +continue ; + + rmem =of_reserved_mem_lookup (it.node); +if (!rmem) { +dev_err (priv->dev,"unable to acquire memory-region\n" ); +return -EINVAL ; + } + +/* No need to translate pa to da, i.MX use same map */ + da = rmem->base; + +/* Register memory region */ + mem =rproc_mem_entry_init (priv->dev,NULL , (dma_addr_t )rmem->base, rmem->size, da, + imx_rproc_mem_alloc, imx_rproc_mem_release, + it.node->name); + +if (mem) +rproc_coredump_add_segment (rproc, da, rmem->size); +else +return -ENOMEM ; + +rproc_add_carveout (rproc, mem); + } + +return 0 ; +} + +static int imx_rproc_parse_fw (struct rproc *rproc,const struct firmware *fw) +{ +int ret =imx_rproc_parse_memory_regions (rproc); + +if (ret) +return ret; + + ret =rproc_elf_load_rsc_table (rproc, fw); +if (ret) +dev_info (&rproc->dev,"No resource table in elf\n" ); + +return 0 ; +} +static const struct rproc_ops imx_rproc_ops = { .start = imx_rproc_start, .stop = imx_rproc_stop, .da_to_va = imx_rproc_da_to_va, + .load = rproc_elf_load_segments, + .parse_fw = imx_rproc_parse_fw, + .find_loaded_rsc_table = rproc_elf_find_loaded_rsc_table, + .sanity_check = rproc_elf_sanity_check, + .get_boot_addr = rproc_elf_get_boot_addr, }; static int imx_rproc_addr_init(struct imx_rproc *priv,
Signature · 7 lines
2.28.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 6/8 remoteproc: imx_rproc: support i.MX8MQ/M
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
Add i.MX8MQ dev/sys addr map and configuration data structure i.MX8MM share i.MX8MQ settings.
---
V4:
None
drivers/remoteproc/imx_rproc.c | 39 ++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+)
drivers/remoteproc/imx_rproc.c +39 -0
@@ -88,6 +88,34 @@ struct imx_rproc {struct clk *clk; }; +static const struct imx_rproc_att imx_rproc_att_imx8mq[] = { +/* dev addr , sys addr , size , flags */ +/* TCML - alias */ + {0x00000000 ,0x007e0000 ,0x00020000 ,0 }, +/* OCRAM_S */ + {0x00180000 ,0x00180000 ,0x00008000 ,0 }, +/* OCRAM */ + {0x00900000 ,0x00900000 ,0x00020000 ,0 }, +/* OCRAM */ + {0x00920000 ,0x00920000 ,0x00020000 ,0 }, +/* QSPI Code - alias */ + {0x08000000 ,0x08000000 ,0x08000000 ,0 }, +/* DDR (Code) - alias */ + {0x10000000 ,0x80000000 ,0x0FFE0000 ,0 }, +/* TCML */ + {0x1FFE0000 ,0x007E0000 ,0x00020000 ,ATT_OWN }, +/* TCMU */ + {0x20000000 ,0x00800000 ,0x00020000 ,ATT_OWN }, +/* OCRAM_S */ + {0x20180000 ,0x00180000 ,0x00008000 ,ATT_OWN }, +/* OCRAM */ + {0x20200000 ,0x00900000 ,0x00020000 ,ATT_OWN }, +/* OCRAM */ + {0x20220000 ,0x00920000 ,0x00020000 ,ATT_OWN }, +/* DDR (Data) */ + {0x40000000 ,0x40000000 ,0x80000000 ,0 }, +}; +static const struct imx_rproc_att imx_rproc_att_imx7d[] = {/* dev addr , sys addr , size , flags */ /* OCRAM_S (M4 Boot code) - alias */
@@ -138,6 +166,15 @@ static const struct imx_rproc_att imx_rproc_att_imx6sx[] = { { 0x80000000, 0x80000000, 0x60000000, 0 }, }; +static const struct imx_rproc_dcfg imx_rproc_cfg_imx8mq = { + .src_reg =IMX7D_SRC_SCR , + .src_mask =IMX7D_M4_RST_MASK , + .src_start =IMX7D_M4_START , + .src_stop =IMX7D_M4_STOP , + .att = imx_rproc_att_imx8mq, + .att_size =ARRAY_SIZE (imx_rproc_att_imx8mq), +}; +static const struct imx_rproc_dcfg imx_rproc_cfg_imx7d = { .src_reg =IMX7D_SRC_SCR , .src_mask = IMX7D_M4_RST_MASK,
@@ -496,6 +533,8 @@ static int imx_rproc_remove(struct platform_device *pdev)static const struct of_device_id imx_rproc_of_match[] = { { .compatible ="fsl,imx7d-cm4" , .data = &imx_rproc_cfg_imx7d }, { .compatible ="fsl,imx6sx-cm4" , .data = &imx_rproc_cfg_imx6sx }, + { .compatible ="fsl,imx8mq-cm4" , .data = &imx_rproc_cfg_imx8mq }, + { .compatible ="fsl,imx8mm-cm4" , .data = &imx_rproc_cfg_imx8mq }, {}, };MODULE_DEVICE_TABLE (of, imx_rproc_of_match);
Signature · 7 lines
2.28.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 7/8 remoteproc: imx_rproc: ignore mapping vdev regions
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
vdev regions are vdev0vring0, vdev0vring1, vdevbuffer and similar. They are handled by remoteproc common code, no need to map in imx rproc driver.
---
V4:
New
drivers/remoteproc/imx_rproc.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/remoteproc/imx_rproc.c +3 -0
@@ -417,6 +417,9 @@ 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" )) +continue ; err =of_address_to_resource (node,0 , &res);if (err) {dev_err (dev,"unable to resolve memory region\n" );
Signature · 7 lines
2.28.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 8/8 remoteproc: imx_proc: enable virtio/mailbox
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
Use virtio/mailbox to build connection between Remote Proccessors and Linux. Add work queue to handle incoming messages.
---
V4:
Use dev_err_probe to simplify code
Use queue_work
drivers/remoteproc/imx_rproc.c | 115 ++++++++++++++++++++++++++++++++- 1 file changed, 112 insertions(+), 3 deletions(-)
drivers/remoteproc/imx_rproc.c +112 -3
@@ -7,6 +7,7 @@#include <linux/err.h> #include <linux/interrupt.h> #include <linux/kernel.h> +#include <linux/mailbox_client.h> #include <linux/mfd/syscon.h> #include <linux/module.h> #include <linux/of_address.h>
@@ -15,6 +16,9 @@#include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/remoteproc.h> +#include <linux/workqueue.h> + +#include "remoteproc_internal.h" #define IMX7D_SRC_SCR 0x0C#define IMX7D_ENABLE_M4 BIT(3)
@@ -86,6 +90,11 @@ struct imx_rproc {const struct imx_rproc_dcfg *dcfg;struct imx_rproc_mem mem[IMX7D_RPROC_MEM_MAX ];struct clk *clk; +struct mbox_client cl; +struct mbox_chan *tx_ch; +struct mbox_chan *rx_ch; +struct work_struct rproc_work; +struct workqueue_struct *workqueue; };static const struct imx_rproc_att imx_rproc_att_imx8mq[] = {
@@ -366,9 +375,33 @@ static int imx_rproc_parse_fw(struct rproc *rproc, const struct firmware *fw)return 0 ; } +static void imx_rproc_kick (struct rproc *rproc,int vqid) +{ +struct imx_rproc *priv = rproc->priv; +int err; +__u32 mmsg; + +if (!priv->tx_ch) { +dev_err (priv->dev,"No initialized mbox tx channel\n" ); +return ; + } + +/* +* Send the index of the triggered virtqueue as the mu payload. +* Let remote processor know which virtqueue is used. +*/ + mmsg = vqid <<16 ; + + err =mbox_send_message (priv->tx_ch, (void *)&mmsg); +if (err <0 ) +dev_err (priv->dev,"%s: failed (%d, err:%d)\n" , + __func__, vqid, err); +} +static const struct rproc_ops imx_rproc_ops = { .start = imx_rproc_start, .stop = imx_rproc_stop, + .kick = imx_rproc_kick, .da_to_va = imx_rproc_da_to_va, .load = rproc_elf_load_segments, .parse_fw = imx_rproc_parse_fw,
@@ -444,6 +477,65 @@ static int imx_rproc_addr_init(struct imx_rproc *priv,return 0 ; } +static void imx_rproc_vq_work (struct work_struct *work) +{ + struct imx_rproc *priv = container_of(work, struct imx_rproc, + rproc_work); + +rproc_vq_interrupt (priv->rproc,0 ); +rproc_vq_interrupt (priv->rproc,1 ); +} + +static void imx_rproc_rx_callback (struct mbox_client *cl,void *msg) +{ +struct rproc *rproc =dev_get_drvdata (cl->dev); +struct imx_rproc *priv = rproc->priv; + +queue_work (priv->workqueue, &priv->rproc_work); +} + +static int imx_rproc_xtr_mbox_init (struct rproc *rproc) +{ +struct imx_rproc *priv = rproc->priv; +struct device *dev = priv->dev; +struct mbox_client *cl; +int ret; + +if (!of_get_property (dev->of_node,"mbox-names" ,NULL )) +return 0 ; + + cl = &priv->cl; + cl->dev = dev; + cl->tx_block = true; + cl->tx_tout =100 ; + cl->knows_txdone = false; + cl->rx_callback = imx_rproc_rx_callback; + + priv->tx_ch =mbox_request_channel_byname (cl,"tx" ); +if (IS_ERR (priv->tx_ch)) { + ret =PTR_ERR (priv->tx_ch); +return dev_err_probe (cl->dev,PTR_ERR (priv->tx_ch), +"failed to request tx mailbox channel: %d\n" , ret); + } + + priv->rx_ch =mbox_request_channel_byname (cl,"rx" ); +if (IS_ERR (priv->rx_ch)) { +mbox_free_channel (priv->tx_ch); +return dev_err_probe (cl->dev,PTR_ERR (priv->rx_ch), +"failed to request mbox tx chan\n" ); + } + +return 0 ; +} + +static void imx_rproc_free_mbox (struct rproc *rproc) +{ +struct imx_rproc *priv = rproc->priv; + +mbox_free_channel (priv->tx_ch); +mbox_free_channel (priv->rx_ch); +} +static int imx_rproc_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;
@@ -481,18 +573,28 @@ static int imx_rproc_probe(struct platform_device *pdev) priv->dev = dev;dev_set_drvdata (dev, rproc); + priv->workqueue =create_workqueue (dev_name (dev)); +if (!priv->workqueue) { +dev_err (dev,"cannot create workqueue\n" ); + ret = -ENOMEM ; + goto err_put_rproc; + } + + ret =imx_rproc_xtr_mbox_init (rproc); +if (ret) + goto err_put_wkq; ret =imx_rproc_addr_init (priv, pdev);if (ret) {dev_err (dev,"failed on imx_rproc_addr_init\n" ); - goto err_put_rproc; + goto err_put_mbox; } priv->clk =devm_clk_get (dev,NULL );if (IS_ERR (priv->clk)) {dev_err (dev,"Failed to get clock\n" ); ret =PTR_ERR (priv->clk); - goto err_put_rproc; + goto err_put_mbox; }/*
@@ -502,9 +604,11 @@ static int imx_rproc_probe(struct platform_device *pdev) ret =clk_prepare_enable (priv->clk);if (ret) {dev_err (&rproc->dev,"Failed to enable clock\n" ); - goto err_put_rproc; + goto err_put_mbox; } +INIT_WORK (&(priv->rproc_work), imx_rproc_vq_work); + ret =rproc_add (rproc);if (ret) {dev_err (dev,"rproc_add failed\n" );
@@ -515,6 +619,10 @@ static int imx_rproc_probe(struct platform_device *pdev) err_put_clk:clk_disable_unprepare (priv->clk); +err_put_mbox: +imx_rproc_free_mbox (rproc); +err_put_wkq: +destroy_workqueue (priv->workqueue); err_put_rproc:rproc_free (rproc);
@@ -527,6 +635,7 @@ static int imx_rproc_remove(struct platform_device *pdev)struct imx_rproc *priv = rproc->priv;clk_disable_unprepare (priv->clk); +imx_rproc_free_mbox (rproc);rproc_del (rproc);rproc_free (rproc);
Signature · 7 lines
2.28.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Hi Bjorn,
Quoted 1 line
Subject: [PATCH 0/8] remoteproc:
imx_rproc: support iMX8MQ/M
I forgot to add subject-prefix V4 when format-patch.
Do you need to send out v5? or you could take this v4 version if it is ok for you?
Thanks,
Peng.
Quoted 75 lines
From: Peng Fan <[email protected]>
V4:
According to Bjorn's comments, addis_iomemfor da to va usage 1/8, 2/8
is new patch 3/8, follow Bjorn's comments to correct/update the err msg.
6/8, new patch
8/8, usedev_err_probeto simplify code, usequeue_workinsteadschedule_delayed_work
https://lkml.org/lkml/2020/12/4/82V3:
Since I was quite busy in the past days, V3 is late Rebased on Linux-next
Add R-b tags
1/7: Add R-b tag of Mathieu, add comments
4/7: Typo fix
5/7: Add R-b tag of Mathieu, drop index Per Mathieu's comments 6/7: Add R-b tag of Mathieu
7/7: Add comment for vqid << 16, drop unneeded timeout settings of
mailbox
Usequeue_workinstead ofschedule_delayed_work
free mbox channels when removeV2:
Rebased on linux-next
Dropped early boot feature to make patchset simple. Drop rsc-dahttps://patchwork.kernel.org/project/linux-remoteproc/cover/20200927064
[email protected]/V1:
https://patchwork.kernel.org/cover/11682461/This patchset is to support i.MX8MQ/M coproc.
The early boot feature was dropped to make the patchset small in V2.Since i.MX specific TCM memory requirement, add elf platform hook. Several patches have got reviewed by Oleksij and Mathieu in v1.
Peng Fan (8):
remoteproc: introduceis_iomemtorproc_mem_entry
remoteproc: addis_iomemtoda_to_va
remoteproc:imx_rproc: correct err message
remoteproc:imx_rproc: usedevm_ioremap
remoteproc:imx_rproc: add i.MX specific parse fw hook
remoteproc:imx_rproc: support i.MX8MQ/M
remoteproc:imx_rproc: ignore mapping vdev regions
remoteproc:imx_proc: enable virtio/mailboxdrivers/remoteproc/imx_rproc.c | 259 ++++++++++++++++++++- drivers/remoteproc/ingenic_rproc.c | 2 +- drivers/remoteproc/keystone_remoteproc.c | 2 +- drivers/remoteproc/mtk_scp.c | 6 +- drivers/remoteproc/omap_remoteproc.c | 2 +- drivers/remoteproc/pru_rproc.c | 2 +- drivers/remoteproc/qcom_q6v5_adsp.c | 2 +- drivers/remoteproc/qcom_q6v5_pas.c | 2 +- drivers/remoteproc/qcom_q6v5_wcss.c | 2 +- drivers/remoteproc/qcom_wcnss.c | 2 +- drivers/remoteproc/remoteproc_core.c | 7 +- drivers/remoteproc/remoteproc_coredump.c | 8 +- drivers/remoteproc/remoteproc_debugfs.c | 2 +- drivers/remoteproc/remoteproc_elf_loader.c | 21 +- drivers/remoteproc/remoteproc_internal.h | 2 +- drivers/remoteproc/st_slim_rproc.c | 2 +- drivers/remoteproc/ti_k3_dsp_remoteproc.c | 2 +- drivers/remoteproc/ti_k3_r5_remoteproc.c | 2 +- drivers/remoteproc/wkup_m3_rproc.c | 2 +- include/linux/remoteproc.h | 4 +- 20 files changed, 298 insertions(+), 35 deletions(-)--
2.28.0