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

Commit 90502148 authored by Vidyakumar Athota's avatar Vidyakumar Athota
Browse files

ASoC: msm: Add support to query speaker parameters 



Add SET and GET parameter APIs to query speaker
parameters in feedback speaker protection FTM mode.

CRs-Fixed: 974621
Change-Id: I1a51e5033d7836c0c996621593cd2f4dd6982dcd
Signed-off-by: default avatarVidyakumar Athota <vathota@codeaurora.org>
parent 1c10389d

include/sound/apr_audio-v2.h

+174 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2016, 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
@@ -7501,11 +7501,184 @@ struct asm_mode_vi_proc_cfg { 
	uint32_t cal_mode;

} __packed;



#define AFE_MODULE_SPEAKER_PROTECTION_V2_TH_VI	0x0001026A

#define AFE_PARAM_ID_SP_V2_TH_VI_MODE_CFG	0x0001026B

#define AFE_PARAM_ID_SP_V2_TH_VI_FTM_CFG	0x0001029F

#define AFE_PARAM_ID_SP_V2_TH_VI_FTM_PARAMS	0x000102A0



struct afe_sp_th_vi_mode_cfg {

	uint32_t minor_version;

	uint32_t operation_mode;

	/*

	 * Operation mode of thermal VI module.

	 *   0 -- Normal Running mode

	 *   1 -- Calibration mode

	 *   2 -- FTM mode

	 */

	uint32_t r0t0_selection_flag[SP_V2_NUM_MAX_SPKR];

	/*

	 * Specifies which set of R0, T0 values the algorithm will use.

	 * This field is valid only in Normal mode (operation_mode = 0).

	 * 0 -- Use calibrated R0, T0 value

	 * 1 -- Use safe R0, T0 value

	 */

	int32_t r0_cali_q24[SP_V2_NUM_MAX_SPKR];

	/*

	 * Calibration point resistance per device. This field is valid

	 * only in Normal mode (operation_mode = 0).

	 * values 33554432 to 1073741824 Ohms (in Q24 format)

	 */

	int16_t t0_cali_q6[SP_V2_NUM_MAX_SPKR];

	/*

	 * Calibration point temperature per device. This field is valid

	 * in both Normal mode and Calibration mode.

	 * values -1920 to 5120 degrees C (in Q6 format)

	 */

	uint32_t quick_calib_flag;

	/*

	 * Indicates whether calibration is to be done in quick mode or not.

	 * This field is valid only in Calibration mode (operation_mode = 1).

	 * 0 -- Disabled

	 * 1 -- Enabled

	 */

} __packed;



struct afe_sp_th_vi_ftm_cfg {

	uint32_t minor_version;

	uint32_t wait_time_ms[SP_V2_NUM_MAX_SPKR];

	/*

	 * Wait time to heat up speaker before collecting statistics

	 * for ftm mode in ms.

	 * values 0 to 4294967295 ms

	 */

	uint32_t ftm_time_ms[SP_V2_NUM_MAX_SPKR];

	/*

	 * duration for which FTM statistics are collected in ms.

	 * values 0 to 2000 ms

	 */

} __packed;



struct afe_sp_th_vi_ftm_params {

	uint32_t minor_version;

	int32_t dc_res_q24[SP_V2_NUM_MAX_SPKR];

	/*

	 * DC resistance value in q24 format

	 * values 0 to 2147483647 Ohms (in Q24 format)

	 */

	int32_t temp_q22[SP_V2_NUM_MAX_SPKR];

	/*

	 * temperature value in q22 format

	 * values -125829120 to 2147483647 degC (in Q22 format)

	 */

	uint32_t status[SP_V2_NUM_MAX_SPKR];

	/*

	 * FTM packet status

	 * 0 - Incorrect operation mode.This status is returned

	 *     when GET_PARAM is called in non FTM Mode

	 * 1 - Inactive mode -- Port is not yet started.

	 * 2 - Wait state. wait_time_ms has not yet elapsed

	 * 3 - In progress state. ftm_time_ms has not yet elapsed.

	 * 4 - Success.

	 * 5 - Failed.

	 */

} __packed;



