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

Commit 285d4a46 authored by Ben Romberger's avatar Ben Romberger Committed by Gerrit - the friendly Code Review server
Browse files

ASoC: msm: Correct RTAC mutex lock 



Modify RTAC mutex locking to ensure
functionality with mutliple clients.

Change-Id: I591e9b1d29fddf6a74235542a05a7a402f5e054d
Signed-off-by: default avatarBen Romberger <bromberg@codeaurora.org>
parent 700e0c78

sound/soc/msm/qdsp6v2/rtac.c

+21 −31
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -824,17 +824,16 @@ u32 send_adm_apr(void *buf, u32 opcode) 
	result = wait_event_timeout(rtac_adm_apr_data.cmd_wait,

		(atomic_read(&rtac_adm_apr_data.cmd_state) == 0),

		msecs_to_jiffies(TIMEOUT_MS));

	mutex_unlock(&rtac_adm_apr_mutex);

	if (!result) {

		pr_err("%s: Set params timed out copp = %d\n", __func__,

			copp_id);

		goto done;

		goto err;

	}

	if (atomic_read(&rtac_common.apr_err_code)) {

		pr_err("%s: DSP returned error code = %d, opcode = 0x%x\n",

			__func__, atomic_read(&rtac_common.apr_err_code),

			opcode);

		goto done;

		goto err;

	}



	if (opcode == ADM_CMD_GET_PP_PARAMS_V5) {
@@ -844,7 +843,7 @@ u32 send_adm_apr(void *buf, u32 opcode) 
		if (bytes_returned > user_buf_size) {

			pr_err("%s: User buf not big enough, size = 0x%x, returned size = 0x%x\n",

				__func__, user_buf_size, bytes_returned);

			goto done;

			goto err;

		}



		if (copy_to_user(buf, (void *)
@@ -852,16 +851,14 @@ u32 send_adm_apr(void *buf, u32 opcode) 
				bytes_returned)) {

			pr_err("%s: Could not copy buffer to user,size = %d\n",

				__func__, bytes_returned);

			goto done;

			goto err;

		}

	} else {

		bytes_returned = data_size;

	}



done:

	return bytes_returned;

err:

	mutex_unlock(&rtac_adm_apr_mutex);

done:

	return bytes_returned;

}
@@ -1035,17 +1032,16 @@ u32 send_rtac_asm_apr(void *buf, u32 opcode) 
	result = wait_event_timeout(rtac_asm_apr_data[session_id].cmd_wait,

		(atomic_read(&rtac_asm_apr_data[session_id].cmd_state) == 0),

		5 * HZ);

	mutex_unlock(&rtac_asm_apr_mutex);

	if (!result) {

		pr_err("%s: Set params timed out session = %d\n",

			__func__, session_id);

		goto done;

		goto err;

	}

	if (atomic_read(&rtac_common.apr_err_code)) {

		pr_err("%s: DSP returned error code = %d, opcode = 0x%x\n",

			__func__, atomic_read(&rtac_common.apr_err_code),

			opcode);

		goto done;

		goto err;

	}



	if (opcode == ASM_STREAM_CMD_GET_PP_PARAMS_V2) {
@@ -1055,7 +1051,7 @@ u32 send_rtac_asm_apr(void *buf, u32 opcode) 
		if (bytes_returned > user_buf_size) {

			pr_err("%s: User buf not big enough, size = 0x%x, returned size = 0x%x\n",

				__func__, user_buf_size, bytes_returned);

			goto done;

			goto err;

		}



		if (copy_to_user(buf, (void *)
@@ -1063,15 +1059,14 @@ u32 send_rtac_asm_apr(void *buf, u32 opcode) 
				bytes_returned)) {

			pr_err("%s: Could not copy buffer to user,size = %d\n",

				 __func__, bytes_returned);

			goto done;

			goto err;

		}

	} else {

		bytes_returned = data_size;

	}

done:

	return bytes_returned;

err:

	mutex_unlock(&rtac_asm_apr_mutex);

done:

	return bytes_returned;

}
@@ -1276,17 +1271,16 @@ static u32 send_rtac_afe_apr(void *buf, uint32_t opcode) 
	result = wait_event_timeout(rtac_afe_apr_data.cmd_wait,

		(atomic_read(&rtac_afe_apr_data.cmd_state) == 0),

		msecs_to_jiffies(TIMEOUT_MS));

	mutex_unlock(&rtac_afe_apr_mutex);

	if (!result) {

		pr_err("%s: Set params timed out port = 0x%x, ret = %d\n",

			__func__, user_afe_buf.port_id, result);

		goto done;

		goto err;

	}

	if (atomic_read(&rtac_common.apr_err_code)) {

		pr_err("%s: DSP returned error code = %d, opcode = 0x%x\n",

			__func__, atomic_read(&rtac_common.apr_err_code),

			opcode);

		goto done;

		goto err;

	}



	if (opcode == AFE_PORT_CMD_GET_PARAM_V2) {
@@ -1301,7 +1295,7 @@ static u32 send_rtac_afe_apr(void *buf, uint32_t opcode) 
			pr_err("%s: user size = 0x%x, returned size = 0x%x\n",

				__func__, user_afe_buf.buf_size,

				bytes_returned);

			goto done;

			goto err;

		}



		if (copy_to_user(buf, (void *)
@@ -1309,16 +1303,14 @@ static u32 send_rtac_afe_apr(void *buf, uint32_t opcode) 
				bytes_returned)) {

			pr_err("%s: Could not copy buffer to user,size = %d\n",

				__func__, bytes_returned);

			goto done;

			goto err;

		}

	} else {

		bytes_returned = user_afe_buf.rtac_afe_set.cmd.payload_size;

	}



done:

	return bytes_returned;

err:

	mutex_unlock(&rtac_afe_apr_mutex);

done:

	return bytes_returned;

}
@@ -1491,17 +1483,16 @@ u32 send_voice_apr(u32 mode, void *buf, u32 opcode) 
	result = wait_event_timeout(rtac_voice_apr_data[mode].cmd_wait,

		(atomic_read(&rtac_voice_apr_data[mode].cmd_state) == 0),

		msecs_to_jiffies(TIMEOUT_MS));

	mutex_unlock(&rtac_voice_apr_mutex);

	if (!result) {

		pr_err("%s: apr_send_pkt timed out opcode = %x\n",

			__func__, opcode);

		goto done;

		goto err;

	}

	if (atomic_read(&rtac_common.apr_err_code)) {

		pr_err("%s: DSP returned error code = %d, opcode = 0x%x\n",

			__func__, atomic_read(&rtac_common.apr_err_code),

			opcode);

		goto done;

		goto err;

	}



	if (opcode == VOICE_CMD_GET_PARAM) {
@@ -1511,7 +1502,7 @@ u32 send_voice_apr(u32 mode, void *buf, u32 opcode) 
		if (bytes_returned > user_buf_size) {

			pr_err("%s: User buf not big enough, size = 0x%x, returned size = 0x%x\n",

				__func__, user_buf_size, bytes_returned);

			goto done;

			goto err;

		}



		if (copy_to_user(buf, (void *)
@@ -1519,15 +1510,14 @@ u32 send_voice_apr(u32 mode, void *buf, u32 opcode) 
				bytes_returned)) {

			pr_err("%s: Could not copy buffer to user, size = %d\n",

				 __func__, bytes_returned);

			goto done;

			goto err;

		}

	} else {

		bytes_returned = data_size;

	}

done:

	return bytes_returned;

err:

	mutex_unlock(&rtac_voice_apr_mutex);

done:

	return bytes_returned;

}