2019-04-12 07:20:41

by Pi-Hsun Shih

[permalink] [raw]
Subject: [PATCH v8 3/7] remoteproc: mt8183: add reserved memory manager API

From: Erin Lo <[email protected]>

Add memory table mapping API for other driver to lookup
reserved physical and virtual memory

Signed-off-by: Erin Lo <[email protected]>
Signed-off-by: Pi-Hsun Shih <[email protected]>
---
Changes from v7:
- No change.

Changes from v6:
- No change.

Changes from v5:
- No change.

Changes from v4:
- New patch.
---
drivers/remoteproc/mtk_scp.c | 111 ++++++++++++++++++++++++++
include/linux/platform_data/mtk_scp.h | 20 +++++
2 files changed, 131 insertions(+)

diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c
index 6acaf92c1e2d..b9b8005f1d64 100644
--- a/drivers/remoteproc/mtk_scp.c
+++ b/drivers/remoteproc/mtk_scp.c
@@ -348,6 +348,113 @@ 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 = 0x1400000, /*20MB*/
+ },
+};
+
+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",
+ scp_mem_base_phys,
+ scp_mem_base_phys + scp_mem_size,
+ 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, scp_reserve_mblock[id].start_phys,
+ scp_reserve_mblock[id].start_phys +
+ scp_reserve_mblock[id].size,
+ 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",
+ (phys_addr_t)scp_mem_base_virt,
+ (phys_addr_t)scp_mem_base_virt + (phys_addr_t)scp_mem_size,
+ 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;
@@ -375,6 +482,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..0d1c07a5d886 100644
--- a/include/linux/platform_data/mtk_scp.h
+++ b/include/linux/platform_data/mtk_scp.h
@@ -138,4 +138,24 @@ 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_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 */
--
2.21.0.392.gf8f6787159e-goog