Merge "ASoC: msm: qdsp6v2: Fix gapless session open fail" (6403c959) · Commits · e / devices / android_kernel_xiaomi_markw

include/sound/q6asm-v2.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -190,6 +190,7 @@ struct audio_client {
		int session;
		app_cb cb;
		atomic_t cmd_state;
		atomic_t cmd_state_pp;
		/* Relative or absolute TS */
		atomic_t time_flag;
		atomic_t nowait_cmd_cnt;

sound/soc/msm/qdsp6v2/q6asm.c

+70 −53

Original line number	Diff line number	Diff line
		@@ -1124,6 +1124,7 @@ struct audio_client q6asm_audio_client_alloc(app_cb cb, void priv)
		spin_lock_init(&ac->port[lcnt].dsp_lock);
		}
		atomic_set(&ac->cmd_state, 0);
		atomic_set(&ac->cmd_state_pp, 0);
		atomic_set(&ac->nowait_cmd_cnt, 0);
		atomic_set(&ac->mem_state, 0);

		@@ -1629,6 +1630,7 @@ static int32_t q6asm_callback(struct apr_client_data data, void priv)
		ac->apr = NULL;
		atomic_set(&ac->time_flag, 0);
		atomic_set(&ac->cmd_state, 0);
		atomic_set(&ac->cmd_state_pp, 0);
		wake_up(&ac->time_wait);
		wake_up(&ac->cmd_wait);
		mutex_unlock(&ac->cmd_lock);
		@@ -1691,15 +1693,30 @@ static int32_t q6asm_callback(struct apr_client_data data, void priv)
		pr_err("%s: cmd = 0x%x returned error = 0x%x\n",
		__func__, payload[0], payload[1]);
		if (wakeup_flag) {
		atomic_set(&ac->cmd_state, payload[1]);
		if (payload[0] ==
		ASM_STREAM_CMD_SET_PP_PARAMS_V2)
		atomic_set(&ac->cmd_state_pp,
		payload[1]);
		else
		atomic_set(&ac->cmd_state,
		payload[1]);
		wake_up(&ac->cmd_wait);
		}
		return 0;
		}
		if (atomic_read(&ac->cmd_state) && wakeup_flag) {
		if (payload[0] == ASM_STREAM_CMD_SET_PP_PARAMS_V2) {
		if (atomic_read(&ac->cmd_state_pp) &&
		wakeup_flag) {
		atomic_set(&ac->cmd_state_pp, 0);
		wake_up(&ac->cmd_wait);
		}
		} else {
		if (atomic_read(&ac->cmd_state) &&
		wakeup_flag) {
		atomic_set(&ac->cmd_state, 0);
		wake_up(&ac->cmd_wait);
		}
		}
		if (ac->cb)
		ac->cb(data->opcode, data->token,
		(uint32_t *)data->payload, ac->priv);
		@@ -5725,7 +5742,7 @@ int q6asm_set_lrgain(struct audio_client *ac, int left_gain, int right_gain)
		memset(&multi_ch_gain, 0, sizeof(multi_ch_gain));
		sz = sizeof(struct asm_volume_ctrl_multichannel_gain);
		q6asm_add_hdr_async(ac, &multi_ch_gain.hdr, sz, TRUE);
		atomic_set(&ac->cmd_state, -1);
		atomic_set(&ac->cmd_state_pp, -1);
		multi_ch_gain.hdr.opcode = ASM_STREAM_CMD_SET_PP_PARAMS_V2;
		multi_ch_gain.param.data_payload_addr_lsw = 0;
		multi_ch_gain.param.data_payload_addr_msw = 0;
		@@ -5751,20 +5768,20 @@ int q6asm_set_lrgain(struct audio_client *ac, int left_gain, int right_gain)
		}

		rc = wait_event_timeout(ac->cmd_wait,
		(atomic_read(&ac->cmd_state) >= 0), 5*HZ);
		(atomic_read(&ac->cmd_state_pp) >= 0), 5*HZ);
		if (!rc) {
		pr_err("%s: timeout, set-params paramid[0x%x]\n", __func__,
		multi_ch_gain.data.param_id);
		rc = -ETIMEDOUT;
		goto fail_cmd;
		}
		if (atomic_read(&ac->cmd_state) > 0) {
		if (atomic_read(&ac->cmd_state_pp) > 0) {
		pr_err("%s: DSP returned error[%s] , set-params paramid[0x%x]\n",
		__func__, adsp_err_get_err_str(
		atomic_read(&ac->cmd_state)),
		atomic_read(&ac->cmd_state_pp)),
		multi_ch_gain.data.param_id);
		rc = adsp_err_get_lnx_err_code(
		atomic_read(&ac->cmd_state));
		atomic_read(&ac->cmd_state_pp));
		goto fail_cmd;
		}
		rc = 0;
		@@ -5819,7 +5836,7 @@ int q6asm_set_multich_gain(struct audio_client *ac, uint32_t channels,
		memset(&multich_gain, 0, sizeof(multich_gain));
		sz = sizeof(struct asm_volume_ctrl_multichannel_gain);
		q6asm_add_hdr_async(ac, &multich_gain.hdr, sz, TRUE);
		atomic_set(&ac->cmd_state, 1);
		atomic_set(&ac->cmd_state_pp, -1);
		multich_gain.hdr.opcode = ASM_STREAM_CMD_SET_PP_PARAMS_V2;
		multich_gain.param.data_payload_addr_lsw = 0;
		multich_gain.param.data_payload_addr_msw = 0;
		@@ -5857,16 +5874,16 @@ int q6asm_set_multich_gain(struct audio_client *ac, uint32_t channels,
		}

		rc = wait_event_timeout(ac->cmd_wait,
		(atomic_read(&ac->cmd_state) <= 0), 5*HZ);
		(atomic_read(&ac->cmd_state_pp) >= 0), 5*HZ);
		if (!rc) {
		pr_err("%s: timeout, set-params paramid[0x%x]\n", __func__,
		multich_gain.data.param_id);
		rc = -EINVAL;
		goto done;
		}
		if (atomic_read(&ac->cmd_state) < 0) {
		if (atomic_read(&ac->cmd_state_pp) > 0) {
		pr_err("%s: DSP returned error[%d] , set-params paramid[0x%x]\n",
		__func__, atomic_read(&ac->cmd_state),
		__func__, atomic_read(&ac->cmd_state_pp),
		multich_gain.data.param_id);
		rc = -EINVAL;
		goto done;
		@@ -5895,7 +5912,7 @@ int q6asm_set_mute(struct audio_client *ac, int muteflag)

		sz = sizeof(struct asm_volume_ctrl_mute_config);
		q6asm_add_hdr_async(ac, &mute.hdr, sz, TRUE);
		atomic_set(&ac->cmd_state, -1);
		atomic_set(&ac->cmd_state_pp, -1);
		mute.hdr.opcode = ASM_STREAM_CMD_SET_PP_PARAMS_V2;
		mute.param.data_payload_addr_lsw = 0;
		mute.param.data_payload_addr_msw = 0;
		@@ -5917,20 +5934,20 @@ int q6asm_set_mute(struct audio_client *ac, int muteflag)
		}

		rc = wait_event_timeout(ac->cmd_wait,
		(atomic_read(&ac->cmd_state) >= 0), 5*HZ);
		(atomic_read(&ac->cmd_state_pp) >= 0), 5*HZ);
		if (!rc) {
		pr_err("%s: timeout, set-params paramid[0x%x]\n", __func__,
		mute.data.param_id);
		rc = -ETIMEDOUT;
		goto fail_cmd;
		}
		if (atomic_read(&ac->cmd_state) > 0) {
		if (atomic_read(&ac->cmd_state_pp) > 0) {
		pr_err("%s: DSP returned error[%s] set-params paramid[0x%x]\n",
		__func__, adsp_err_get_err_str(
		atomic_read(&ac->cmd_state)),
		atomic_read(&ac->cmd_state_pp)),
		mute.data.param_id);
		rc = adsp_err_get_lnx_err_code(
		atomic_read(&ac->cmd_state));
		atomic_read(&ac->cmd_state_pp));
		goto fail_cmd;
		}
		rc = 0;
		@@ -5971,7 +5988,7 @@ int q6asm_dts_eagle_set(struct audio_client *ac, int param_id, uint32_t size,
		ad->data.param_id = param_id;
		ad->data.param_size = size;
		ad->data.reserved = 0;
		atomic_set(&ac->cmd_state, -1);
		atomic_set(&ac->cmd_state_pp, -1);

		if (po) {
		struct list_head ptr, next;
		@@ -6022,7 +6039,7 @@ int q6asm_dts_eagle_set(struct audio_client *ac, int param_id, uint32_t size,
		}

		rc = wait_event_timeout(ac->cmd_wait,
		(atomic_read(&ac->cmd_state) >= 0), 1*HZ);
		(atomic_read(&ac->cmd_state_pp) >= 0), 1*HZ);
		if (!rc) {
		pr_err("DTS_EAGLE_ASM - %s: timeout, set-params paramid[0x%x]\n",
		__func__, ad->data.param_id);
		@@ -6030,12 +6047,12 @@ int q6asm_dts_eagle_set(struct audio_client *ac, int param_id, uint32_t size,
		goto fail_cmd;
		}

		if (atomic_read(&ac->cmd_state) > 0) {
		if (atomic_read(&ac->cmd_state_pp) > 0) {
		pr_err("%s: DSP returned error[%s]\n",
		__func__, adsp_err_get_err_str(
		atomic_read(&ac->cmd_state)));
		atomic_read(&ac->cmd_state_pp)));
		rc = adsp_err_get_lnx_err_code(
		atomic_read(&ac->cmd_state));
		atomic_read(&ac->cmd_state_pp));
		goto fail_cmd;
		}
		rc = 0;
		@@ -6195,7 +6212,7 @@ static int __q6asm_set_volume(struct audio_client *ac, int volume, int instance)

		sz = sizeof(struct asm_volume_ctrl_master_gain);
		q6asm_add_hdr_async(ac, &vol.hdr, sz, TRUE);
		atomic_set(&ac->cmd_state, -1);
		atomic_set(&ac->cmd_state_pp, -1);
		vol.hdr.opcode = ASM_STREAM_CMD_SET_PP_PARAMS_V2;
		vol.param.data_payload_addr_lsw = 0;
		vol.param.data_payload_addr_msw = 0;
		@@ -6217,20 +6234,20 @@ static int __q6asm_set_volume(struct audio_client *ac, int volume, int instance)
		}

		rc = wait_event_timeout(ac->cmd_wait,
		(atomic_read(&ac->cmd_state) >= 0), 5*HZ);
		(atomic_read(&ac->cmd_state_pp) >= 0), 5*HZ);
		if (!rc) {
		pr_err("%s: timeout, set-params paramid[0x%x]\n", __func__,
		vol.data.param_id);
		rc = -ETIMEDOUT;
		goto fail_cmd;
		}
		if (atomic_read(&ac->cmd_state) > 0) {
		if (atomic_read(&ac->cmd_state_pp) > 0) {
		pr_err("%s: DSP returned error[%s] set-params paramid[0x%x]\n",
		__func__, adsp_err_get_err_str(
		atomic_read(&ac->cmd_state)),
		atomic_read(&ac->cmd_state_pp)),
		vol.data.param_id);
		rc = adsp_err_get_lnx_err_code(
		atomic_read(&ac->cmd_state));
		atomic_read(&ac->cmd_state_pp));
		goto fail_cmd;
		}

		@@ -6269,7 +6286,7 @@ int q6asm_set_softpause(struct audio_client *ac,

		sz = sizeof(struct asm_soft_pause_params);
		q6asm_add_hdr_async(ac, &softpause.hdr, sz, TRUE);
		atomic_set(&ac->cmd_state, -1);
		atomic_set(&ac->cmd_state_pp, -1);
		softpause.hdr.opcode = ASM_STREAM_CMD_SET_PP_PARAMS_V2;

		softpause.param.data_payload_addr_lsw = 0;
		@@ -6296,20 +6313,20 @@ int q6asm_set_softpause(struct audio_client *ac,
		}

		rc = wait_event_timeout(ac->cmd_wait,
		(atomic_read(&ac->cmd_state) >= 0), 5*HZ);
		(atomic_read(&ac->cmd_state_pp) >= 0), 5*HZ);
		if (!rc) {
		pr_err("%s: timeout, set-params paramid[0x%x]\n", __func__,
		softpause.data.param_id);
		rc = -ETIMEDOUT;
		goto fail_cmd;
		}
		if (atomic_read(&ac->cmd_state) > 0) {
		if (atomic_read(&ac->cmd_state_pp) > 0) {
		pr_err("%s: DSP returned error[%s] set-params paramid[0x%x]\n",
		__func__, adsp_err_get_err_str(
		atomic_read(&ac->cmd_state)),
		atomic_read(&ac->cmd_state_pp)),
		softpause.data.param_id);
		rc = adsp_err_get_lnx_err_code(
		atomic_read(&ac->cmd_state));
		atomic_read(&ac->cmd_state_pp));
		goto fail_cmd;
		}
		rc = 0;
		@@ -6349,7 +6366,7 @@ static int __q6asm_set_softvolume(struct audio_client *ac,

		sz = sizeof(struct asm_soft_step_volume_params);
		q6asm_add_hdr_async(ac, &softvol.hdr, sz, TRUE);
		atomic_set(&ac->cmd_state, -1);
		atomic_set(&ac->cmd_state_pp, -1);
		softvol.hdr.opcode = ASM_STREAM_CMD_SET_PP_PARAMS_V2;
		softvol.param.data_payload_addr_lsw = 0;
		softvol.param.data_payload_addr_msw = 0;
		@@ -6374,20 +6391,20 @@ static int __q6asm_set_softvolume(struct audio_client *ac,
		}

		rc = wait_event_timeout(ac->cmd_wait,
		(atomic_read(&ac->cmd_state) >= 0), 5*HZ);
		(atomic_read(&ac->cmd_state_pp) >= 0), 5*HZ);
		if (!rc) {
		pr_err("%s: timeout, set-params paramid[0x%x]\n", __func__,
		softvol.data.param_id);
		rc = -ETIMEDOUT;
		goto fail_cmd;
		}
		if (atomic_read(&ac->cmd_state) > 0) {
		if (atomic_read(&ac->cmd_state_pp) > 0) {
		pr_err("%s: DSP returned error[%s] set-params paramid[0x%x]\n",
		__func__, adsp_err_get_err_str(
		atomic_read(&ac->cmd_state)),
		atomic_read(&ac->cmd_state_pp)),
		softvol.data.param_id);
		rc = adsp_err_get_lnx_err_code(
		atomic_read(&ac->cmd_state));
		atomic_read(&ac->cmd_state_pp));
		goto fail_cmd;
		}
		rc = 0;
		@@ -6436,7 +6453,7 @@ int q6asm_equalizer(struct audio_client ac, void eq_p)
		sz = sizeof(struct asm_eq_params);
		eq_params = (struct msm_audio_eq_stream_config *) eq_p;
		q6asm_add_hdr(ac, &eq.hdr, sz, TRUE);
		atomic_set(&ac->cmd_state, -1);
		atomic_set(&ac->cmd_state_pp, -1);

		eq.hdr.opcode = ASM_STREAM_CMD_SET_PP_PARAMS_V2;
		eq.param.data_payload_addr_lsw = 0;
		@@ -6481,20 +6498,20 @@ int q6asm_equalizer(struct audio_client ac, void eq_p)
		}

		rc = wait_event_timeout(ac->cmd_wait,
		(atomic_read(&ac->cmd_state) >= 0), 5*HZ);
		(atomic_read(&ac->cmd_state_pp) >= 0), 5*HZ);
		if (!rc) {
		pr_err("%s: timeout, set-params paramid[0x%x]\n", __func__,
		eq.data.param_id);
		rc = -ETIMEDOUT;
		goto fail_cmd;
		}
		if (atomic_read(&ac->cmd_state) > 0) {
		if (atomic_read(&ac->cmd_state_pp) > 0) {
		pr_err("%s: DSP returned error[%s] set-params paramid[0x%x]\n",
		__func__, adsp_err_get_err_str(
		atomic_read(&ac->cmd_state)),
		atomic_read(&ac->cmd_state_pp)),
		eq.data.param_id);
		rc = adsp_err_get_lnx_err_code(
		atomic_read(&ac->cmd_state));
		atomic_read(&ac->cmd_state_pp));
		goto fail_cmd;
		}
		rc = 0;
		@@ -7087,7 +7104,7 @@ int q6asm_send_audio_effects_params(struct audio_client ac, char params,
		q6asm_add_hdr_async(ac, &hdr, (sizeof(struct apr_hdr) +
		sizeof(struct asm_stream_cmd_set_pp_params_v2) +
		params_length), TRUE);
		atomic_set(&ac->cmd_state, -1);
		atomic_set(&ac->cmd_state_pp, -1);
		hdr.opcode = ASM_STREAM_CMD_SET_PP_PARAMS_V2;
		payload_params.data_payload_addr_lsw = 0;
		payload_params.data_payload_addr_msw = 0;
		@@ -7106,18 +7123,18 @@ int q6asm_send_audio_effects_params(struct audio_client ac, char params,
		goto fail_send_param;
		}
		rc = wait_event_timeout(ac->cmd_wait,
		(atomic_read(&ac->cmd_state) >= 0), 1*HZ);
		(atomic_read(&ac->cmd_state_pp) >= 0), 1*HZ);
		if (!rc) {
		pr_err("%s: timeout, audio effects set-params\n", __func__);
		rc = -ETIMEDOUT;
		goto fail_send_param;
		}
		if (atomic_read(&ac->cmd_state) > 0) {
		if (atomic_read(&ac->cmd_state_pp) > 0) {
		pr_err("%s: DSP returned error[%s] set-params\n",
		__func__, adsp_err_get_err_str(
		atomic_read(&ac->cmd_state)));
		atomic_read(&ac->cmd_state_pp)));
		rc = adsp_err_get_lnx_err_code(
		atomic_read(&ac->cmd_state));
		atomic_read(&ac->cmd_state_pp));
		goto fail_send_param;
		}

		@@ -7795,7 +7812,7 @@ int q6asm_send_cal(struct audio_client *ac)
		q6asm_add_hdr_async(ac, &hdr, (sizeof(struct apr_hdr) +
		sizeof(struct asm_stream_cmd_set_pp_params_v2)), TRUE);

		atomic_set(&ac->cmd_state, -1);
		atomic_set(&ac->cmd_state_pp, -1);
		hdr.opcode = ASM_STREAM_CMD_SET_PP_PARAMS_V2;
		payload_params.data_payload_addr_lsw =
		lower_32_bits(cal_block->cal_data.paddr);
		@@ -7821,15 +7838,15 @@ int q6asm_send_cal(struct audio_client *ac)
		goto free;
		}
		rc = wait_event_timeout(ac->cmd_wait,
		(atomic_read(&ac->cmd_state) >= 0), 5 * HZ);
		(atomic_read(&ac->cmd_state_pp) >= 0), 5 * HZ);
		if (!rc) {
		pr_err("%s: timeout, audio audstrm cal send\n", __func__);
		rc = -ETIMEDOUT;
		goto free;
		}
		if (atomic_read(&ac->cmd_state) > 0) {
		if (atomic_read(&ac->cmd_state_pp) > 0) {
		pr_err("%s: DSP returned error[%d] audio audstrm cal send\n",
		__func__, atomic_read(&ac->cmd_state));
		__func__, atomic_read(&ac->cmd_state_pp));
		rc = -EINVAL;
		goto free;
		}