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

Merge "dsp: afe: call get params with afe cmd lock held"

Browse Source
This commit is contained in:
qctecmdr
2019-10-16 23:46:59 -07:00
committed by Gerrit - the friendly Code Review server
parent bda988eed1 daf7d7af99
commit 15e89245c3
1 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
dsp/q6afe.c
View File

@@ -7912,6 +7912,7 @@ static int afe_get_sp_th_vi_v_vali_data(
if (this_afe.vi_tx_port != -1) if (this_afe.vi_tx_port != -1)
port = this_afe.vi_tx_port; port = this_afe.vi_tx_port;
mutex_lock(&this_afe.afe_cmd_lock);
memset(&param_hdr, 0, sizeof(param_hdr)); memset(&param_hdr, 0, sizeof(param_hdr));
param_hdr.module_id = AFE_MODULE_SPEAKER_PROTECTION_V2_TH_VI; param_hdr.module_id = AFE_MODULE_SPEAKER_PROTECTION_V2_TH_VI;
@@ -7922,7 +7923,7 @@ static int afe_get_sp_th_vi_v_vali_data(
ret = q6afe_get_params(port, NULL, &param_hdr); ret = q6afe_get_params(port, NULL, &param_hdr);
if (ret) { if (ret) {
pr_err("%s: Failed to get TH VI V-Vali data\n", __func__); pr_err("%s: Failed to get TH VI V-Vali data\n", __func__);
goto done; goto get_params_fail;
} }
th_vi_v_vali->pdata = param_hdr; th_vi_v_vali->pdata = param_hdr;
@@ -7934,6 +7935,8 @@ static int afe_get_sp_th_vi_v_vali_data(
th_vi_v_vali->param.status[SP_V2_SPKR_1], th_vi_v_vali->param.status[SP_V2_SPKR_1],
th_vi_v_vali->param.status[SP_V2_SPKR_2]); th_vi_v_vali->param.status[SP_V2_SPKR_2]);
ret = 0; ret = 0;
get_params_fail:
mutex_unlock(&this_afe.afe_cmd_lock);
done: done:
return ret; return ret;
} }
@@ -7951,6 +7954,7 @@ int afe_get_sp_th_vi_ftm_data(struct afe_sp_th_vi_get_param *th_vi)
if (this_afe.vi_tx_port != -1) if (this_afe.vi_tx_port != -1)
port = this_afe.vi_tx_port; port = this_afe.vi_tx_port;
mutex_lock(&this_afe.afe_cmd_lock);
memset(&param_hdr, 0, sizeof(param_hdr)); memset(&param_hdr, 0, sizeof(param_hdr));
param_hdr.module_id = AFE_MODULE_SPEAKER_PROTECTION_V2_TH_VI; param_hdr.module_id = AFE_MODULE_SPEAKER_PROTECTION_V2_TH_VI;
@@ -7961,7 +7965,7 @@ int afe_get_sp_th_vi_ftm_data(struct afe_sp_th_vi_get_param *th_vi)
ret = q6afe_get_params(port, NULL, &param_hdr); ret = q6afe_get_params(port, NULL, &param_hdr);
if (ret) { if (ret) {
pr_err("%s: Failed to get TH VI FTM data\n", __func__); pr_err("%s: Failed to get TH VI FTM data\n", __func__);
goto done; goto get_params_fail;
} }
th_vi->pdata = param_hdr; th_vi->pdata = param_hdr;
@@ -7975,6 +7979,8 @@ int afe_get_sp_th_vi_ftm_data(struct afe_sp_th_vi_get_param *th_vi)
th_vi->param.status[SP_V2_SPKR_1], th_vi->param.status[SP_V2_SPKR_1],
th_vi->param.status[SP_V2_SPKR_2]); th_vi->param.status[SP_V2_SPKR_2]);
ret = 0; ret = 0;
get_params_fail:
mutex_unlock(&this_afe.afe_cmd_lock);
done: done:
return ret; return ret;
} }
@@ -7992,6 +7998,7 @@ int afe_get_sp_ex_vi_ftm_data(struct afe_sp_ex_vi_get_param *ex_vi)
if (this_afe.vi_tx_port != -1) if (this_afe.vi_tx_port != -1)
port = this_afe.vi_tx_port; port = this_afe.vi_tx_port;
mutex_lock(&this_afe.afe_cmd_lock);
memset(&param_hdr, 0, sizeof(param_hdr)); memset(&param_hdr, 0, sizeof(param_hdr));
param_hdr.module_id = AFE_MODULE_SPEAKER_PROTECTION_V2_EX_VI; param_hdr.module_id = AFE_MODULE_SPEAKER_PROTECTION_V2_EX_VI;
@@ -8003,7 +8010,7 @@ int afe_get_sp_ex_vi_ftm_data(struct afe_sp_ex_vi_get_param *ex_vi)
if (ret < 0) { if (ret < 0) {
pr_err("%s: get param port 0x%x param id[0x%x]failed %d\n", pr_err("%s: get param port 0x%x param id[0x%x]failed %d\n",
__func__, port, param_hdr.param_id, ret); __func__, port, param_hdr.param_id, ret);
goto done; goto get_params_fail;
} }
ex_vi->pdata = param_hdr; ex_vi->pdata = param_hdr;
@@ -8019,6 +8026,8 @@ int afe_get_sp_ex_vi_ftm_data(struct afe_sp_ex_vi_get_param *ex_vi)
ex_vi->param.status[SP_V2_SPKR_1], ex_vi->param.status[SP_V2_SPKR_1],
ex_vi->param.status[SP_V2_SPKR_2]); ex_vi->param.status[SP_V2_SPKR_2]);
ret = 0; ret = 0;
get_params_fail:
mutex_unlock(&this_afe.afe_cmd_lock);
done: done:
return ret; return ret;
} }
@@ -8044,6 +8053,7 @@ int afe_get_sp_rx_tmax_xmax_logging_data(
goto done; goto done;
} }
mutex_lock(&this_afe.afe_cmd_lock);
memset(&param_hdr, 0, sizeof(param_hdr)); memset(&param_hdr, 0, sizeof(param_hdr));
param_hdr.module_id = AFE_MODULE_FB_SPKR_PROT_V2_RX; param_hdr.module_id = AFE_MODULE_FB_SPKR_PROT_V2_RX;
@@ -8055,7 +8065,7 @@ int afe_get_sp_rx_tmax_xmax_logging_data(
if (ret < 0) { if (ret < 0) {
pr_err("%s: get param port 0x%x param id[0x%x]failed %d\n", pr_err("%s: get param port 0x%x param id[0x%x]failed %d\n",
__func__, port_id, param_hdr.param_id, ret); __func__, port_id, param_hdr.param_id, ret);
goto done; goto get_params_fail;
} }
memcpy(xt_logging, &this_afe.xt_logging_resp.param, memcpy(xt_logging, &this_afe.xt_logging_resp.param,
@@ -8069,6 +8079,8 @@ int afe_get_sp_rx_tmax_xmax_logging_data(
xt_logging->max_temperature[SP_V2_SPKR_2], xt_logging->max_temperature[SP_V2_SPKR_2],
xt_logging->count_exceeded_temperature[SP_V2_SPKR_1], xt_logging->count_exceeded_temperature[SP_V2_SPKR_1],
xt_logging->count_exceeded_temperature[SP_V2_SPKR_2]); xt_logging->count_exceeded_temperature[SP_V2_SPKR_2]);
get_params_fail:
mutex_unlock(&this_afe.afe_cmd_lock);
done: done:
return ret; return ret;
} }
@@ -8094,6 +8106,7 @@ int afe_get_av_dev_drift(struct afe_param_id_dev_timing_stats *timing_stats,
goto exit; goto exit;
} }
mutex_lock(&this_afe.afe_cmd_lock);
memset(&param_hdr, 0, sizeof(param_hdr)); memset(&param_hdr, 0, sizeof(param_hdr));
param_hdr.module_id = AFE_MODULE_AUDIO_DEV_INTERFACE; param_hdr.module_id = AFE_MODULE_AUDIO_DEV_INTERFACE;
param_hdr.instance_id = INSTANCE_ID_0; param_hdr.instance_id = INSTANCE_ID_0;
@@ -8104,12 +8117,14 @@ int afe_get_av_dev_drift(struct afe_param_id_dev_timing_stats *timing_stats,
if (ret < 0) { if (ret < 0) {
pr_err("%s: get param port 0x%x param id[0x%x] failed %d\n", pr_err("%s: get param port 0x%x param id[0x%x] failed %d\n",
__func__, port, param_hdr.param_id, ret); __func__, port, param_hdr.param_id, ret);
goto exit; goto get_params_fail;
} }
memcpy(timing_stats, &this_afe.av_dev_drift_resp.timing_stats, memcpy(timing_stats, &this_afe.av_dev_drift_resp.timing_stats,
param_hdr.param_size); param_hdr.param_size);
ret = 0; ret = 0;
get_params_fail:
mutex_unlock(&this_afe.afe_cmd_lock);
exit: exit:
return ret; return ret;
} }
@@ -8135,6 +8150,7 @@ int afe_get_doa_tracking_mon(u16 port,
goto exit; goto exit;
} }
mutex_lock(&this_afe.afe_cmd_lock);
memset(&param_hdr, 0, sizeof(param_hdr)); memset(&param_hdr, 0, sizeof(param_hdr));
param_hdr.module_id = AUDPROC_MODULE_ID_FFNS; param_hdr.module_id = AUDPROC_MODULE_ID_FFNS;
param_hdr.instance_id = INSTANCE_ID_0; param_hdr.instance_id = INSTANCE_ID_0;
@@ -8145,7 +8161,7 @@ int afe_get_doa_tracking_mon(u16 port,
if (ret < 0) { if (ret < 0) {
pr_err("%s: get param port 0x%x param id[0x%x] failed %d\n", pr_err("%s: get param port 0x%x param id[0x%x] failed %d\n",
__func__, port, param_hdr.param_id, ret); __func__, port, param_hdr.param_id, ret);
goto exit; goto get_params_fail;
} }
memcpy(doa_tracking_data, &this_afe.doa_tracking_mon_resp.doa, memcpy(doa_tracking_data, &this_afe.doa_tracking_mon_resp.doa,
@@ -8157,6 +8173,8 @@ int afe_get_doa_tracking_mon(u16 port,
__func__, i, doa_tracking_data->interf_angle_L16[i]); __func__, i, doa_tracking_data->interf_angle_L16[i]);
} }
get_params_fail:
mutex_unlock(&this_afe.afe_cmd_lock);
exit: exit:
return ret; return ret;
} }
@@ -8175,6 +8193,7 @@ int afe_spk_prot_get_calib_data(struct afe_spkr_prot_get_vi_calib *calib_resp)
if (this_afe.vi_tx_port != -1) if (this_afe.vi_tx_port != -1)
port = this_afe.vi_tx_port; port = this_afe.vi_tx_port;
mutex_lock(&this_afe.afe_cmd_lock);
memset(&param_hdr, 0, sizeof(param_hdr)); memset(&param_hdr, 0, sizeof(param_hdr));
param_hdr.module_id = AFE_MODULE_FB_SPKR_PROT_VI_PROC_V2; param_hdr.module_id = AFE_MODULE_FB_SPKR_PROT_VI_PROC_V2;
param_hdr.instance_id = INSTANCE_ID_0; param_hdr.instance_id = INSTANCE_ID_0;
@@ -8185,7 +8204,7 @@ int afe_spk_prot_get_calib_data(struct afe_spkr_prot_get_vi_calib *calib_resp)
if (ret < 0) { if (ret < 0) {
pr_err("%s: get param port 0x%x param id[0x%x]failed %d\n", pr_err("%s: get param port 0x%x param id[0x%x]failed %d\n",
__func__, port, param_hdr.param_id, ret); __func__, port, param_hdr.param_id, ret);
goto fail_cmd; goto get_params_fail;
} }
memcpy(&calib_resp->res_cfg, &this_afe.calib_data.res_cfg, memcpy(&calib_resp->res_cfg, &this_afe.calib_data.res_cfg,
sizeof(this_afe.calib_data.res_cfg)); sizeof(this_afe.calib_data.res_cfg));
@@ -8194,6 +8213,8 @@ int afe_spk_prot_get_calib_data(struct afe_spkr_prot_get_vi_calib *calib_resp)
calib_resp->res_cfg.r0_cali_q24[SP_V2_SPKR_1], calib_resp->res_cfg.r0_cali_q24[SP_V2_SPKR_1],
calib_resp->res_cfg.r0_cali_q24[SP_V2_SPKR_2]); calib_resp->res_cfg.r0_cali_q24[SP_V2_SPKR_2]);
ret = 0; ret = 0;
get_params_fail:
mutex_unlock(&this_afe.afe_cmd_lock);
fail_cmd: fail_cmd:
return ret; return ret;
} }