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

Merge "rtac: Add mutex protection for rtac cal apis"

Browse Source
This commit is contained in:
Linux Build Service Account
2018-07-02 12:39:49 -07:00
committed by Gerrit - the friendly Code Review server
parent ec7e65b420 bc394037dd
commit 928c67e56e
1 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
dsp/rtac.c
View File

@@ -122,6 +122,10 @@ struct mutex rtac_asm_apr_mutex;
struct mutex rtac_voice_mutex; struct mutex rtac_voice_mutex;
struct mutex rtac_voice_apr_mutex; struct mutex rtac_voice_apr_mutex;
struct mutex rtac_afe_apr_mutex; struct mutex rtac_afe_apr_mutex;
struct mutex rtac_asm_cal_mutex;
struct mutex rtac_adm_cal_mutex;
struct mutex rtac_afe_cal_mutex;
struct mutex rtac_voice_cal_mutex;
int rtac_clear_mapping(uint32_t cal_type) int rtac_clear_mapping(uint32_t cal_type)
{ {
@@ -1803,64 +1807,84 @@ static long rtac_ioctl_shared(struct file *f,
} }
case AUDIO_GET_RTAC_ADM_CAL: case AUDIO_GET_RTAC_ADM_CAL:
mutex_lock(&rtac_adm_cal_mutex);
opcode = q6common_is_instance_id_supported() ? opcode = q6common_is_instance_id_supported() ?
ADM_CMD_GET_PP_PARAMS_V6 : ADM_CMD_GET_PP_PARAMS_V6 :
ADM_CMD_GET_PP_PARAMS_V5; ADM_CMD_GET_PP_PARAMS_V5;
result = send_adm_apr((void *) arg, opcode); result = send_adm_apr((void *) arg, opcode);
mutex_unlock(&rtac_adm_cal_mutex);
break; break;
case AUDIO_SET_RTAC_ADM_CAL: case AUDIO_SET_RTAC_ADM_CAL:
mutex_lock(&rtac_adm_cal_mutex);
opcode = q6common_is_instance_id_supported() ? opcode = q6common_is_instance_id_supported() ?
ADM_CMD_SET_PP_PARAMS_V6 : ADM_CMD_SET_PP_PARAMS_V6 :
ADM_CMD_SET_PP_PARAMS_V5; ADM_CMD_SET_PP_PARAMS_V5;
result = send_adm_apr((void *) arg, opcode); result = send_adm_apr((void *) arg, opcode);
mutex_unlock(&rtac_adm_cal_mutex);
break; break;
case AUDIO_GET_RTAC_ASM_CAL: case AUDIO_GET_RTAC_ASM_CAL:
mutex_lock(&rtac_asm_cal_mutex);
opcode = q6common_is_instance_id_supported() ? opcode = q6common_is_instance_id_supported() ?
ASM_STREAM_CMD_GET_PP_PARAMS_V3 : ASM_STREAM_CMD_GET_PP_PARAMS_V3 :
ASM_STREAM_CMD_GET_PP_PARAMS_V2; ASM_STREAM_CMD_GET_PP_PARAMS_V2;
result = send_rtac_asm_apr((void *) arg, opcode); result = send_rtac_asm_apr((void *) arg, opcode);
mutex_unlock(&rtac_asm_cal_mutex);
break; break;
case AUDIO_SET_RTAC_ASM_CAL: case AUDIO_SET_RTAC_ASM_CAL:
mutex_lock(&rtac_asm_cal_mutex);
opcode = q6common_is_instance_id_supported() ? opcode = q6common_is_instance_id_supported() ?
ASM_STREAM_CMD_SET_PP_PARAMS_V3 : ASM_STREAM_CMD_SET_PP_PARAMS_V3 :
ASM_STREAM_CMD_SET_PP_PARAMS_V2; ASM_STREAM_CMD_SET_PP_PARAMS_V2;
result = send_rtac_asm_apr((void *) arg, opcode); result = send_rtac_asm_apr((void *) arg, opcode);
mutex_unlock(&rtac_asm_cal_mutex);
break; break;
case AUDIO_GET_RTAC_CVS_CAL: case AUDIO_GET_RTAC_CVS_CAL:
mutex_lock(&rtac_voice_cal_mutex);
opcode = q6common_is_instance_id_supported() ? opcode = q6common_is_instance_id_supported() ?
VSS_ICOMMON_CMD_GET_PARAM_V3 : VSS_ICOMMON_CMD_GET_PARAM_V3 :
VSS_ICOMMON_CMD_GET_PARAM_V2; VSS_ICOMMON_CMD_GET_PARAM_V2;
result = send_voice_apr(RTAC_CVS, (void *) arg, opcode); result = send_voice_apr(RTAC_CVS, (void *) arg, opcode);
mutex_unlock(&rtac_voice_cal_mutex);
break; break;
case AUDIO_SET_RTAC_CVS_CAL: case AUDIO_SET_RTAC_CVS_CAL:
mutex_lock(&rtac_voice_cal_mutex);
opcode = q6common_is_instance_id_supported() ? opcode = q6common_is_instance_id_supported() ?
VSS_ICOMMON_CMD_SET_PARAM_V3 : VSS_ICOMMON_CMD_SET_PARAM_V3 :
VSS_ICOMMON_CMD_SET_PARAM_V2; VSS_ICOMMON_CMD_SET_PARAM_V2;
result = send_voice_apr(RTAC_CVS, (void *) arg, opcode); result = send_voice_apr(RTAC_CVS, (void *) arg, opcode);
mutex_unlock(&rtac_voice_cal_mutex);
break; break;
case AUDIO_GET_RTAC_CVP_CAL: case AUDIO_GET_RTAC_CVP_CAL:
mutex_lock(&rtac_voice_cal_mutex);
opcode = q6common_is_instance_id_supported() ? opcode = q6common_is_instance_id_supported() ?
VSS_ICOMMON_CMD_GET_PARAM_V3 : VSS_ICOMMON_CMD_GET_PARAM_V3 :
VSS_ICOMMON_CMD_GET_PARAM_V2; VSS_ICOMMON_CMD_GET_PARAM_V2;
result = send_voice_apr(RTAC_CVP, (void *) arg, opcode); result = send_voice_apr(RTAC_CVP, (void *) arg, opcode);
mutex_unlock(&rtac_voice_cal_mutex);
break; break;
case AUDIO_SET_RTAC_CVP_CAL: case AUDIO_SET_RTAC_CVP_CAL:
mutex_lock(&rtac_voice_cal_mutex);
opcode = q6common_is_instance_id_supported() ? opcode = q6common_is_instance_id_supported() ?
VSS_ICOMMON_CMD_SET_PARAM_V3 : VSS_ICOMMON_CMD_SET_PARAM_V3 :
VSS_ICOMMON_CMD_SET_PARAM_V2; VSS_ICOMMON_CMD_SET_PARAM_V2;
result = send_voice_apr(RTAC_CVP, (void *) arg, opcode); result = send_voice_apr(RTAC_CVP, (void *) arg, opcode);
mutex_unlock(&rtac_voice_cal_mutex);
break; break;
case AUDIO_GET_RTAC_AFE_CAL: case AUDIO_GET_RTAC_AFE_CAL:
mutex_lock(&rtac_afe_cal_mutex);
opcode = q6common_is_instance_id_supported() ? opcode = q6common_is_instance_id_supported() ?
AFE_PORT_CMD_GET_PARAM_V3 : AFE_PORT_CMD_GET_PARAM_V3 :
AFE_PORT_CMD_GET_PARAM_V2; AFE_PORT_CMD_GET_PARAM_V2;
result = send_rtac_afe_apr((void __user *) arg, opcode); result = send_rtac_afe_apr((void __user *) arg, opcode);
mutex_unlock(&rtac_afe_cal_mutex);
break; break;
case AUDIO_SET_RTAC_AFE_CAL: case AUDIO_SET_RTAC_AFE_CAL:
mutex_lock(&rtac_afe_cal_mutex);
opcode = q6common_is_instance_id_supported() ? opcode = q6common_is_instance_id_supported() ?
AFE_PORT_CMD_SET_PARAM_V3 : AFE_PORT_CMD_SET_PARAM_V3 :
AFE_PORT_CMD_SET_PARAM_V2; AFE_PORT_CMD_SET_PARAM_V2;
result = send_rtac_afe_apr((void __user *) arg, opcode); result = send_rtac_afe_apr((void __user *) arg, opcode);
mutex_unlock(&rtac_afe_cal_mutex);
break; break;
default: default:
pr_err("%s: Invalid IOCTL, command = %d!\n", pr_err("%s: Invalid IOCTL, command = %d!\n",
@@ -1992,6 +2016,7 @@ int __init rtac_init(void)
init_waitqueue_head(&rtac_adm_apr_data.cmd_wait); init_waitqueue_head(&rtac_adm_apr_data.cmd_wait);
mutex_init(&rtac_adm_mutex); mutex_init(&rtac_adm_mutex);
mutex_init(&rtac_adm_apr_mutex); mutex_init(&rtac_adm_apr_mutex);
mutex_init(&rtac_adm_cal_mutex);
rtac_adm_buffer = kzalloc( rtac_adm_buffer = kzalloc(
rtac_cal[ADM_RTAC_CAL].map_data.map_size, GFP_KERNEL); rtac_cal[ADM_RTAC_CAL].map_data.map_size, GFP_KERNEL);
@@ -2005,6 +2030,7 @@ int __init rtac_init(void)
init_waitqueue_head(&rtac_asm_apr_data[i].cmd_wait); init_waitqueue_head(&rtac_asm_apr_data[i].cmd_wait);
} }
mutex_init(&rtac_asm_apr_mutex); mutex_init(&rtac_asm_apr_mutex);
mutex_init(&rtac_asm_cal_mutex);
rtac_asm_buffer = kzalloc( rtac_asm_buffer = kzalloc(
rtac_cal[ASM_RTAC_CAL].map_data.map_size, GFP_KERNEL); rtac_cal[ASM_RTAC_CAL].map_data.map_size, GFP_KERNEL);
@@ -2018,6 +2044,7 @@ int __init rtac_init(void)
atomic_set(&rtac_afe_apr_data.cmd_state, 0); atomic_set(&rtac_afe_apr_data.cmd_state, 0);
init_waitqueue_head(&rtac_afe_apr_data.cmd_wait); init_waitqueue_head(&rtac_afe_apr_data.cmd_wait);
mutex_init(&rtac_afe_apr_mutex); mutex_init(&rtac_afe_apr_mutex);
mutex_init(&rtac_afe_cal_mutex);
rtac_afe_buffer = kzalloc( rtac_afe_buffer = kzalloc(
rtac_cal[AFE_RTAC_CAL].map_data.map_size, GFP_KERNEL); rtac_cal[AFE_RTAC_CAL].map_data.map_size, GFP_KERNEL);
@@ -2036,6 +2063,7 @@ int __init rtac_init(void)
} }
mutex_init(&rtac_voice_mutex); mutex_init(&rtac_voice_mutex);
mutex_init(&rtac_voice_apr_mutex); mutex_init(&rtac_voice_apr_mutex);
mutex_init(&rtac_voice_cal_mutex);
rtac_voice_buffer = kzalloc( rtac_voice_buffer = kzalloc(
rtac_cal[VOICE_RTAC_CAL].map_data.map_size, GFP_KERNEL); rtac_cal[VOICE_RTAC_CAL].map_data.map_size, GFP_KERNEL);