Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11bdcee4 authored by Andy Gross's avatar Andy Gross
Browse files

firmware: qcom: scm: Generalize shared error map 



This patch moves the qcom_scm_remap_error function to the include file
where can be used by both the 32 and 64 bit versions of the code.

Reviewed-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Acked-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarAndy Gross <agross@codeaurora.org>
Signed-off-by: default avatarAndy Gross <andy.gross@linaro.org>
parent 13e77747

drivers/firmware/qcom_scm-32.c

+0 −17
Original line number Diff line number Diff line
@@ -168,23 +168,6 @@ static inline void *qcom_scm_get_response_buffer(const struct qcom_scm_response 
	return (void *)rsp + le32_to_cpu(rsp->buf_offset);

}



static int qcom_scm_remap_error(int err)

{

	pr_err("qcom_scm_call failed with error code %d\n", err);

	switch (err) {

	case QCOM_SCM_ERROR:

		return -EIO;

	case QCOM_SCM_EINVAL_ADDR:

	case QCOM_SCM_EINVAL_ARG:

		return -EINVAL;

	case QCOM_SCM_EOPNOTSUPP:

		return -EOPNOTSUPP;

	case QCOM_SCM_ENOMEM:

		return -ENOMEM;

	}

	return -EINVAL;

}



static u32 smc(u32 cmd_addr)

{

	int context_id;

drivers/firmware/qcom_scm.h

+16 −0
Original line number Diff line number Diff line
@@ -44,4 +44,20 @@ extern int __qcom_scm_hdcp_req(struct qcom_scm_hdcp_req *req, u32 req_cnt, 
#define QCOM_SCM_ERROR		-1

#define QCOM_SCM_INTERRUPTED	1



static inline int qcom_scm_remap_error(int err)

{

	switch (err) {

	case QCOM_SCM_ERROR:

		return -EIO;

	case QCOM_SCM_EINVAL_ADDR:

	case QCOM_SCM_EINVAL_ARG:

		return -EINVAL;

	case QCOM_SCM_EOPNOTSUPP:

		return -EOPNOTSUPP;

	case QCOM_SCM_ENOMEM:

		return -ENOMEM;

	}

	return -EINVAL;

}



#endif