| Message ID | 20190709072547.217957-4-pihsun@chromium.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add support for mt8183 SCP. | expand |
On Tue, Jul 9, 2019 at 4:27 PM Pi-Hsun Shih <pihsun@chromium.org> wrote: > > From: Erin Lo <erin.lo@mediatek.com> > > Add memory table mapping API for other driver to lookup > reserved physical and virtual memory > > Signed-off-by: Erin Lo <erin.lo@mediatek.com> > Signed-off-by: Pi-Hsun Shih <pihsun@chromium.org> > --- > Changes from v12: > - Reformat a line to fit 80 character width. > > Changes from v11: > - No change. > > Changes from v10: > - Fix some type mismatch warnings when printing debug messages. > > Changes from v9: > - No change. > > Changes from v8: > - Add more reserved regions for camera ISP. > > Changes from v7, v6, v5: > - No change. > > Changes from v4: > - New patch. > --- > drivers/remoteproc/mtk_scp.c | 136 ++++++++++++++++++++++++++ > include/linux/platform_data/mtk_scp.h | 24 +++++ > 2 files changed, 160 insertions(+) > > diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c > index 4713574d1aa2..dec271f69423 100644 > --- a/drivers/remoteproc/mtk_scp.c > +++ b/drivers/remoteproc/mtk_scp.c > @@ -358,6 +358,138 @@ void *scp_mapping_dm_addr(struct platform_device *pdev, u32 mem_addr) > } > EXPORT_SYMBOL_GPL(scp_mapping_dm_addr); > > +#if SCP_RESERVED_MEM > +phys_addr_t scp_mem_base_phys; > +phys_addr_t scp_mem_base_virt; > +phys_addr_t scp_mem_size; Can't these be static? Also scp_mem_size should probably be of type size_t. > + > +static struct scp_reserve_mblock scp_reserve_mblock[] = { > + { > + .num = SCP_ISP_MEM_ID, > + .start_phys = 0x0, > + .start_virt = 0x0, > + .size = 0x200000, /*2MB*/ > + }, > + { > + .num = SCP_ISP_MEM2_ID, > + .start_phys = 0x0, > + .start_virt = 0x0, > + .size = 0x800000, /*8MB*/ > + }, > + { > + .num = SCP_DIP_MEM_ID, > + .start_phys = 0x0, > + .start_virt = 0x0, > + .size = 0x900000, /*9MB*/ > + }, > + { > + .num = SCP_MDP_MEM_ID, > + .start_phys = 0x0, > + .start_virt = 0x0, > + .size = 0x600000, /*6MB*/ > + }, > + { > + .num = SCP_FD_MEM_ID, > + .start_phys = 0x0, > + .start_virt = 0x0, > + .size = 0x100000, /*1MB*/ > + }, > +}; > + > +static int scp_reserve_mem_init(struct mtk_scp *scp) > +{ > + enum scp_reserve_mem_id_t id; > + phys_addr_t accumlate_memory_size = 0; > + > + scp_mem_base_phys = (phys_addr_t) (scp->phys_addr + MAX_CODE_SIZE); > + scp_mem_size = (phys_addr_t) (scp->dram_size - MAX_CODE_SIZE); > + > + dev_info(scp->dev, > + "phys:0x%llx - 0x%llx (0x%llx)\n", > + (unsigned long long)scp_mem_base_phys, > + (unsigned long long)(scp_mem_base_phys + scp_mem_size), > + (unsigned long long)scp_mem_size); > + accumlate_memory_size = 0; > + for (id = 0; id < SCP_NUMS_MEM_ID; id++) { > + scp_reserve_mblock[id].start_phys = > + scp_mem_base_phys + accumlate_memory_size; > + accumlate_memory_size += scp_reserve_mblock[id].size; > + dev_info( > + scp->dev, > + "[reserve_mem:%d]: phys:0x%llx - 0x%llx (0x%llx)\n", id, > + (unsigned long long)scp_reserve_mblock[id].start_phys, > + (unsigned long long)(scp_reserve_mblock[id].start_phys + > + scp_reserve_mblock[id].size), > + (unsigned long long)scp_reserve_mblock[id].size); > + } > + return 0; > +} > + > +static int scp_reserve_memory_ioremap(struct mtk_scp *scp) > +{ > + enum scp_reserve_mem_id_t id; > + phys_addr_t accumlate_memory_size = 0; > + > + scp_mem_base_virt = (phys_addr_t)(size_t)ioremap_wc(scp_mem_base_phys, > + scp_mem_size); > + > + dev_info(scp->dev, > + "virt:0x%llx - 0x%llx (0x%llx)\n", > + (unsigned long long)scp_mem_base_virt, > + (unsigned long long)(scp_mem_base_virt + scp_mem_size), > + (unsigned long long)scp_mem_size); > + for (id = 0; id < SCP_NUMS_MEM_ID; id++) { > + scp_reserve_mblock[id].start_virt = > + scp_mem_base_virt + accumlate_memory_size; > + accumlate_memory_size += scp_reserve_mblock[id].size; > + } > + /* the reserved memory should be larger then expected memory > + * or scp_reserve_mblock does not match dts > + */ > + WARN_ON(accumlate_memory_size > scp_mem_size); > +#ifdef DEBUG > + for (id = 0; id < NUMS_MEM_ID; id++) { > + dev_info(scp->dev, > + "[mem_reserve-%d] phys:0x%llx,virt:0x%llx,size:0x%llx\n", > + id, > + scp_get_reserve_mem_phys(id), > + scp_get_reserve_mem_virt(id), > + scp_get_reserve_mem_size(id)); > + } > +#endif I'd move this debug block to scp_map_memory_region(), right after calling scp_reserve_memory_ioremap(). > + return 0; > +} > +phys_addr_t scp_get_reserve_mem_phys(enum scp_reserve_mem_id_t id) > +{ > + if (id >= SCP_NUMS_MEM_ID) { > + pr_err("[SCP] no reserve memory for %d", id); > + return 0; > + } else You don't need this else since the error path returns. Valid also for the functions below. > + return scp_reserve_mblock[id].start_phys; > +} > +EXPORT_SYMBOL_GPL(scp_get_reserve_mem_phys); > + > +phys_addr_t scp_get_reserve_mem_virt(enum scp_reserve_mem_id_t id) > +{ > + if (id >= SCP_NUMS_MEM_ID) { > + pr_err("[SCP] no reserve memory for %d", id); > + return 0; > + } else > + return scp_reserve_mblock[id].start_virt; > +} > +EXPORT_SYMBOL_GPL(scp_get_reserve_mem_virt); > + > +phys_addr_t scp_get_reserve_mem_size(enum scp_reserve_mem_id_t id) > +{ > + if (id >= SCP_NUMS_MEM_ID) { > + pr_err("[SCP] no reserve memory for %d", id); > + return 0; > + } else > + return scp_reserve_mblock[id].size; > +} > +EXPORT_SYMBOL_GPL(scp_get_reserve_mem_size); > +#endif > + > static int scp_map_memory_region(struct mtk_scp *scp) > { > struct device_node *node; > @@ -385,6 +517,10 @@ static int scp_map_memory_region(struct mtk_scp *scp) > return -EBUSY; > } > > +#if SCP_RESERVED_MEM > + scp_reserve_mem_init(scp); > + scp_reserve_memory_ioremap(scp); > +#endif > return 0; > } > > diff --git a/include/linux/platform_data/mtk_scp.h b/include/linux/platform_data/mtk_scp.h > index b81ac5c7d320..96e56fdd0917 100644 > --- a/include/linux/platform_data/mtk_scp.h > +++ b/include/linux/platform_data/mtk_scp.h > @@ -138,4 +138,28 @@ unsigned int scp_get_venc_hw_capa(struct platform_device *pdev); > void *scp_mapping_dm_addr(struct platform_device *pdev, > u32 mem_addr); > > +#define SCP_RESERVED_MEM (1) > +#if SCP_RESERVED_MEM > +/* scp reserve memory ID definition*/ > +enum scp_reserve_mem_id_t { > + SCP_ISP_MEM_ID, > + SCP_ISP_MEM2_ID, > + SCP_MDP_MEM_ID, > + SCP_DIP_MEM_ID, > + SCP_FD_MEM_ID, > + SCP_NUMS_MEM_ID, > +}; > + > +struct scp_reserve_mblock { > + enum scp_reserve_mem_id_t num; > + u64 start_phys; > + u64 start_virt; > + u64 size; > +}; > + > +extern phys_addr_t scp_get_reserve_mem_phys(enum scp_reserve_mem_id_t id); > +extern phys_addr_t scp_get_reserve_mem_virt(enum scp_reserve_mem_id_t id); > +extern phys_addr_t scp_get_reserve_mem_size(enum scp_reserve_mem_id_t id); Grammar nit: these should probably be called scp_get_reserved_mem_*. > +#endif > + > #endif /* _MTK_SCP_H */ > -- > 2.22.0.410.gd8fdbe21b5-goog > > > _______________________________________________ > Linux-mediatek mailing list > Linux-mediatek@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-mediatek
diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c index 4713574d1aa2..dec271f69423 100644 --- a/drivers/remoteproc/mtk_scp.c +++ b/drivers/remoteproc/mtk_scp.c @@ -358,6 +358,138 @@ void *scp_mapping_dm_addr(struct platform_device *pdev, u32 mem_addr) } EXPORT_SYMBOL_GPL(scp_mapping_dm_addr); +#if SCP_RESERVED_MEM +phys_addr_t scp_mem_base_phys; +phys_addr_t scp_mem_base_virt; +phys_addr_t scp_mem_size; + +static struct scp_reserve_mblock scp_reserve_mblock[] = { + { + .num = SCP_ISP_MEM_ID, + .start_phys = 0x0, + .start_virt = 0x0, + .size = 0x200000, /*2MB*/ + }, + { + .num = SCP_ISP_MEM2_ID, + .start_phys = 0x0, + .start_virt = 0x0, + .size = 0x800000, /*8MB*/ + }, + { + .num = SCP_DIP_MEM_ID, + .start_phys = 0x0, + .start_virt = 0x0, + .size = 0x900000, /*9MB*/ + }, + { + .num = SCP_MDP_MEM_ID, + .start_phys = 0x0, + .start_virt = 0x0, + .size = 0x600000, /*6MB*/ + }, + { + .num = SCP_FD_MEM_ID, + .start_phys = 0x0, + .start_virt = 0x0, + .size = 0x100000, /*1MB*/ + }, +}; + +static int scp_reserve_mem_init(struct mtk_scp *scp) +{ + enum scp_reserve_mem_id_t id; + phys_addr_t accumlate_memory_size = 0; + + scp_mem_base_phys = (phys_addr_t) (scp->phys_addr + MAX_CODE_SIZE); + scp_mem_size = (phys_addr_t) (scp->dram_size - MAX_CODE_SIZE); + + dev_info(scp->dev, + "phys:0x%llx - 0x%llx (0x%llx)\n", + (unsigned long long)scp_mem_base_phys, + (unsigned long long)(scp_mem_base_phys + scp_mem_size), + (unsigned long long)scp_mem_size); + accumlate_memory_size = 0; + for (id = 0; id < SCP_NUMS_MEM_ID; id++) { + scp_reserve_mblock[id].start_phys = + scp_mem_base_phys + accumlate_memory_size; + accumlate_memory_size += scp_reserve_mblock[id].size; + dev_info( + scp->dev, + "[reserve_mem:%d]: phys:0x%llx - 0x%llx (0x%llx)\n", id, + (unsigned long long)scp_reserve_mblock[id].start_phys, + (unsigned long long)(scp_reserve_mblock[id].start_phys + + scp_reserve_mblock[id].size), + (unsigned long long)scp_reserve_mblock[id].size); + } + return 0; +} + +static int scp_reserve_memory_ioremap(struct mtk_scp *scp) +{ + enum scp_reserve_mem_id_t id; + phys_addr_t accumlate_memory_size = 0; + + scp_mem_base_virt = (phys_addr_t)(size_t)ioremap_wc(scp_mem_base_phys, + scp_mem_size); + + dev_info(scp->dev, + "virt:0x%llx - 0x%llx (0x%llx)\n", + (unsigned long long)scp_mem_base_virt, + (unsigned long long)(scp_mem_base_virt + scp_mem_size), + (unsigned long long)scp_mem_size); + for (id = 0; id < SCP_NUMS_MEM_ID; id++) { + scp_reserve_mblock[id].start_virt = + scp_mem_base_virt + accumlate_memory_size; + accumlate_memory_size += scp_reserve_mblock[id].size; + } + /* the reserved memory should be larger then expected memory + * or scp_reserve_mblock does not match dts + */ + WARN_ON(accumlate_memory_size > scp_mem_size); +#ifdef DEBUG + for (id = 0; id < NUMS_MEM_ID; id++) { + dev_info(scp->dev, + "[mem_reserve-%d] phys:0x%llx,virt:0x%llx,size:0x%llx\n", + id, + scp_get_reserve_mem_phys(id), + scp_get_reserve_mem_virt(id), + scp_get_reserve_mem_size(id)); + } +#endif + return 0; +} +phys_addr_t scp_get_reserve_mem_phys(enum scp_reserve_mem_id_t id) +{ + if (id >= SCP_NUMS_MEM_ID) { + pr_err("[SCP] no reserve memory for %d", id); + return 0; + } else + return scp_reserve_mblock[id].start_phys; +} +EXPORT_SYMBOL_GPL(scp_get_reserve_mem_phys); + +phys_addr_t scp_get_reserve_mem_virt(enum scp_reserve_mem_id_t id) +{ + if (id >= SCP_NUMS_MEM_ID) { + pr_err("[SCP] no reserve memory for %d", id); + return 0; + } else + return scp_reserve_mblock[id].start_virt; +} +EXPORT_SYMBOL_GPL(scp_get_reserve_mem_virt); + +phys_addr_t scp_get_reserve_mem_size(enum scp_reserve_mem_id_t id) +{ + if (id >= SCP_NUMS_MEM_ID) { + pr_err("[SCP] no reserve memory for %d", id); + return 0; + } else + return scp_reserve_mblock[id].size; +} +EXPORT_SYMBOL_GPL(scp_get_reserve_mem_size); +#endif + static int scp_map_memory_region(struct mtk_scp *scp) { struct device_node *node; @@ -385,6 +517,10 @@ static int scp_map_memory_region(struct mtk_scp *scp) return -EBUSY; } +#if SCP_RESERVED_MEM + scp_reserve_mem_init(scp); + scp_reserve_memory_ioremap(scp); +#endif return 0; } diff --git a/include/linux/platform_data/mtk_scp.h b/include/linux/platform_data/mtk_scp.h index b81ac5c7d320..96e56fdd0917 100644 --- a/include/linux/platform_data/mtk_scp.h +++ b/include/linux/platform_data/mtk_scp.h @@ -138,4 +138,28 @@ unsigned int scp_get_venc_hw_capa(struct platform_device *pdev); void *scp_mapping_dm_addr(struct platform_device *pdev, u32 mem_addr); +#define SCP_RESERVED_MEM (1) +#if SCP_RESERVED_MEM +/* scp reserve memory ID definition*/ +enum scp_reserve_mem_id_t { + SCP_ISP_MEM_ID, + SCP_ISP_MEM2_ID, + SCP_MDP_MEM_ID, + SCP_DIP_MEM_ID, + SCP_FD_MEM_ID, + SCP_NUMS_MEM_ID, +}; + +struct scp_reserve_mblock { + enum scp_reserve_mem_id_t num; + u64 start_phys; + u64 start_virt; + u64 size; +}; + +extern phys_addr_t scp_get_reserve_mem_phys(enum scp_reserve_mem_id_t id); +extern phys_addr_t scp_get_reserve_mem_virt(enum scp_reserve_mem_id_t id); +extern phys_addr_t scp_get_reserve_mem_size(enum scp_reserve_mem_id_t id); +#endif + #endif /* _MTK_SCP_H */