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

Commit 94bd8731 authored by Vidyakumar Athota's avatar Vidyakumar Athota Committed by Gerrit - the friendly Code Review server
Browse files

dsp: add support for DC detection event in afe 



Add support to register with ADSP for DC detection event
in speaker protection module.
Add support to notify audio driver clients when DC detection occurs.

CRs-Fixed: 2244131
Change-Id: Ieb467f62207546a785eac2e9b96ca677e0b10565
Signed-off-by: default avatarVidyakumar Athota <vathota@codeaurora.org>
Signed-off-by: default avatarVignesh Kulothungan <vigneshk@codeaurora.org>
parent 4cc52a2b

dsp/q6afe.c

+111 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <dsp/q6afe-v2.h>

#include <dsp/q6afe-v2.h>

#include <dsp/q6audio-v2.h>

#include <dsp/q6audio-v2.h>

#include <dsp/q6common.h>

#include <dsp/q6common.h>

#include <dsp/msm-audio-event-notify.h>

#include <ipc/apr_tal.h>

#include <ipc/apr_tal.h>

#include "adsp_err.h"

#include "adsp_err.h"
@@ -326,6 +327,11 @@ static int32_t sp_make_afe_callback(uint32_t opcode, uint32_t *payload, 
	return 0;

	return 0;

}

}





static void afe_notify_dc_presence(void)

{

	msm_aud_evt_notifier_call_chain(MSM_AUD_DC_EVENT, NULL);

}



static int32_t afe_callback(struct apr_client_data *data, void *priv)

static int32_t afe_callback(struct apr_client_data *data, void *priv)

