NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "remoteproc: pas: check if there is a crash in rproc_set_state"

Browse source
This commit is contained in:
QCTECMDR Service 2024-07-17 01:27:27 -07:00 • committed by Gerrit - the friendly Code Review server
commit 9e53a33998
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
drivers/remoteproc/qcom_q6v5_pas.c
View file

@ -959,13 +959,15 @@ int rproc_set_state(struct rproc *rproc, bool state)
ret = rproc_config_check(adsp, SOCCP_D0);
if (ret) {
dev_err(adsp->dev, "failed to change from D3 to D0\n");
dev_err(adsp->dev, "%s requested D3->D0: soccp failed to update tcsr val=%d\n",
current->comm, readl(adsp->config_addr));
goto soccp_out;
}
ret = wait_for_completion_timeout(&adsp->q6v5.running_ack, msecs_to_jiffies(5));
if (!ret) {
dev_err(adsp->dev, "failed to get ack for state change from D3 to D0\n");
dev_err(adsp->dev, "%s requested D3->D0: failed to get wake ack\n",
current->comm);
ret = -ETIMEDOUT;
goto soccp_out;
} else
@ -988,7 +990,8 @@ int rproc_set_state(struct rproc *rproc, bool state)
ret = rproc_config_check(adsp, SOCCP_D3);
if (ret) {
dev_err(adsp->dev, "failed to change from D0 to D3\n");
dev_err(adsp->dev, "%s requested D0->D3 failed: TCSR value:%d\n",
current->comm, readl(adsp->config_addr));
goto soccp_out;
}
disable_regulators(adsp);
@ -998,9 +1001,15 @@ int rproc_set_state(struct rproc *rproc, bool state)
}
soccp_out:
if (ret && (adsp->rproc->state != RPROC_RUNNING)) {
dev_err(adsp->dev, "SOCCP has crashed while processing a D transition req by %s\n",
current->comm);
ret = -EBUSY;
}
mutex_unlock(&adsp->adsp_lock);
return ret ? -ETIMEDOUT : 0;
return ret;
}
EXPORT_SYMBOL_GPL(rproc_set_state);