samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "dsp: Fix payload mismatch issue in AFE clock setting"

Browse Source
This commit is contained in:
qctecmdr
2019-04-30 10:57:39 -07:00
committed by Gerrit - the friendly Code Review server
parent c38cf58d38 23513e0973
commit 1ae80f7aa4
3 changed files with 89 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
dsp/q6afe.c
View File

@@ -1466,7 +1466,8 @@ done:
}
static int q6afe_svc_set_params(int index, struct mem_mapping_hdr *mem_hdr,
u8 *packed_param_data, u32 packed_data_size)
u8 *packed_param_data, u32 packed_data_size,
bool is_iid_supported)
{
int ret;
@@ -1476,7 +1477,7 @@ static int q6afe_svc_set_params(int index, struct mem_mapping_hdr *mem_hdr,
return ret;
}
if (q6common_is_instance_id_supported())
if (is_iid_supported)
return q6afe_svc_set_params_v2(index, mem_hdr,
packed_param_data,
packed_data_size);
@@ -1494,13 +1495,15 @@ static int q6afe_svc_pack_and_set_param_in_band(int index,
u32 packed_data_size =
sizeof(struct param_hdr_v3) + param_hdr.param_size;
int ret = 0;
bool is_iid_supported = q6common_is_instance_id_supported();
packed_param_data = kzalloc(packed_data_size, GFP_KERNEL);
if (!packed_param_data)
return -ENOMEM;
ret = q6common_pack_pp_params(packed_param_data, &param_hdr, param_data,
&packed_data_size);
ret = q6common_pack_pp_params_v2(packed_param_data, &param_hdr,
param_data, &packed_data_size,
is_iid_supported);
if (ret) {
pr_err("%s: Failed to pack parameter header and data, error %d\n",
__func__, ret);
@@ -1508,7 +1511,7 @@ static int q6afe_svc_pack_and_set_param_in_band(int index,
}
ret = q6afe_svc_set_params(index, NULL, packed_param_data,
packed_data_size);
packed_data_size, is_iid_supported);
done:
kfree(packed_param_data);
@@ -2595,6 +2598,7 @@ static int afe_send_codec_reg_config(
struct param_hdr_v3 param_hdr;
int idx = 0;
int ret = -EINVAL;
bool is_iid_supported = q6common_is_instance_id_supported();
memset(&param_hdr, 0, sizeof(param_hdr));
max_single_param = sizeof(struct param_hdr_v3) +
@@ -2617,10 +2621,10 @@ static int afe_send_codec_reg_config(
while (packed_data_size + max_single_param < max_data_size &&
idx < cdc_reg_cfg->num_registers) {
ret = q6common_pack_pp_params(
ret = q6common_pack_pp_params_v2(
packed_param_data + packed_data_size,
&param_hdr, (u8 *) &cdc_reg_cfg->reg_data[idx],
&single_param_size);
&single_param_size, is_iid_supported);
if (ret) {
pr_err("%s: Failed to pack parameters with error %d\n",
__func__, ret);
@@ -2631,7 +2635,8 @@ static int afe_send_codec_reg_config(
}
ret = q6afe_svc_set_params(IDX_GLOBAL_CFG, NULL,
packed_param_data, packed_data_size);
packed_param_data, packed_data_size,
is_iid_supported);
if (ret) {
pr_err("%s: AFE_PARAM_ID_CDC_REG_CFG failed %d\n",
__func__, ret);