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

Commit 355d2cfa authored by Walter Yang's avatar Walter Yang Committed by Gerrit - the friendly Code Review server
Browse files

ASoC: msm: qdsp6v2: return specific adsp error code in q6lsm 



Currently the error codes from adsp via apr are only printed in
logs. So it's necessary to propagate the specific adsp error
to the caller as return value. And the mapping from adsp error
to linux error is conducted during the propagation. The detailed
message associated with the error code will also be printed in
the log.

Change-Id: I9ebfb8e558557c51c4b819df4f3b7f4ce097e129
Signed-off-by: default avatarWalter Yang <yandongy@codeaurora.org>
parent c952020e

sound/soc/msm/qdsp6v2/q6lsm.c

+9 −3
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/msm_audio_ion.h>

#include <sound/q6afe-v2.h>

#include <sound/audio_cal_utils.h>

#include <sound/adsp_err.h>



#define APR_TIMEOUT	(5 * HZ)

#define LSM_ALIGN_BOUNDARY 512
@@ -385,10 +386,15 @@ static int q6lsm_apr_send_pkt(struct lsm_client *client, void *handle, 
					 APR_TIMEOUT);

		if (likely(ret)) {

			/* q6 returned error */

			if (client->cmd_err_code)

				ret = -EINVAL;

			else

			if (client->cmd_err_code) {

				pr_err("%s: DSP returned error[%s]\n",

					__func__, adsp_err_get_err_str(

					client->cmd_err_code));

				ret = adsp_err_get_lnx_err_code(

						client->cmd_err_code);

			} else {

				ret = 0;

			}

		} else {

			pr_err("%s: wait timedout, apr_opcode = 0x%x, size = %d\n",

				__func__, msg_hdr->opcode, msg_hdr->pkt_size);