Merge "soc: qcom: scm: Remap scm busy error codes to -EBUSY" (fddaa485) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/soc/qcom/scm.c

+5 −6

Original line number	Diff line number	Diff line
		@@ -185,9 +185,8 @@ static int scm_remap_error(int err)
		case SCM_ENOMEM:
		return -ENOMEM;
		case SCM_EBUSY:
		return SCM_EBUSY;
		case SCM_V2_EBUSY:
		return SCM_V2_EBUSY;
		return -EBUSY;
		}
		return -EINVAL;
		}
		@@ -338,13 +337,13 @@ static int _scm_call_retry(u32 svc_id, u32 cmd_id, const void *cmd_buf,
		do {
		ret = scm_call_common(svc_id, cmd_id, cmd_buf, cmd_len,
		resp_buf, resp_len, cmd, len);
		if (ret == SCM_EBUSY)
		if (ret == -EBUSY)
		msleep(SCM_EBUSY_WAIT_MS);
		if (retry_count == 33)
		pr_warn("scm: secure world has been busy for 1 second!\n");
		} while (ret == SCM_EBUSY && (retry_count++ < SCM_EBUSY_MAX_RETRY));
		} while (ret == -EBUSY && (retry_count++ < SCM_EBUSY_MAX_RETRY));

		if (ret == SCM_EBUSY)
		if (ret == -EBUSY)
		pr_err("scm: secure world busy (rc = SCM_EBUSY)\n");

		return ret;
		@@ -799,7 +798,7 @@ int scm_call(u32 svc_id, u32 cmd_id, const void *cmd_buf, size_t cmd_len,

		ret = scm_call_common(svc_id, cmd_id, cmd_buf, cmd_len, resp_buf,
		resp_len, cmd, len);
		if (unlikely(ret == SCM_EBUSY))
		if (unlikely(ret == -EBUSY))
		ret = _scm_call_retry(svc_id, cmd_id, cmd_buf, cmd_len,
		resp_buf, resp_len, cmd, PAGE_ALIGN(len));
		kfree(cmd);