evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASoC: msm: qdsp6v2: Update AFE driver to support Instance ID

Browse source 
Add support to set and get AFE module params with
Instance ID support. Maintain support for non
Instance ID set and get param structures as well.
Use common pack and set param functions to set and
get parameters to DSP instead of handling them at an
individual module level.

CRs-Fixed: 2151551
Change-Id: I9f2cc097a0f1a99a4639bb0cd636500b41a41b1b
Signed-off-by: Siena Richard <sienar@codeaurora.org>
Signed-off-by: Aditya Bavanari <abavanar@codeaurora.org>
This commit is contained in:
Aditya Bavanari 2017-04-25 13:35:56 -07:00
parent cd9c139d62
commit 43f8fb6053
3 changed files with 1348 additions and 2065 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

407
include/sound/apr_audio-v2.h
View file

@ -1599,15 +1599,8 @@ struct afe_sidetone_iir_filter_config_params {
#define AFE_MODULE_LOOPBACK 0x00010205 #define AFE_MODULE_LOOPBACK 0x00010205
#define AFE_PARAM_ID_LOOPBACK_GAIN_PER_PATH 0x00010206 #define AFE_PARAM_ID_LOOPBACK_GAIN_PER_PATH 0x00010206
/* Payload of the #AFE_PARAM_ID_LOOPBACK_GAIN_PER_PATH parameter, /* Used by RTAC */
* which gets/sets loopback gain of a port to an Rx port. struct afe_rtac_set_param_v2 {
* The Tx port ID of the loopback is part of the set_param command.
*/
/* Payload of the #AFE_PORT_CMD_SET_PARAM_V2 command's
* configuration/calibration settings for the AFE port.
*/
struct afe_port_cmd_set_param_v2 {
u16 port_id; u16 port_id;
/* Port interface and direction (Rx or Tx) to start. /* Port interface and direction (Rx or Tx) to start.
*/ */
@ -1651,35 +1644,60 @@ u32 mem_map_handle;
} __packed; } __packed;
#define AFE_PORT_CMD_SET_PARAM_V2 0x000100EF #define AFE_PORT_CMD_SET_PARAM_V2 0x000100EF
struct afe_port_cmd_set_param_v2 {
/* APR Header */
struct apr_hdr apr_hdr;
struct afe_port_param_data_v2 { /* Port interface and direction (Rx or Tx) to start. */
u32 module_id; u16 port_id;
/* ID of the module to be configured.
* Supported values: Valid module ID
*/
u32 param_id; /*
/* ID of the parameter corresponding to the supported parameters * Actual size of the payload in bytes.
* for the module ID. * This is used for parsing the parameter payload.
* Supported values: Valid parameter ID * Supported values: > 0
*/ */
u16 payload_size;
u16 param_size; /* The header detailing the memory mapping for out of band. */
/* Actual size of the data for the struct mem_mapping_hdr mem_hdr;
* module_id/param_id pair. The size is a
* multiple of four bytes.
* Supported values: > 0
*/
u16 reserved; /* The parameter data to be filled when sent inband */
/* This field must be set to zero. u8 param_data[0];
*/
} __packed; } __packed;
#define AFE_PORT_CMD_SET_PARAM_V3 0x000100FA
struct afe_port_cmd_set_param_v3 {
/* APR Header */
struct apr_hdr apr_hdr;
/* Port ID of the AFE port to configure. Port interface and direction
* (Rx or Tx) to configure. An even number represents the Rx direction,
* and an odd number represents the Tx direction.
*/
u16 port_id;
/* Reserved. This field must be set to zero. */
u16 reserved;
/* The memory mapping header to be used when sending outband */
struct mem_mapping_hdr mem_hdr;
/* The total size of the payload, including param_hdr_v3 */
u32 payload_size;
/*
* The parameter data to be filled when sent inband.
* Must include param_hdr packed correctly.
*/
u8 param_data[0];
} __packed;
/* Payload of the #AFE_PARAM_ID_LOOPBACK_GAIN_PER_PATH parameter,
* which gets/sets loopback gain of a port to an Rx port.
* The Tx port ID of the loopback is part of the set_param command.
*/
struct afe_loopback_gain_per_path_param { struct afe_loopback_gain_per_path_param {
struct apr_hdr hdr;
struct afe_port_cmd_set_param_v2 param;
struct afe_port_param_data_v2 pdata;
u16 rx_port_id; u16 rx_port_id;
/* Rx port of the loopback. */ /* Rx port of the loopback. */
@ -1715,9 +1733,6 @@ enum afe_loopback_routing_mode {
* which enables/disables one AFE loopback. * which enables/disables one AFE loopback.
*/ */
struct afe_loopback_cfg_v1 { struct afe_loopback_cfg_v1 {
struct apr_hdr hdr;
struct afe_port_cmd_set_param_v2 param;
struct afe_port_param_data_v2 pdata;
u32 loopback_cfg_minor_version; u32 loopback_cfg_minor_version;
/* Minor version used for tracking the version of the RMC module /* Minor version used for tracking the version of the RMC module
* configuration interface. * configuration interface.
@ -1779,19 +1794,19 @@ struct loopback_cfg_data {
struct afe_st_loopback_cfg_v1 { struct afe_st_loopback_cfg_v1 {
struct apr_hdr hdr; struct apr_hdr hdr;
struct afe_port_cmd_set_param_v2 param; struct mem_mapping_hdr mem_hdr;
struct afe_port_param_data_v2 gain_pdata; struct param_hdr_v1 gain_pdata;
struct afe_loopback_sidetone_gain gain_data; struct afe_loopback_sidetone_gain gain_data;
struct afe_port_param_data_v2 cfg_pdata; struct param_hdr_v1 cfg_pdata;
struct loopback_cfg_data cfg_data; struct loopback_cfg_data cfg_data;
} __packed; } __packed;
struct afe_loopback_iir_cfg_v2 { struct afe_loopback_iir_cfg_v2 {
struct apr_hdr hdr; struct apr_hdr hdr;
struct afe_port_cmd_set_param_v2 param; struct mem_mapping_hdr param;
struct afe_port_param_data_v2 st_iir_enable_pdata; struct param_hdr_v1 st_iir_enable_pdata;
struct afe_mod_enable_param st_iir_mode_enable_data; struct afe_mod_enable_param st_iir_mode_enable_data;
struct afe_port_param_data_v2 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;
#define AFE_MODULE_SPEAKER_PROTECTION 0x00010209 #define AFE_MODULE_SPEAKER_PROTECTION 0x00010209
@ -2243,20 +2258,6 @@ struct afe_param_id_spdif_clk_cfg {
*/ */
} __packed; } __packed;
struct afe_spdif_clk_config_command {
struct apr_hdr hdr;
struct afe_port_cmd_set_param_v2 param;
struct afe_port_param_data_v2 pdata;
struct afe_param_id_spdif_clk_cfg clk_cfg;
} __packed;
struct afe_spdif_chstatus_config_command {
struct apr_hdr hdr;
struct afe_port_cmd_set_param_v2 param;
struct afe_port_param_data_v2 pdata;
struct afe_param_id_spdif_ch_status_cfg ch_status;
} __packed;
struct afe_spdif_port_config { struct afe_spdif_port_config {
struct afe_param_id_spdif_cfg cfg; struct afe_param_id_spdif_cfg cfg;
struct afe_param_id_spdif_ch_status_cfg ch_status; struct afe_param_id_spdif_ch_status_cfg ch_status;
@ -2782,16 +2783,6 @@ struct afe_param_id_usb_audio_cfg {
u32 endian; u32 endian;
} __packed; } __packed;
struct afe_usb_audio_dev_param_command {
struct apr_hdr hdr;
struct afe_port_cmd_set_param_v2 param;
struct afe_port_param_data_v2 pdata;
union {
struct afe_param_id_usb_audio_dev_params usb_dev;
struct afe_param_id_usb_audio_dev_lpcm_fmt lpcm_fmt;
};
} __packed;
/* /*
* This param id is used to configure Real Time Proxy interface. * This param id is used to configure Real Time Proxy interface.
*/ */
@ -3186,20 +3177,6 @@ struct afe_param_id_custom_tdm_header_cfg {
uint16_t header7; Reserved Info[3] - Bitrate[kbps] - Low Byte -> 0x0 */ uint16_t header7; Reserved Info[3] - Bitrate[kbps] - Low Byte -> 0x0 */
} __packed; } __packed;
struct afe_slot_mapping_config_command {
struct apr_hdr hdr;
struct afe_port_cmd_set_param_v2 param;
struct afe_port_param_data_v2 pdata;
struct afe_param_id_slot_mapping_cfg slot_mapping;
} __packed;
struct afe_custom_tdm_header_config_command {
struct apr_hdr hdr;
struct afe_port_cmd_set_param_v2 param;
struct afe_port_param_data_v2 pdata;
struct afe_param_id_custom_tdm_header_cfg custom_tdm_header;
} __packed;
struct afe_tdm_port_config { struct afe_tdm_port_config {
struct afe_param_id_tdm_cfg tdm; struct afe_param_id_tdm_cfg tdm;
struct afe_param_id_slot_mapping_cfg slot_mapping; struct afe_param_id_slot_mapping_cfg slot_mapping;
@ -3576,18 +3553,6 @@ union afe_port_config {
struct avs_enc_packetizer_id_param_t enc_pkt_id_param; struct avs_enc_packetizer_id_param_t enc_pkt_id_param;
} __packed; } __packed;
struct afe_audioif_config_command_no_payload {
struct apr_hdr hdr;
struct afe_port_cmd_set_param_v2 param;
} __packed;
struct afe_audioif_config_command {
struct apr_hdr hdr;
struct afe_port_cmd_set_param_v2 param;
struct afe_port_param_data_v2 pdata;
union afe_port_config port;
} __packed;
#define AFE_PORT_CMD_DEVICE_START 0x000100E5 #define AFE_PORT_CMD_DEVICE_START 0x000100E5
/* Payload of the #AFE_PORT_CMD_DEVICE_START.*/ /* Payload of the #AFE_PORT_CMD_DEVICE_START.*/
@ -3750,13 +3715,8 @@ u32 mem_map_handle;
*/ */
} __packed; } __packed;
#define AFE_PORT_CMD_GET_PARAM_V2 0x000100F0 /* Used by RTAC */
struct afe_rtac_get_param_v2 {
/* Payload of the #AFE_PORT_CMD_GET_PARAM_V2 command,
* which queries for one post/preprocessing parameter of a
* stream.
*/
struct afe_port_cmd_get_param_v2 {
u16 port_id; u16 port_id;
/* Port interface and direction (Rx or Tx) to start. */ /* Port interface and direction (Rx or Tx) to start. */
@ -3802,6 +3762,37 @@ struct afe_port_cmd_get_param_v2 {
*/ */
} __packed; } __packed;
#define AFE_PORT_CMD_GET_PARAM_V2 0x000100F0
/* Payload of the #AFE_PORT_CMD_GET_PARAM_V2 command,
* which queries for one post/preprocessing parameter of a
* stream.
*/
struct afe_port_cmd_get_param_v2 {
struct apr_hdr apr_hdr;
/* Port interface and direction (Rx or Tx) to start. */
u16 port_id;
/* Maximum data size of the parameter ID/module ID combination.
* This is a multiple of four bytes
* Supported values: > 0
*/
u16 payload_size;
/* The memory mapping header to be used when requesting outband */
struct mem_mapping_hdr mem_hdr;
/* The module ID of the parameter data requested */
u32 module_id;
/* The parameter ID of the parameter data requested */
u32 param_id;
/* The header information for the parameter data */
struct param_hdr_v1 param_hdr;
} __packed;
#define AFE_PORT_CMDRSP_GET_PARAM_V2 0x00010106 #define AFE_PORT_CMDRSP_GET_PARAM_V2 0x00010106
/* Payload of the #AFE_PORT_CMDRSP_GET_PARAM_V2 message, which /* Payload of the #AFE_PORT_CMDRSP_GET_PARAM_V2 message, which
@ -3817,6 +3808,41 @@ struct afe_port_cmd_get_param_v2 {
struct afe_port_cmdrsp_get_param_v2 { struct afe_port_cmdrsp_get_param_v2 {
u32 status; u32 status;
struct param_hdr_v1 param_hdr;
u8 param_data[0];
} __packed;
#define AFE_PORT_CMD_GET_PARAM_V3 0x000100FB
struct afe_port_cmd_get_param_v3 {
/* APR Header */
struct apr_hdr apr_hdr;
/* Port ID of the AFE port to configure. Port interface and direction
* (Rx or Tx) to configure. An even number represents the Rx direction,
* and an odd number represents the Tx direction.
*/
u16 port_id;
/* Reserved. This field must be set to zero. */
u16 reserved;
/* The memory mapping header to be used when requesting outband */
struct mem_mapping_hdr mem_hdr;
/* The header information for the parameter data */
struct param_hdr_v3 param_hdr;
} __packed;
#define AFE_PORT_CMDRSP_GET_PARAM_V3 0x00010108
struct afe_port_cmdrsp_get_param_v3 {
/* The status of the command */
uint32_t status;
/* The header information for the parameter data */
struct param_hdr_v3 param_hdr;
/* The parameter data to be filled when sent inband */
u8 param_data[0];
} __packed; } __packed;
#define AFE_PARAM_ID_LPASS_CORE_SHARED_CLOCK_CONFIG 0x0001028C #define AFE_PARAM_ID_LPASS_CORE_SHARED_CLOCK_CONFIG 0x0001028C
@ -3838,13 +3864,6 @@ struct afe_param_id_lpass_core_shared_clk_cfg {
*/ */
} __packed; } __packed;
struct afe_lpass_core_shared_clk_config_command {
struct apr_hdr hdr;
struct afe_port_cmd_set_param_v2 param;
struct afe_port_param_data_v2 pdata;
struct afe_param_id_lpass_core_shared_clk_cfg clk_cfg;
} __packed;
/* adsp_afe_service_commands.h */ /* adsp_afe_service_commands.h */
#define ADSP_MEMORY_MAP_EBI_POOL 0 #define ADSP_MEMORY_MAP_EBI_POOL 0
@ -9177,15 +9196,13 @@ struct afe_sp_th_vi_ftm_params {
} __packed; } __packed;
struct afe_sp_th_vi_get_param { struct afe_sp_th_vi_get_param {
struct apr_hdr hdr; struct param_hdr_v3 pdata;
struct afe_port_cmd_get_param_v2 get_param;
struct afe_port_param_data_v2 pdata;
struct afe_sp_th_vi_ftm_params param; struct afe_sp_th_vi_ftm_params param;
} __packed; } __packed;
struct afe_sp_th_vi_get_param_resp { struct afe_sp_th_vi_get_param_resp {
uint32_t status; uint32_t status;
struct afe_port_param_data_v2 pdata; struct param_hdr_v3 pdata;
struct afe_sp_th_vi_ftm_params param; struct afe_sp_th_vi_ftm_params param;
} __packed; } __packed;
@ -9251,15 +9268,13 @@ struct afe_sp_ex_vi_ftm_params {
} __packed; } __packed;
struct afe_sp_ex_vi_get_param { struct afe_sp_ex_vi_get_param {
struct apr_hdr hdr; struct param_hdr_v3 pdata;
struct afe_port_cmd_get_param_v2 get_param;
struct afe_port_param_data_v2 pdata;
struct afe_sp_ex_vi_ftm_params param; struct afe_sp_ex_vi_ftm_params param;
} __packed; } __packed;
struct afe_sp_ex_vi_get_param_resp { struct afe_sp_ex_vi_get_param_resp {
uint32_t status; uint32_t status;
struct afe_port_param_data_v2 pdata; struct param_hdr_v3 pdata;
struct afe_sp_ex_vi_ftm_params param; struct afe_sp_ex_vi_ftm_params param;
} __packed; } __packed;
@ -9274,23 +9289,16 @@ union afe_spkr_prot_config {
struct afe_sp_ex_vi_ftm_cfg ex_vi_ftm_cfg; struct afe_sp_ex_vi_ftm_cfg ex_vi_ftm_cfg;
} __packed; } __packed;
struct afe_spkr_prot_config_command {
struct apr_hdr hdr;
struct afe_port_cmd_set_param_v2 param;
struct afe_port_param_data_v2 pdata;
union afe_spkr_prot_config prot_config;
} __packed;
struct afe_spkr_prot_get_vi_calib { struct afe_spkr_prot_get_vi_calib {
struct apr_hdr hdr; struct apr_hdr hdr;
struct afe_port_cmd_get_param_v2 get_param; struct mem_mapping_hdr mem_hdr;
struct afe_port_param_data_v2 pdata; struct param_hdr_v3 pdata;
struct asm_calib_res_cfg res_cfg; struct asm_calib_res_cfg res_cfg;
} __packed; } __packed;
struct afe_spkr_prot_calib_get_resp { struct afe_spkr_prot_calib_get_resp {
uint32_t status; uint32_t status;
struct afe_port_param_data_v2 pdata; struct param_hdr_v3 pdata;
struct asm_calib_res_cfg res_cfg; struct asm_calib_res_cfg res_cfg;
} __packed; } __packed;
@ -9582,6 +9590,7 @@ struct avcs_fwk_ver_info {
/* Commands/Params to pass the codec/slimbus data to DSP */ /* Commands/Params to pass the codec/slimbus data to DSP */
#define AFE_SVC_CMD_SET_PARAM (0x000100f3) #define AFE_SVC_CMD_SET_PARAM (0x000100f3)
#define AFE_SVC_CMD_SET_PARAM_V2 (0x000100fc)
#define AFE_MODULE_CDC_DEV_CFG (0x00010234) #define AFE_MODULE_CDC_DEV_CFG (0x00010234)
#define AFE_PARAM_ID_CDC_SLIMBUS_SLAVE_CFG (0x00010235) #define AFE_PARAM_ID_CDC_SLIMBUS_SLAVE_CFG (0x00010235)
#define AFE_PARAM_ID_CDC_REG_CFG (0x00010236) #define AFE_PARAM_ID_CDC_REG_CFG (0x00010236)
@ -9966,13 +9975,6 @@ struct afe_clk_cfg {
#define AFE_MODULE_CLOCK_SET 0x0001028F #define AFE_MODULE_CLOCK_SET 0x0001028F
#define AFE_PARAM_ID_CLOCK_SET 0x00010290 #define AFE_PARAM_ID_CLOCK_SET 0x00010290
struct afe_lpass_clk_config_command {
struct apr_hdr hdr;
struct afe_port_cmd_set_param_v2 param;
struct afe_port_param_data_v2 pdata;
struct afe_clk_cfg clk_cfg;
} __packed;
enum afe_lpass_digital_clk_src { enum afe_lpass_digital_clk_src {
Q6AFE_LPASS_DIGITAL_ROOT_INVALID, Q6AFE_LPASS_DIGITAL_ROOT_INVALID,
Q6AFE_LPASS_DIGITAL_ROOT_PRI_MI2S_OSR, Q6AFE_LPASS_DIGITAL_ROOT_PRI_MI2S_OSR,
@ -10008,14 +10010,6 @@ struct afe_digital_clk_cfg {
u16 reserved; u16 reserved;
} __packed; } __packed;
struct afe_lpass_digital_clk_config_command {
struct apr_hdr hdr;
struct afe_port_cmd_set_param_v2 param;
struct afe_port_param_data_v2 pdata;
struct afe_digital_clk_cfg clk_cfg;
} __packed;
/* /*
* Opcode for AFE to start DTMF. * Opcode for AFE to start DTMF.
*/ */
@ -10124,18 +10118,32 @@ struct afe_param_cdc_reg_cfg_data {
struct afe_param_cdc_reg_cfg *reg_data; struct afe_param_cdc_reg_cfg *reg_data;
} __packed; } __packed;
struct afe_svc_cmd_set_param { struct afe_svc_cmd_set_param_v1 {
/* APR Header */
struct apr_hdr apr_hdr;
/* The total size of the payload, including param_hdr_v3 */
uint32_t payload_size; uint32_t payload_size;
uint32_t payload_address_lsw;
uint32_t payload_address_msw; /* The memory mapping header to be used when sending outband */
uint32_t mem_map_handle; struct mem_mapping_hdr mem_hdr;
/* The parameter data to be filled when sent inband */
u32 param_data[0];
} __packed; } __packed;
struct afe_svc_param_data { struct afe_svc_cmd_set_param_v2 {
uint32_t module_id; /* APR Header */
uint32_t param_id; struct apr_hdr apr_hdr;
uint16_t param_size;
uint16_t reserved; /* The memory mapping header to be used when sending outband */
struct mem_mapping_hdr mem_hdr;
/* The total size of the payload, including param_hdr_v3 */
u32 payload_size;
/* The parameter data to be filled when sent inband */
u32 param_data[0];
} __packed; } __packed;
struct afe_param_hw_mad_ctrl { struct afe_param_hw_mad_ctrl {
@ -10144,87 +10152,9 @@ struct afe_param_hw_mad_ctrl {
uint16_t mad_enable; uint16_t mad_enable;
} __packed; } __packed;
struct afe_cmd_hw_mad_ctrl {
struct apr_hdr hdr;
struct afe_port_cmd_set_param_v2 param;
struct afe_port_param_data_v2 pdata;
struct afe_param_hw_mad_ctrl payload;
} __packed;
struct afe_cmd_hw_mad_slimbus_slave_port_cfg {
struct apr_hdr hdr;
struct afe_port_cmd_set_param_v2 param;
struct afe_port_param_data_v2 pdata;
struct afe_param_slimbus_slave_port_cfg sb_port_cfg;
} __packed;
struct afe_cmd_sw_mad_enable {
struct apr_hdr hdr;
struct afe_port_cmd_set_param_v2 param;
struct afe_port_param_data_v2 pdata;
} __packed;
struct afe_param_cdc_reg_cfg_payload {
struct afe_svc_param_data common;
struct afe_param_cdc_reg_cfg reg_cfg;
} __packed;
struct afe_lpass_clk_config_command_v2 {
struct apr_hdr hdr;
struct afe_svc_cmd_set_param param;
struct afe_svc_param_data pdata;
struct afe_clk_set clk_cfg;
} __packed;
/*
* reg_data's size can be up to AFE_MAX_CDC_REGISTERS_TO_CONFIG
*/
struct afe_svc_cmd_cdc_reg_cfg {
struct apr_hdr hdr;
struct afe_svc_cmd_set_param param;
struct afe_param_cdc_reg_cfg_payload reg_data[0];
} __packed;
struct afe_svc_cmd_init_cdc_reg_cfg {
struct apr_hdr hdr;
struct afe_svc_cmd_set_param param;
struct afe_port_param_data_v2 init;
} __packed;
struct afe_svc_cmd_sb_slave_cfg {
struct apr_hdr hdr;
struct afe_svc_cmd_set_param param;
struct afe_port_param_data_v2 pdata;
struct afe_param_cdc_slimbus_slave_cfg sb_slave_cfg;
} __packed;
struct afe_svc_cmd_cdc_reg_page_cfg {
struct apr_hdr hdr;
struct afe_svc_cmd_set_param param;
struct afe_port_param_data_v2 pdata;
struct afe_param_cdc_reg_page_cfg cdc_reg_page_cfg;
} __packed;
struct afe_svc_cmd_cdc_aanc_version {
struct apr_hdr hdr;
struct afe_svc_cmd_set_param param;
struct afe_port_param_data_v2 pdata;
struct afe_param_id_cdc_aanc_version version;
} __packed;
struct afe_port_cmd_set_aanc_param {
struct apr_hdr hdr;
struct afe_port_cmd_set_param_v2 param;
struct afe_port_param_data_v2 pdata;
union {
struct afe_param_aanc_port_cfg aanc_port_cfg;
struct afe_mod_enable_param mod_enable;
} __packed data;
} __packed;
struct afe_port_cmd_set_aanc_acdb_table { struct afe_port_cmd_set_aanc_acdb_table {
struct apr_hdr hdr; struct apr_hdr hdr;
struct afe_port_cmd_set_param_v2 param; struct mem_mapping_hdr mem_hdr;
} __packed; } __packed;
/* Dolby DAP topology */ /* Dolby DAP topology */
@ -10247,13 +10177,6 @@ struct afe_port_cmd_set_aanc_acdb_table {
#define Q14_GAIN_ZERO_POINT_FIVE 0x2000 #define Q14_GAIN_ZERO_POINT_FIVE 0x2000
#define Q14_GAIN_UNITY 0x4000 #define Q14_GAIN_UNITY 0x4000
struct afe_svc_cmd_set_clip_bank_selection {
struct apr_hdr hdr;
struct afe_svc_cmd_set_param param;
struct afe_port_param_data_v2 pdata;
struct afe_param_id_clip_bank_sel bank_sel;
} __packed;
/* Ultrasound supported formats */ /* Ultrasound supported formats */
#define US_POINT_EPOS_FORMAT_V2 0x0001272D #define US_POINT_EPOS_FORMAT_V2 0x0001272D
#define US_RAW_FORMAT_V2 0x0001272C #define US_RAW_FORMAT_V2 0x0001272C
@ -10467,13 +10390,6 @@ union afe_port_group_config {
struct afe_param_id_group_device_tdm_cfg tdm_cfg; struct afe_param_id_group_device_tdm_cfg tdm_cfg;
} __packed; } __packed;
struct afe_port_group_create {
struct apr_hdr hdr;
struct afe_svc_cmd_set_param param;
struct afe_port_param_data_v2 pdata;
union afe_port_group_config data;
} __packed;
/* ID of the parameter used by #AFE_MODULE_AUDIO_DEV_INTERFACE to specify /* ID of the parameter used by #AFE_MODULE_AUDIO_DEV_INTERFACE to specify
* the timing statistics of the corresponding device interface. * the timing statistics of the corresponding device interface.
* Client can periodically query for the device time statistics to help adjust * Client can periodically query for the device time statistics to help adjust
@ -10563,16 +10479,9 @@ struct afe_param_id_dev_timing_stats {
u32 ref_timer_abs_ts_msw; u32 ref_timer_abs_ts_msw;
} __packed; } __packed;
struct afe_av_dev_drift_get_param {
struct apr_hdr hdr;
struct afe_port_cmd_get_param_v2 get_param;
struct afe_port_param_data_v2 pdata;
struct afe_param_id_dev_timing_stats timing_stats;
} __packed;
struct afe_av_dev_drift_get_param_resp { struct afe_av_dev_drift_get_param_resp {
uint32_t status; uint32_t status;
struct afe_port_param_data_v2 pdata; struct param_hdr_v3 pdata;
struct afe_param_id_dev_timing_stats timing_stats; struct afe_param_id_dev_timing_stats timing_stats;
} __packed; } __packed;

2936
sound/soc/msm/qdsp6v2/q6afe.c
View file

File diff suppressed because it is too large Load diff

70
sound/soc/msm/qdsp6v2/rtac.c
View file

@ -105,12 +105,12 @@ struct rtac_afe_user_data {
uint32_t port_id; uint32_t port_id;
union { union {
struct rtac_afe_set { struct rtac_afe_set {
struct afe_port_cmd_set_param_v2 cmd; struct afe_rtac_set_param_v2 cmd;
struct afe_port_param_data_v2 data; struct param_hdr_v1 data;
} rtac_afe_set; } rtac_afe_set;
struct rtac_afe_get { struct rtac_afe_get {
struct afe_port_cmd_get_param_v2 cmd; struct afe_rtac_get_param_v2 cmd;
struct afe_port_param_data_v2 data; struct param_hdr_v1 data;
} rtac_afe_get; } rtac_afe_get;
}; };
} __packed; } __packed;
@ -1173,6 +1173,7 @@ void rtac_set_afe_handle(void *handle)
mutex_unlock(&rtac_afe_apr_mutex); mutex_unlock(&rtac_afe_apr_mutex);
} }
/* Updated in RTAC IID Patch */
bool rtac_make_afe_callback(uint32_t *payload, uint32_t payload_size) bool rtac_make_afe_callback(uint32_t *payload, uint32_t payload_size)
{ {
pr_debug("%s:cmd_state = %d\n", __func__, pr_debug("%s:cmd_state = %d\n", __func__,
@ -1268,7 +1269,7 @@ static int send_rtac_afe_apr(void *buf, uint32_t opcode)
goto err; goto err;
} }
if (opcode == AFE_PORT_CMD_SET_PARAM_V2) { if (opcode == AFE_PORT_CMD_SET_PARAM_V2) {
struct afe_port_cmd_set_param_v2 *afe_set_apr_msg; struct afe_rtac_set_param_v2 *afe_set_apr_msg;
/* set data size to actual out of band payload size */ /* set data size to actual out of band payload size */
if (user_afe_buf.rtac_afe_set.cmd.payload_size > if (user_afe_buf.rtac_afe_set.cmd.payload_size >
@ -1281,11 +1282,12 @@ static int send_rtac_afe_apr(void *buf, uint32_t opcode)
} }
/* Copy buffer to out-of-band payload */ /* Copy buffer to out-of-band payload */
if (copy_from_user((void *) if (copy_from_user(
rtac_cal[AFE_RTAC_CAL].cal_data.kvaddr, (void *) rtac_cal[AFE_RTAC_CAL].cal_data.kvaddr,
buf+offsetof(struct rtac_afe_user_data, (void __user *) buf +
rtac_afe_set.data), offsetof(struct rtac_afe_user_data,
user_afe_buf.rtac_afe_set.cmd.payload_size)) { rtac_afe_set.data),
user_afe_buf.rtac_afe_set.cmd.payload_size)) {
pr_err("%s: Could not copy payload from user buffer\n", pr_err("%s: Could not copy payload from user buffer\n",
__func__); __func__);
result = -EINVAL; result = -EINVAL;
@ -1293,14 +1295,14 @@ static int send_rtac_afe_apr(void *buf, uint32_t opcode)
} }
/* Copy AFE APR Message */ /* Copy AFE APR Message */
afe_set_apr_msg = (struct afe_port_cmd_set_param_v2 *) afe_set_apr_msg = (struct afe_rtac_set_param_v2
((u8 *)rtac_afe_buffer + *) ((u8 *) rtac_afe_buffer +
sizeof(struct apr_hdr)); sizeof(struct apr_hdr));
if (copy_from_user((void *) if (copy_from_user((void *) afe_set_apr_msg,
afe_set_apr_msg, (void __user *) buf +
buf + offsetof(struct rtac_afe_user_data, offsetof(struct rtac_afe_user_data,
rtac_afe_set.cmd) , rtac_afe_set.cmd),
sizeof(struct afe_port_cmd_set_param_v2))) { sizeof(struct afe_rtac_set_param_v2))) {
pr_err("%s: Could not copy payload from user buffer\n", pr_err("%s: Could not copy payload from user buffer\n",
__func__); __func__);
result = -EINVAL; result = -EINVAL;
@ -1316,10 +1318,10 @@ static int send_rtac_afe_apr(void *buf, uint32_t opcode)
rtac_cal[AFE_RTAC_CAL].map_data.map_handle; rtac_cal[AFE_RTAC_CAL].map_data.map_handle;
apr_msg_size = sizeof(struct apr_hdr) + apr_msg_size = sizeof(struct apr_hdr) +
sizeof(struct afe_port_cmd_set_param_v2); sizeof(struct afe_rtac_set_param_v2);
} else { } else {
struct afe_port_cmd_get_param_v2 *afe_get_apr_msg; struct afe_rtac_get_param_v2 *afe_get_apr_msg;
if (user_afe_buf.cmd_size > MAX_PAYLOAD_SIZE) { if (user_afe_buf.cmd_size > MAX_PAYLOAD_SIZE) {
pr_err("%s: Invalid payload size = %d\n", pr_err("%s: Invalid payload size = %d\n",
@ -1329,13 +1331,14 @@ static int send_rtac_afe_apr(void *buf, uint32_t opcode)
} }
/* Copy buffer to in-band payload */ /* Copy buffer to in-band payload */
afe_get_apr_msg = (struct afe_port_cmd_get_param_v2 *) afe_get_apr_msg = (struct afe_rtac_get_param_v2
((u8 *) rtac_afe_buffer + *) ((u8 *) rtac_afe_buffer +
sizeof(struct apr_hdr)); sizeof(struct apr_hdr));
if (copy_from_user((void *)afe_get_apr_msg, if (copy_from_user((void *) afe_get_apr_msg,
buf+offsetof(struct rtac_afe_user_data, (void __user *) buf +
rtac_afe_get.cmd), offsetof(struct rtac_afe_user_data,
sizeof(struct afe_port_cmd_get_param_v2))) { rtac_afe_get.cmd),
sizeof(struct afe_rtac_get_param_v2))) {
pr_err("%s: Could not copy payload from user buffer\n", pr_err("%s: Could not copy payload from user buffer\n",
__func__); __func__);
result = -EINVAL; result = -EINVAL;
@ -1351,7 +1354,7 @@ static int send_rtac_afe_apr(void *buf, uint32_t opcode)
rtac_cal[AFE_RTAC_CAL].map_data.map_handle; rtac_cal[AFE_RTAC_CAL].map_data.map_handle;
afe_get_apr_msg->payload_size -= sizeof(struct apr_hdr); afe_get_apr_msg->payload_size -= sizeof(struct apr_hdr);
apr_msg_size = sizeof(struct apr_hdr) + apr_msg_size = sizeof(struct apr_hdr) +
sizeof(struct afe_port_cmd_get_param_v2); sizeof(struct afe_rtac_get_param_v2);
} }
fill_afe_apr_hdr((struct apr_hdr *) rtac_afe_buffer, fill_afe_apr_hdr((struct apr_hdr *) rtac_afe_buffer,
@ -1391,12 +1394,13 @@ static int send_rtac_afe_apr(void *buf, uint32_t opcode)
} }
if (opcode == AFE_PORT_CMD_GET_PARAM_V2) { if (opcode == AFE_PORT_CMD_GET_PARAM_V2) {
struct afe_port_param_data_v2 *get_resp; struct param_hdr_v1 *get_resp;
get_resp = (struct afe_port_param_data_v2 *)
rtac_cal[AFE_RTAC_CAL].cal_data.kvaddr;
bytes_returned = get_resp->param_size + get_resp = (struct param_hdr_v1 *) rtac_cal[AFE_RTAC_CAL]
sizeof(struct afe_port_param_data_v2); .cal_data.kvaddr;
bytes_returned =
get_resp->param_size + sizeof(struct param_hdr_v1);
if (bytes_returned > rtac_cal[AFE_RTAC_CAL]. if (bytes_returned > rtac_cal[AFE_RTAC_CAL].
map_data.map_size) { map_data.map_size) {