Merge "dsp: lower the log lever of ADSP_EALREADY" (940fa8c3) · Commits · e / devices / android_kernel_fairphone_FP5

dsp/q6asm.c

+19 −11

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*
		* Copyright (c) 2022, Qualcomm Innovation Center, Inc. All rights reserved.
		*/
		#include <linux/fs.h>
		#include <linux/mutex.h>
		@@ -2191,8 +2192,12 @@ static int32_t q6asm_callback(struct apr_client_data data, void priv)
		payload[0], payload[1],
		data->src_port, data->dest_port);
		if (payload[1] != 0) {
		if (adsp_err_get_lnx_err_code(payload[1]) != -EALREADY)
		pr_err("%s: cmd = 0x%x returned error = 0x%x\n",
		__func__, payload[0], payload[1]);
		else
		pr_debug("%s: cmd = 0x%x returned error = 0x%x\n",
		__func__, payload[0], payload[1]);
		if (wakeup_flag) {
		if ((is_adsp_reg_event(payload[0]) >=
		0) \|\|
		@@ -3431,11 +3436,12 @@ static int __q6asm_open_read(struct audio_client *ac,
		goto fail_cmd;
		}
		if (atomic_read(&ac->cmd_state) > 0) {
		rc = adsp_err_get_lnx_err_code(
		atomic_read(&ac->cmd_state));
		if (rc != -EALREADY)
		pr_err("%s: DSP returned error[%s]\n",
		__func__, adsp_err_get_err_str(
		atomic_read(&ac->cmd_state)));
		rc = adsp_err_get_lnx_err_code(
		atomic_read(&ac->cmd_state));
		goto fail_cmd;
		}

		@@ -3840,11 +3846,12 @@ static int __q6asm_open_write(struct audio_client *ac, uint32_t format,
		goto fail_cmd;
		}
		if (atomic_read(&ac->cmd_state) > 0) {
		rc = adsp_err_get_lnx_err_code(
		atomic_read(&ac->cmd_state));
		if (rc != -EALREADY)
		pr_err("%s: DSP returned error[%s]\n",
		__func__, adsp_err_get_err_str(
		atomic_read(&ac->cmd_state)));
		rc = adsp_err_get_lnx_err_code(
		atomic_read(&ac->cmd_state));
		goto fail_cmd;
		}
		ac->io_mode \|= TUN_WRITE_IO_MODE;
		@@ -4190,11 +4197,12 @@ static int __q6asm_open_read_write(struct audio_client *ac, uint32_t rd_format,
		goto fail_cmd;
		}
		if (atomic_read(&ac->cmd_state) > 0) {
		rc = adsp_err_get_lnx_err_code(
		atomic_read(&ac->cmd_state));
		if (rc != -EALREADY)
		pr_err("%s: DSP returned error[%s]\n",
		__func__, adsp_err_get_err_str(
		atomic_read(&ac->cmd_state)));
		rc = adsp_err_get_lnx_err_code(
		atomic_read(&ac->cmd_state));
		goto fail_cmd;
		}