{

{

	if (!data) {

	if (!data) {
@@ -437,6 +443,7 @@ static int32_t afe_callback(struct apr_client_data *data, void *priv) 
			case AFE_PORTS_CMD_DTMF_CTL:

			case AFE_PORTS_CMD_DTMF_CTL:

			case AFE_SVC_CMD_SET_PARAM:

			case AFE_SVC_CMD_SET_PARAM:

			case AFE_SVC_CMD_SET_PARAM_V2:

			case AFE_SVC_CMD_SET_PARAM_V2:

			case AFE_PORT_CMD_MOD_EVENT_CFG:

				atomic_set(&this_afe.state, 0);

				atomic_set(&this_afe.state, 0);

				wake_up(&this_afe.wait[data->token]);

				wake_up(&this_afe.wait[data->token]);

				break;

				break;
@@ -497,6 +504,35 @@ static int32_t afe_callback(struct apr_client_data *data, void *priv) 
			wake_up(&this_afe.wait[data->token]);

			wake_up(&this_afe.wait[data->token]);

		} else if (data->opcode == AFE_EVENT_RT_PROXY_PORT_STATUS) {

		} else if (data->opcode == AFE_EVENT_RT_PROXY_PORT_STATUS) {

			port_id = (uint16_t)(0x0000FFFF & payload[0]);

			port_id = (uint16_t)(0x0000FFFF & payload[0]);

		} else if (data->opcode == AFE_PORT_MOD_EVENT) {

			u32 flag_dc_presence[2];

			uint32_t *payload = data->payload;

			struct afe_port_mod_evt_rsp_hdr *evt_pl =

				(struct afe_port_mod_evt_rsp_hdr *)payload;



			if (!payload || (data->token >= AFE_MAX_PORTS)) {

				pr_err("%s: Error: size %d payload %pK token %d\n",

					__func__, data->payload_size,

					payload, data->token);

				return -EINVAL;

			}

			if ((evt_pl->module_id == AFE_MODULE_SPEAKER_PROTECTION_V2_EX_VI) &&

			    (evt_pl->event_id == AFE_PORT_SP_DC_DETECTION_EVENT) &&

			    (evt_pl->payload_size == sizeof(flag_dc_presence))) {



				memcpy(&flag_dc_presence,

					payload +

					sizeof(struct afe_port_mod_evt_rsp_hdr),

					evt_pl->payload_size);

				if (flag_dc_presence[0] == 1 ||

					flag_dc_presence[1] == 1) {

					afe_notify_dc_presence();

				}

			} else {

				pr_debug("%s: mod ID = 0x%x event_id = 0x%x\n",

						__func__, evt_pl->module_id,

						evt_pl->event_id);

			}

		}

		}

		pr_debug("%s: port_id = 0x%x\n", __func__, port_id);

		pr_debug("%s: port_id = 0x%x\n", __func__, port_id);

		switch (port_id) {

		switch (port_id) {
@@ -1475,6 +1511,79 @@ static int afe_spk_prot_prepare(int src_port, int dst_port, int param_id, 
	return ret;

	return ret;

}

}





static int afe_spkr_prot_reg_event_cfg(u16 port_id)

{

	struct afe_port_cmd_event_cfg *config;

	struct afe_port_cmd_mod_evt_cfg_payload pl;

	int index;

	int ret;

	int num_events = 1;

	int cmd_size = sizeof(struct afe_port_cmd_event_cfg) +

		(num_events * sizeof(struct afe_port_cmd_mod_evt_cfg_payload));



	config = kzalloc(cmd_size, GFP_KERNEL);

	if (!config)

		return -ENOMEM;



	index = q6audio_get_port_index(port_id);

	if (index < 0) {

		pr_err("%s: Invalid index number: %d\n", __func__, index);

		ret = -EINVAL;

		goto fail_idx;

	}



	memset(&pl, 0, sizeof(pl));

	pl.module_id = AFE_MODULE_SPEAKER_PROTECTION_V2_EX_VI;

	pl.event_id = AFE_PORT_SP_DC_DETECTION_EVENT;

	pl.reg_flag = AFE_MODULE_REGISTER_EVENT_FLAG;





	config->hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD,

				APR_HDR_LEN(APR_HDR_SIZE), APR_PKT_VER);

	config->hdr.pkt_size = cmd_size;

	config->hdr.src_port = 0;

	config->hdr.dest_port = 0;

	config->hdr.token = index;



	config->hdr.opcode = AFE_PORT_CMD_MOD_EVENT_CFG;

	config->port_id = q6audio_get_port_id(port_id);

	config->num_events = num_events;

	config->version = 1;

	memcpy(config->payload, &pl, sizeof(pl));

	atomic_set(&this_afe.state, 1);

	atomic_set(&this_afe.status, 0);

	ret = apr_send_pkt(this_afe.apr, (uint32_t *) config);

	if (ret < 0) {

		pr_err("%s: port = 0x%x failed %d\n",

			__func__, port_id, ret);

		goto fail_cmd;

	}

	ret = wait_event_timeout(this_afe.wait[index],

		(atomic_read(&this_afe.state) == 0),

		msecs_to_jiffies(TIMEOUT_MS));

	if (!ret) {

		pr_err("%s: wait_event timeout\n", __func__);

		ret = -EINVAL;

		goto fail_cmd;

	}

	if (atomic_read(&this_afe.status) > 0) {

		pr_err("%s: config cmd failed [%s]\n",

			__func__, adsp_err_get_err_str(

			atomic_read(&this_afe.status)));

		ret = adsp_err_get_lnx_err_code(

				atomic_read(&this_afe.status));

		goto fail_idx;

	}

	ret = 0;

fail_cmd:

	pr_debug("%s: config.opcode 0x%x status %d\n",

		__func__, config->hdr.opcode, ret);



fail_idx:

	kfree(config);

	return ret;

}



static void afe_send_cal_spkr_prot_tx(int port_id)

static void afe_send_cal_spkr_prot_tx(int port_id)

{

{

	union afe_spkr_prot_config afe_spk_config;

	union afe_spkr_prot_config afe_spk_config;
@@ -1585,6 +1694,8 @@ static void afe_send_cal_spkr_prot_tx(int port_id) 
	}

	}

	mutex_unlock(&this_afe.cal_data[AFE_FB_SPKR_PROT_EX_VI_CAL]->lock);

	mutex_unlock(&this_afe.cal_data[AFE_FB_SPKR_PROT_EX_VI_CAL]->lock);





	/* Register for DC detection event */

	afe_spkr_prot_reg_event_cfg(port_id);

}

}





