From 2532f316af8e0a8a11776f01b095bf3821f4ca1e Mon Sep 17 00:00:00 2001 From: George Shen Date: Tue, 11 Apr 2023 09:59:14 -0700 Subject: [PATCH] msm: eva: Use correct error code in __dsp_suspend Incorrect error code misleads driver to trigger SSR. Change-Id: I6e64c6b79be973c4e5b0b9968dc3b952855a2004 Signed-off-by: George Shen --- msm/eva/cvp_hfi.c | 8 +++++--- msm/eva/msm_cvp_dsp.c | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/msm/eva/cvp_hfi.c b/msm/eva/cvp_hfi.c index aa54362383..685ad8dfdd 100644 --- a/msm/eva/cvp_hfi.c +++ b/msm/eva/cvp_hfi.c @@ -258,9 +258,11 @@ static int __dsp_suspend(struct iris_hfi_device *device, bool force) dprintk(CVP_DSP, "%s: suspend dsp\n", __func__); rc = cvp_dsp_suspend(force); if (rc) { - dprintk(CVP_ERR, "%s: dsp suspend failed with error %d\n", - __func__, rc); - return -EINVAL; + if (rc != -EBUSY) + dprintk(CVP_ERR, + "%s: dsp suspend failed with error %d\n", + __func__, rc); + return rc; } dprintk(CVP_DSP, "%s: dsp suspended\n", __func__); diff --git a/msm/eva/msm_cvp_dsp.c b/msm/eva/msm_cvp_dsp.c index c0e1532ae7..30680c220e 100644 --- a/msm/eva/msm_cvp_dsp.c +++ b/msm/eva/msm_cvp_dsp.c @@ -248,7 +248,7 @@ static int delete_dsp_session(struct msm_cvp_inst *inst, frpc_node->cvp_fastrpc_device, buf); if (rc) - dprintk(CVP_WARN, + dprintk_rl(CVP_WARN, "%s Failed to unmap buffer 0x%x\n", __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); if (rc) { - dprintk(CVP_ERR, + dprintk_rl(CVP_ERR, "%s Failed to unmap buffer 0x%x\n", __func__, rc); cmd->ret = -1;