struct afe_sp_th_vi_get_param {

	struct apr_hdr hdr;

	struct afe_port_cmd_get_param_v2 get_param;

	struct afe_port_param_data_v2 pdata;

	struct afe_sp_th_vi_ftm_params param;

} __packed;



struct afe_sp_th_vi_get_param_resp {

	uint32_t status;

	struct afe_port_param_data_v2 pdata;

	struct afe_sp_th_vi_ftm_params param;

} __packed;





#define AFE_MODULE_SPEAKER_PROTECTION_V2_EX_VI	0x0001026F

#define AFE_PARAM_ID_SP_V2_EX_VI_MODE_CFG	0x000102A1

#define AFE_PARAM_ID_SP_V2_EX_VI_FTM_CFG	0x000102A2

#define AFE_PARAM_ID_SP_V2_EX_VI_FTM_PARAMS	0x000102A3



struct afe_sp_ex_vi_mode_cfg {

	uint32_t minor_version;

	uint32_t operation_mode;

	/*

	 * Operation mode of Excursion VI module.

	 * 0 - Normal Running mode

	 * 2 - FTM mode

	 */

} __packed;



struct afe_sp_ex_vi_ftm_cfg {

	uint32_t minor_version;

	uint32_t wait_time_ms[SP_V2_NUM_MAX_SPKR];

	/*

	 * Wait time to heat up speaker before collecting statistics

	 * for ftm mode in ms.

	 * values 0 to 4294967295 ms

	 */

	uint32_t ftm_time_ms[SP_V2_NUM_MAX_SPKR];

	/*

	 * duration for which FTM statistics are collected in ms.

	 * values 0 to 2000 ms

	 */

} __packed;



struct afe_sp_ex_vi_ftm_params {

	uint32_t minor_version;

	int32_t freq_q20[SP_V2_NUM_MAX_SPKR];

	/*

	 * Resonance frequency in q20 format

	 * values 0 to 2147483647 Hz (in Q20 format)

	 */

	int32_t resis_q24[SP_V2_NUM_MAX_SPKR];

	/*

	 * Mechanical resistance in q24 format

	 * values 0 to 2147483647 Ohms (in Q24 format)

	 */

	int32_t qmct_q24[SP_V2_NUM_MAX_SPKR];

	/*

	 * Mechanical Qfactor in q24 format

	 * values 0 to 2147483647 (in Q24 format)

	 */

	uint32_t status[SP_V2_NUM_MAX_SPKR];

	/*

	 * FTM packet status

	 * 0 - Incorrect operation mode.This status is returned

	 *      when GET_PARAM is called in non FTM Mode.

	 * 1 - Inactive mode -- Port is not yet started.

	 * 2 - Wait state. wait_time_ms has not yet elapsed

	 * 3 - In progress state. ftm_time_ms has not yet elapsed.

	 * 4 - Success.

	 * 5 - Failed.

	 */

} __packed;



struct afe_sp_ex_vi_get_param {

	struct apr_hdr hdr;

	struct afe_port_cmd_get_param_v2 get_param;

	struct afe_port_param_data_v2 pdata;

	struct afe_sp_ex_vi_ftm_params param;

} __packed;



struct afe_sp_ex_vi_get_param_resp {

	uint32_t status;

	struct afe_port_param_data_v2 pdata;

	struct afe_sp_ex_vi_ftm_params param;

} __packed;



union afe_spkr_prot_config {

	struct asm_fbsp_mode_rx_cfg mode_rx_cfg;

	struct asm_spkr_calib_vi_proc_cfg vi_proc_cfg;

	struct asm_feedback_path_cfg feedback_path_cfg;

	struct asm_mode_vi_proc_cfg mode_vi_proc_cfg;

	struct afe_sp_th_vi_mode_cfg th_vi_mode_cfg;

	struct afe_sp_th_vi_ftm_cfg th_vi_ftm_cfg;

	struct afe_sp_ex_vi_mode_cfg ex_vi_mode_cfg;

	struct afe_sp_ex_vi_ftm_cfg ex_vi_ftm_cfg;

} __packed;



