samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

msm: eva: Use correct error code in __dsp_suspend

Browse Source 
Incorrect error code misleads driver to trigger SSR.

Change-Id: I6e64c6b79be973c4e5b0b9968dc3b952855a2004
Signed-off-by: George Shen <quic_sqiao@quicinc.com>
This commit is contained in:
George Shen
2023-04-11 09:59:14 -07:00
parent 815ffdf422
commit 2532f316af
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
msm/eva/cvp_hfi.c
View File

@@ -258,9 +258,11 @@ static int __dsp_suspend(struct iris_hfi_device *device, bool force)
dprintk(CVP_DSP, "%s: suspend dsp\n", __func__); dprintk(CVP_DSP, "%s: suspend dsp\n", __func__);
rc = cvp_dsp_suspend(force); rc = cvp_dsp_suspend(force);
if (rc) { if (rc) {
dprintk(CVP_ERR, "%s: dsp suspend failed with error %d\n", if (rc != -EBUSY)
__func__, rc); dprintk(CVP_ERR,
return -EINVAL; "%s: dsp suspend failed with error %d\n",
__func__, rc);
return rc;
} }
dprintk(CVP_DSP, "%s: dsp suspended\n", __func__); dprintk(CVP_DSP, "%s: dsp suspended\n", __func__);

4
msm/eva/msm_cvp_dsp.c
View File

@@ -248,7 +248,7 @@ static int delete_dsp_session(struct msm_cvp_inst *inst,
frpc_node->cvp_fastrpc_device, frpc_node->cvp_fastrpc_device,
buf); buf);
if (rc) if (rc)
dprintk(CVP_WARN, dprintk_rl(CVP_WARN,
"%s Failed to unmap buffer 0x%x\n", "%s Failed to unmap buffer 0x%x\n",
__func__, rc); __func__, rc);
@@ -1952,7 +1952,7 @@ static void __dsp_cvp_mem_free(struct cvp_dsp_cmd_msg *cmd)
rc = eva_fastrpc_dev_unmap_dma(frpc_device, buf); rc = eva_fastrpc_dev_unmap_dma(frpc_device, buf);
if (rc) { if (rc) {
dprintk(CVP_ERR, dprintk_rl(CVP_ERR,
"%s Failed to unmap buffer 0x%x\n", "%s Failed to unmap buffer 0x%x\n",
__func__, rc); __func__, rc);
cmd->ret = -1; cmd->ret = -1;