lkml.org 
[lkml]   [2022]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v2 8/9] remoteproc: mediatek: Wait SCP core 1 probe done
Date
SCP core 1 driver probing must finish before start loading SCP core 1
image. Add a simple flag checking mechanism when preparing SCP core 1
subdevice.

Signed-off-by: Tinghan Shen <tinghan.shen@mediatek.com>
---
drivers/remoteproc/mtk_common.h | 1 +
drivers/remoteproc/mtk_scp.c | 38 ++++++++++++++++++++++++++++++++-
2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/drivers/remoteproc/mtk_common.h b/drivers/remoteproc/mtk_common.h
index 67b41866a100..89f9e53a5879 100644
--- a/drivers/remoteproc/mtk_common.h
+++ b/drivers/remoteproc/mtk_common.h
@@ -153,6 +153,7 @@ struct mtk_scp {

struct rproc_subdev *rpmsg_subdev;
struct rproc_subdev *dual_subdev;
+ int dual_probe_done;
};

/**
diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c
index d0e9e19e251f..b66bee4beb4d 100644
--- a/drivers/remoteproc/mtk_scp.c
+++ b/drivers/remoteproc/mtk_scp.c
@@ -937,6 +937,7 @@ static struct mtk_scp *scp_dual_get(struct mtk_scp *scp)
struct device *dev = scp->dev;
struct device_node *np;
struct platform_device *dual_pdev;
+ struct mtk_scp *scp_dual;

np = of_parse_phandle(dev->of_node, "mediatek,scp-core", 0);
dual_pdev = of_find_device_by_node(np);
@@ -947,7 +948,11 @@ static struct mtk_scp *scp_dual_get(struct mtk_scp *scp)
return NULL;
}

- return platform_get_drvdata(dual_pdev);
+ scp_dual = platform_get_drvdata(dual_pdev);
+ if (!scp_dual)
+ put_device(&dual_pdev->dev);
+
+ return scp_dual;
}

static void scp_dual_put(struct mtk_scp *scp)
@@ -955,6 +960,33 @@ static void scp_dual_put(struct mtk_scp *scp)
put_device(scp->dev);
}

+static int scp_dual_rproc_prepare(struct rproc_subdev *subdev)
+{
+ struct scp_subdev_core *subdev_core = to_subdev_core(subdev);
+ struct mtk_scp *scp = subdev_core->main_scp;
+ unsigned long timeout;
+
+ timeout = jiffies + msecs_to_jiffies(100);
+ while (1) {
+ struct mtk_scp *scp_dual = scp_dual_get(scp);
+
+ if (scp_dual && scp_dual->dual_probe_done) {
+ scp_dual_put(scp_dual);
+ break;
+ }
+
+ if (scp_dual && !scp_dual->dual_probe_done)
+ scp_dual_put(scp_dual);
+
+ if (time_after(jiffies, timeout)) {
+ dev_err(scp->dev, "scp-dual probe timeout\n");
+ return -ETIMEDOUT;
+ }
+ }
+
+ return 0;
+}
+
static int scp_dual_rproc_start(struct rproc_subdev *subdev)
{
struct scp_subdev_core *subdev_core = to_subdev_core(subdev);
@@ -1014,6 +1046,7 @@ static struct rproc_subdev *scp_dual_create_subdev(struct mtk_scp *scp)

subdev_core->main_scp = scp;
subdev_core->scp_dual_wdt_timeout = scp_dual_wdt_handler;
+ subdev_core->subdev.prepare = scp_dual_rproc_prepare;
subdev_core->subdev.start = scp_dual_rproc_start;
subdev_core->subdev.stop = scp_dual_rproc_stop;

@@ -1155,6 +1188,9 @@ static int scp_probe(struct platform_device *pdev)
if (ret)
goto remove_subdev;

+ if (core_id == SCP_CORE_1)
+ scp->dual_probe_done = 1;
+
return 0;

remove_subdev:
--
2.18.0
\
 
 \ /
  Last update: 2022-06-08 11:20    [W:0.151 / U:3.444 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site