struct afe_spkr_prot_config_command {

include/uapi/linux/msm_audio_calibration.h

+88 −3
Original line number Diff line number Diff line
@@ -96,9 +96,14 @@ enum { 
	ADM_RTAC_AUDVOL_CAL_TYPE,



	ULP_LSM_TOPOLOGY_ID_CAL_TYPE,

	AFE_FB_SPKR_PROT_TH_VI_CAL_TYPE,

	AFE_FB_SPKR_PROT_EX_VI_CAL_TYPE,

	MAX_CAL_TYPES,

};



#define AFE_FB_SPKR_PROT_TH_VI_CAL_TYPE AFE_FB_SPKR_PROT_TH_VI_CAL_TYPE

#define AFE_FB_SPKR_PROT_EX_VI_CAL_TYPE AFE_FB_SPKR_PROT_EX_VI_CAL_TYPE



enum {

	VERSION_0_0,

};
@@ -271,7 +276,9 @@ enum msm_spkr_prot_states { 
	MSM_SPKR_PROT_DISABLED,

	MSM_SPKR_PROT_NOT_CALIBRATED,

	MSM_SPKR_PROT_PRE_CALIBRATED,

	MSM_SPKR_PROT_IN_FTM_MODE

};

#define MSM_SPKR_PROT_IN_FTM_MODE MSM_SPKR_PROT_IN_FTM_MODE



enum msm_spkr_count {

	SP_V2_SPKR_1,
@@ -283,9 +290,46 @@ struct audio_cal_info_spk_prot_cfg { 
	int32_t		r0[SP_V2_NUM_MAX_SPKRS];

	int32_t		t0[SP_V2_NUM_MAX_SPKRS];

	uint32_t	quick_calib_flag;

	uint32_t	mode; /*0 - Start spk prot

	1 - Start calib

	2 - Disable spk prot*/

	uint32_t	mode;

	/*

	 * 0 - Start spk prot

	 * 1 - Start calib

	 * 2 - Disable spk prot

	 */

};



struct audio_cal_info_sp_th_vi_ftm_cfg {

	uint32_t	wait_time[SP_V2_NUM_MAX_SPKRS];

	uint32_t	ftm_time[SP_V2_NUM_MAX_SPKRS];

	uint32_t	mode;

	/*

	 * 0 - normal running mode

	 * 1 - Calibration

	 * 2 - FTM mode

	 */

};



struct audio_cal_info_sp_ex_vi_ftm_cfg {

	uint32_t	wait_time[SP_V2_NUM_MAX_SPKRS];

	uint32_t	ftm_time[SP_V2_NUM_MAX_SPKRS];

	uint32_t	mode;

	/*

	 * 0 - normal running mode

	 * 2 - FTM mode

	 */

};



struct audio_cal_info_sp_ex_vi_param {

	int32_t		freq_q20[SP_V2_NUM_MAX_SPKRS];

	int32_t		resis_q24[SP_V2_NUM_MAX_SPKRS];

	int32_t		qmct_q24[SP_V2_NUM_MAX_SPKRS];

	int32_t		status[SP_V2_NUM_MAX_SPKRS];

};



struct audio_cal_info_sp_th_vi_param {

	int32_t		r_dc_q24[SP_V2_NUM_MAX_SPKRS];

	int32_t		temp_q22[SP_V2_NUM_MAX_SPKRS];

	int32_t		status[SP_V2_NUM_MAX_SPKRS];

};



struct audio_cal_info_msm_spk_prot_status {
@@ -493,6 +537,27 @@ struct audio_cal_fb_spk_prot_cfg { 
	struct audio_cal_type_fb_spk_prot_cfg	cal_type;

};



struct audio_cal_type_sp_th_vi_ftm_cfg {

	struct audio_cal_type_header		cal_hdr;

	struct audio_cal_data			cal_data;

	struct audio_cal_info_sp_th_vi_ftm_cfg	cal_info;

};



struct audio_cal_sp_th_vi_ftm_cfg {

	struct audio_cal_header			hdr;

