diff options
| author | Loic Poulain <loic.poulain@linaro.org> | 2018-06-12 18:40:54 +0200 |
|---|---|---|
| committer | Loic Poulain <loic.poulain@linaro.org> | 2018-06-12 18:54:33 +0200 |
| commit | 44601746ed48010e8b9f75e288096ee8b16712f9 (patch) | |
| tree | b66d2f7e182503f7a8ad600e889997ccd705188f | |
| parent | 7dccf46df2ce93184c0d4467db87b3513df1f007 (diff) | |
remoteproc: wcnss: Wait for iris before startingwcnss
wcnss_start fails when called by remoteproc before iris probing.
Fix this by adding synchronization/completion on iris assignment.
Signed-off-by: Loic Poulain <loic.poulain@linaro.org>
| -rw-r--r-- | drivers/remoteproc/qcom_wcnss.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/remoteproc/qcom_wcnss.c b/drivers/remoteproc/qcom_wcnss.c index b0e07e9f42d56..e5fbf911812e6 100644 --- a/drivers/remoteproc/qcom_wcnss.c +++ b/drivers/remoteproc/qcom_wcnss.c @@ -86,6 +86,7 @@ struct qcom_wcnss { struct mutex iris_lock; struct qcom_iris *iris; + struct completion iris_assigned; struct regulator_bulk_data *vregs; size_t num_vregs; @@ -146,6 +147,7 @@ void qcom_wcnss_assign_iris(struct qcom_wcnss *wcnss, wcnss->iris = iris; wcnss->use_48mhz_xo = use_48mhz_xo; + complete(&wcnss->iris_assigned); mutex_unlock(&wcnss->iris_lock); } @@ -221,6 +223,13 @@ static int wcnss_start(struct rproc *rproc) struct qcom_wcnss *wcnss = (struct qcom_wcnss *)rproc->priv; int ret; + ret = wait_for_completion_timeout(&wcnss->iris_assigned, + msecs_to_jiffies(5000)); + if (ret == 0) { + dev_err(wcnss->dev, "Timeout waiting for iris device\n"); + return -ENODEV; + } + mutex_lock(&wcnss->iris_lock); if (!wcnss->iris) { dev_err(wcnss->dev, "no iris registered\n"); @@ -496,6 +505,7 @@ static int wcnss_probe(struct platform_device *pdev) init_completion(&wcnss->start_done); init_completion(&wcnss->stop_done); + init_completion(&wcnss->iris_assigned); mutex_init(&wcnss->iris_lock); |