| Message ID | 20201102143554.144707-1-zhangqilong3@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c0a6e5ee1ecfe4c3a5799cfd30820748eff5dfab |
| Headers | show |
| Series | remoteproc: qcom: pas: fix error handling in adsp_pds_enable | expand |
Hello: This patch was applied to qcom/linux.git (refs/heads/for-next): On Mon, 2 Nov 2020 22:35:54 +0800 you wrote: > 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. > > [...] Here is the summary with links: - remoteproc: qcom: pas: fix error handling in adsp_pds_enable https://git.kernel.org/qcom/c/c0a6e5ee1ecf You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
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;
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> --- drivers/remoteproc/qcom_q6v5_pas.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)