	struct audio_cal_type_sp_th_vi_ftm_cfg	cal_type;

};



struct audio_cal_type_sp_ex_vi_ftm_cfg {

	struct audio_cal_type_header		cal_hdr;

	struct audio_cal_data			cal_data;

	struct audio_cal_info_sp_ex_vi_ftm_cfg	cal_info;

};



struct audio_cal_sp_ex_vi_ftm_cfg {

	struct audio_cal_header			hdr;

	struct audio_cal_type_sp_ex_vi_ftm_cfg	cal_type;

};

struct audio_cal_type_hw_delay {

	struct audio_cal_type_header	cal_hdr;

	struct audio_cal_data		cal_data;
@@ -604,4 +669,24 @@ struct audio_cal_fb_spk_prot_status { 
	struct audio_cal_type_fb_spk_prot_status	cal_type;

};



struct audio_cal_type_sp_th_vi_param {

	struct audio_cal_type_header			cal_hdr;

	struct audio_cal_data				cal_data;

	struct audio_cal_info_sp_th_vi_param		cal_info;

};



struct audio_cal_sp_th_vi_param {

	struct audio_cal_header				hdr;

	struct audio_cal_type_sp_th_vi_param		cal_type;

};

struct audio_cal_type_sp_ex_vi_param {

	struct audio_cal_type_header			cal_hdr;

	struct audio_cal_data				cal_data;

	struct audio_cal_info_sp_ex_vi_param		cal_info;

};



struct audio_cal_sp_ex_vi_param {

	struct audio_cal_header				hdr;

	struct audio_cal_type_sp_ex_vi_param		cal_type;

};

#endif /* _UAPI_MSM_AUDIO_CALIBRATION_H */

sound/soc/msm/qdsp6v2/audio_cal_utils.c

+33 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2016, 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
@@ -89,6 +89,22 @@ size_t get_cal_info_size(int32_t cal_type) 
	case AFE_FB_SPKR_PROT_CAL_TYPE:

		size = sizeof(struct audio_cal_info_spk_prot_cfg);

		break;

	case AFE_FB_SPKR_PROT_TH_VI_CAL_TYPE:

		/*

		 * Since get and set parameter structures are different in size

		 * use the maximum size of get and set parameter structure

		 */

		size = max(sizeof(struct audio_cal_info_sp_th_vi_ftm_cfg),

			   sizeof(struct audio_cal_info_sp_th_vi_param));

		break;

	case AFE_FB_SPKR_PROT_EX_VI_CAL_TYPE:

		/*

		 * Since get and set parameter structures are different in size

		 * use the maximum size of get and set parameter structure

		 */

		size = max(sizeof(struct audio_cal_info_sp_ex_vi_ftm_cfg),

			   sizeof(struct audio_cal_info_sp_ex_vi_param));

		break;

	case AFE_ANC_CAL_TYPE:

		size = 0;

		break;
@@ -219,6 +235,22 @@ size_t get_user_cal_type_size(int32_t cal_type) 
	case AFE_FB_SPKR_PROT_CAL_TYPE:

		size = sizeof(struct audio_cal_type_fb_spk_prot_cfg);

		break;

	case AFE_FB_SPKR_PROT_TH_VI_CAL_TYPE:

		/*

		 * Since get and set parameter structures are different in size

		 * use the maximum size of get and set parameter structure

		 */

		size = max(sizeof(struct audio_cal_type_sp_th_vi_ftm_cfg),

			   sizeof(struct audio_cal_type_sp_th_vi_param));

		break;

	case AFE_FB_SPKR_PROT_EX_VI_CAL_TYPE:

		/*

		 * Since get and set parameter structures are different in size

		 * use the maximum size of get and set parameter structure

		 */

		size = max(sizeof(struct audio_cal_type_sp_ex_vi_ftm_cfg),

			   sizeof(struct audio_cal_type_sp_ex_vi_param));

		break;

	case AFE_ANC_CAL_TYPE:

		size = 0;

		break;

sound/soc/msm/qdsp6v2/q6afe.c

+460 −42

File changed.

Preview size limit exceeded, changes collapsed.