static void afe_send_cal_spkr_prot_rx(int port_id)

static void afe_send_cal_spkr_prot_rx(int port_id)

include/dsp/apr_audio-v2.h

+93 −0
Original line number Original line Diff line number Diff line
@@ -1780,6 +1780,99 @@ struct afe_loopback_iir_cfg_v2 { 
	struct param_hdr_v1 st_iir_filter_config_pdata;

	struct param_hdr_v1 st_iir_filter_config_pdata;

	struct afe_sidetone_iir_filter_config_params st_iir_filter_config_data;

	struct afe_sidetone_iir_filter_config_params st_iir_filter_config_data;

} __packed;

} __packed;





/*

 * Param ID and related structures for AFE event

 * registration.

 */

#define AFE_PORT_CMD_MOD_EVENT_CFG		0x000100FD



struct afe_port_cmd_event_cfg {

	struct apr_hdr	hdr;

	uint32_t version;

	/* Version number. The current version is 0 */



	uint32_t port_id;

	/*

	 * Port ID for the AFE port hosting the modules

	 * being registered for the events

	 */



	uint32_t num_events;

	/*

	 * Number of events to be registered with the service

	 * Each event has the structure of

	 * afe_port_cmd_mod_evt_cfg_payload.

	 */

	uint8_t payload[0];

};



/** Event registration for a module. */

#define AFE_MODULE_REGISTER_EVENT_FLAG    1



/** Event de-registration for a module. */

#define AFE_MODULE_DEREGISTER_EVENT_FLAG  0



struct afe_port_cmd_mod_evt_cfg_payload {

	uint32_t module_id;

	/* Valid ID of the module. */



	uint16_t instance_id;

	/*

	 * Valid ID of the module instance in the current topology.

	 * If both module_id and instance_id ID are set to 0, the event is

	 * registered with all modules and instances in the topology.

	 * If module_id is set to 0 and instance_id is set to a non-zero value,

	 * the payload is considered to be invalid.

	 */



	uint16_t reserved;

	/* Used for alignment; must be set to 0.*/



	uint32_t event_id;

	/* Unique ID of the event. */



	uint32_t reg_flag;

	/*

	 * Bit field for enabling or disabling event registration.

	 * values

	 * - #AFE_MODULE_REGISTER_EVENT_FLAG

	 * - #AFE_MODULE_DEREGISTER_EVENT_FLAG

	 */

} __packed;





#define AFE_PORT_MOD_EVENT			0x0001010C



struct afe_port_mod_evt_rsp_hdr {

	uint32_t minor_version;

	/* This indicates the minor version of the payload */



	uint32_t port_id;

	/* AFE port hosting this module */



	uint32_t module_id;

	/* Module ID which is raising the event */



	uint16_t instance_id;

	/* Instance ID of the module which is raising the event */



	uint16_t reserved;

	/* For alignment purpose, should be set to 0 */



	uint32_t event_id;

	/* Valid event ID registered by client */



	uint32_t payload_size;

	/*

	 * Size of the event payload

	 * This is followed by actual payload corresponding to the event

	 */

} __packed;



#define AFE_PORT_SP_DC_DETECTION_EVENT		0x0001010D



#define AFE_MODULE_SPEAKER_PROTECTION	0x00010209

#define AFE_MODULE_SPEAKER_PROTECTION	0x00010209

#define AFE_PARAM_ID_SPKR_PROT_CONFIG	0x0001020a

#define AFE_PARAM_ID_SPKR_PROT_CONFIG	0x0001020a

#define AFE_API_VERSION_SPKR_PROT_CONFIG	0x1

#define AFE_API_VERSION_SPKR_PROT_CONFIG	0x1