github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-24 07:03:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

remoteproc: mediatek: Probe SCP cluster on single-core SCP

Browse Source 
This is the 3rd preliminary step for probing multi-core SCP.
Rewrite the probing flow of single-core SCP to adapt with the 'cluster'
concept needed by the multi-core SCP. The SCP core object(s)
is maintained at the cluster list.

Signed-off-by: Tinghan Shen <tinghan.shen@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Tested-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20230901080935.14571-8-tinghan.shen@mediatek.com
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
This commit is contained in:
Tinghan Shen 2023-09-01 16:09:28 +08:00 committed by Mathieu Poirier
parent fcc14c9cd5
commit eaf5b89953
2 changed files with 63 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/remoteproc/mtk_common.h
View File

@ -105,6 +105,7 @@ struct mtk_scp_of_cluster {
void __iomem *l1tcm_base;
size_t l1tcm_size;
phys_addr_t l1tcm_phys;
struct list_head mtk_scp_list;
};
struct mtk_scp {
@ -132,6 +133,7 @@ struct mtk_scp {
struct rproc_subdev *rpmsg_subdev;
struct list_head elem;
struct mtk_scp_of_cluster *cluster;
};

86
drivers/remoteproc/mtk_scp.c
View File

@ -854,8 +854,8 @@ static void scp_remove_rpmsg_subdev(struct mtk_scp *scp)
}
}
static int scp_rproc_init(struct platform_device *pdev,
struct mtk_scp_of_cluster *scp_cluster)
static struct mtk_scp *scp_rproc_init(struct platform_device *pdev,
struct mtk_scp_of_cluster *scp_cluster)
{
struct device *dev = &pdev->dev;
struct device_node *np = dev->of_node;
@ -867,11 +867,13 @@ static int scp_rproc_init(struct platform_device *pdev,
ret = rproc_of_parse_firmware(dev, 0, &fw_name);
if (ret < 0 && ret != -EINVAL)
return ret;
return ERR_PTR(ret);
rproc = devm_rproc_alloc(dev, np->name, &scp_ops, fw_name, sizeof(*scp));
if (!rproc)
return dev_err_probe(dev, -ENOMEM, "unable to allocate remoteproc\n");
if (!rproc) {
dev_err(dev, "unable to allocate remoteproc\n");
return ERR_PTR(-ENOMEM);
}
scp = rproc->priv;
scp->rproc = rproc;
@ -882,20 +884,21 @@ static int scp_rproc_init(struct platform_device *pdev,
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "sram");
scp->sram_base = devm_ioremap_resource(dev, res);
if (IS_ERR(scp->sram_base))
return dev_err_probe(dev, PTR_ERR(scp->sram_base),
"Failed to parse and map sram memory\n");
if (IS_ERR(scp->sram_base)) {
dev_err(dev, "Failed to parse and map sram memory\n");
return ERR_CAST(scp->sram_base);
}
scp->sram_size = resource_size(res);
scp->sram_phys = res->start;
ret = scp->data->scp_clk_get(scp);
if (ret)
return ret;
return ERR_PTR(ret);
ret = scp_map_memory_region(scp);
if (ret)
return ret;
return ERR_PTR(ret);
mutex_init(&scp->send_lock);
for (i = 0; i < SCP_IPI_MAX; i++)
@ -922,11 +925,7 @@ static int scp_rproc_init(struct platform_device *pdev,
goto remove_subdev;
}
ret = rproc_add(rproc);
if (ret)
goto remove_subdev;
return 0;
return scp;
remove_subdev:
scp_remove_rpmsg_subdev(scp);
@ -937,7 +936,43 @@ static int scp_rproc_init(struct platform_device *pdev,
mutex_destroy(&scp->ipi_desc[i].lock);
mutex_destroy(&scp->send_lock);
return ret;
return ERR_PTR(ret);
}
static void scp_free(struct mtk_scp *scp)
{
int i;
scp_remove_rpmsg_subdev(scp);
scp_ipi_unregister(scp, SCP_IPI_INIT);
scp_unmap_memory_region(scp);
for (i = 0; i < SCP_IPI_MAX; i++)
mutex_destroy(&scp->ipi_desc[i].lock);
mutex_destroy(&scp->send_lock);
}
static int scp_cluster_init(struct platform_device *pdev,
struct mtk_scp_of_cluster *scp_cluster)
{
struct device *dev = &pdev->dev;
struct list_head *scp_list = &scp_cluster->mtk_scp_list;
struct mtk_scp *scp;
int ret;
scp = scp_rproc_init(pdev, scp_cluster);
if (IS_ERR(scp))
return PTR_ERR(scp);
ret = rproc_add(scp->rproc);
if (ret) {
dev_err(dev, "Failed to add rproc\n");
scp_free(scp);
return ret;
}
list_add_tail(&scp->elem, scp_list);
return 0;
}
static int scp_probe(struct platform_device *pdev)
@ -970,7 +1005,9 @@ static int scp_probe(struct platform_device *pdev)
scp_cluster->l1tcm_phys = res->start;
}
ret = scp_rproc_init(pdev, scp_cluster);
INIT_LIST_HEAD(&scp_cluster->mtk_scp_list);
ret = scp_cluster_init(pdev, scp_cluster);
if (ret)
return ret;
@ -980,15 +1017,14 @@ static int scp_probe(struct platform_device *pdev)
static void scp_remove(struct platform_device *pdev)
{
struct mtk_scp *scp = platform_get_drvdata(pdev);
int i;
struct mtk_scp_of_cluster *scp_cluster = scp->cluster;
struct mtk_scp *temp;
rproc_del(scp->rproc);
scp_remove_rpmsg_subdev(scp);
scp_ipi_unregister(scp, SCP_IPI_INIT);
scp_unmap_memory_region(scp);
for (i = 0; i < SCP_IPI_MAX; i++)
mutex_destroy(&scp->ipi_desc[i].lock);
mutex_destroy(&scp->send_lock);
list_for_each_entry_safe_reverse(scp, temp, &scp_cluster->mtk_scp_list, elem) {
list_del(&scp->elem);
rproc_del(scp->rproc);
scp_free(scp);
}
}
static const struct mtk_scp_of_data mt8183_of_data = {