diff options
| author | Zhang Qilong <zhangqilong3@huawei.com> | 2020-11-02 22:35:54 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-12-30 11:53:48 +0100 |
| commit | f1bf8c9f49adacb32584b1213b94a813ec565cf3 (patch) | |
| tree | b3b07ed5ba9d7e3a76dba2979d7bb945b24c37f7 /drivers/remoteproc | |
| parent | cce77d667f5586d1b3a92ce0cbefa1c3156e9c8b (diff) | |
| download | linux-stable-f1bf8c9f49adacb32584b1213b94a813ec565cf3.tar.gz linux-stable-f1bf8c9f49adacb32584b1213b94a813ec565cf3.tar.bz2 linux-stable-f1bf8c9f49adacb32584b1213b94a813ec565cf3.zip | |
remoteproc: qcom: pas: fix error handling in adsp_pds_enable
[ Upstream commit c0a6e5ee1ecfe4c3a5799cfd30820748eff5dfab ]
If the pm_runtime_get_sync failed in adsp_pds_enable when
loop (i), The unroll_pd_votes will start from (i - 1), and
it will resulted in following problems:
1) pm_runtime_get_sync will increment pm usage counter even it
failed. Forgetting to pm_runtime_put_noidle will result in
reference leak.
2) Have not reset pds[i] performance state.
Then we fix it.
Fixes: 17ee2fb4e8567 ("remoteproc: qcom: pas: Vote for active/proxy power domains")
Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
Link: https://lore.kernel.org/r/20201102143554.144707-1-zhangqilong3@huawei.com
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/remoteproc')
| -rw-r--r-- | drivers/remoteproc/qcom_q6v5_pas.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c index 3837f23995e0..0678b417707e 100644 --- a/drivers/remoteproc/qcom_q6v5_pas.c +++ b/drivers/remoteproc/qcom_q6v5_pas.c @@ -90,8 +90,11 @@ static int adsp_pds_enable(struct qcom_adsp *adsp, struct device **pds, for (i = 0; i < pd_count; i++) { dev_pm_genpd_set_performance_state(pds[i], INT_MAX); ret = pm_runtime_get_sync(pds[i]); - if (ret < 0) + if (ret < 0) { + pm_runtime_put_noidle(pds[i]); + dev_pm_genpd_set_performance_state(pds[i], 0); goto unroll_pd_votes; + } } return 0; |