Merge "rtac: Add mutex lock to ensure proper fops access" (ccf63476) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/msm/qdsp6v2/rtac.c

+13 −30

Original line number	Original line	Diff line number	Diff line
	@@ -54,6 +54,7 @@ struct rtac_cal_block_data rtac_cal[MAX_RTAC_BLOCKS] = {
	struct rtac_common_data {		struct rtac_common_data {
	atomic_t usage_count;		atomic_t usage_count;
	atomic_t apr_err_code;		atomic_t apr_err_code;
			struct mutex rtac_fops_mutex;
	};		};

	static struct rtac_common_data rtac_common;		static struct rtac_common_data rtac_common;
	@@ -127,11 +128,6 @@ 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;

	static struct mutex rtac_asm_cal_mutex;
	static struct mutex rtac_adm_cal_mutex;
	static struct mutex rtac_afe_cal_mutex;
	static struct mutex rtac_voice_cal_mutex;

	int rtac_clear_mapping(uint32_t cal_type)		int rtac_clear_mapping(uint32_t cal_type)
	{		{
	int result = 0;		int result = 0;
	@@ -325,7 +321,9 @@ static int rtac_open(struct inode inode, struct file f)
	int result = 0;		int result = 0;
	pr_debug("%s\n", __func__);		pr_debug("%s\n", __func__);

			mutex_lock(&rtac_common.rtac_fops_mutex);
	atomic_inc(&rtac_common.usage_count);		atomic_inc(&rtac_common.usage_count);
			mutex_unlock(&rtac_common.rtac_fops_mutex);
	return result;		return result;
	}		}

	@@ -336,12 +334,15 @@ static int rtac_release(struct inode inode, struct file f)
	int i;		int i;
	pr_debug("%s\n", __func__);		pr_debug("%s\n", __func__);

			mutex_lock(&rtac_common.rtac_fops_mutex);
	atomic_dec(&rtac_common.usage_count);		atomic_dec(&rtac_common.usage_count);
	pr_debug("%s: ref count %d!\n", __func__,		pr_debug("%s: ref count %d!\n", __func__,
	atomic_read(&rtac_common.usage_count));		atomic_read(&rtac_common.usage_count));

	if (atomic_read(&rtac_common.usage_count) > 0)		if (atomic_read(&rtac_common.usage_count) > 0) {
			mutex_unlock(&rtac_common.rtac_fops_mutex);
	goto done;		goto done;
			}

	for (i = 0; i < MAX_RTAC_BLOCKS; i++) {		for (i = 0; i < MAX_RTAC_BLOCKS; i++) {
	result2 = rtac_unmap_cal_buffer(i);		result2 = rtac_unmap_cal_buffer(i);
	@@ -358,6 +359,7 @@ static int rtac_release(struct inode inode, struct file f)
	result = result2;		result = result2;
	}		}
	}		}
			mutex_unlock(&rtac_common.rtac_fops_mutex);
	done:		done:
	return result;		return result;
	}		}
	@@ -1698,62 +1700,42 @@ 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);
	result = send_adm_apr((void *)arg, ADM_CMD_GET_PP_PARAMS_V5);		result = send_adm_apr((void *)arg, ADM_CMD_GET_PP_PARAMS_V5);
	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);
	result = send_adm_apr((void *)arg, ADM_CMD_SET_PP_PARAMS_V5);		result = send_adm_apr((void *)arg, ADM_CMD_SET_PP_PARAMS_V5);
	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);
	result = send_rtac_asm_apr((void *)arg,		result = send_rtac_asm_apr((void *)arg,
	ASM_STREAM_CMD_GET_PP_PARAMS_V2);		ASM_STREAM_CMD_GET_PP_PARAMS_V2);
	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);
	result = send_rtac_asm_apr((void *)arg,		result = send_rtac_asm_apr((void *)arg,
	ASM_STREAM_CMD_SET_PP_PARAMS_V2);		ASM_STREAM_CMD_SET_PP_PARAMS_V2);
	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);
	result = send_voice_apr(RTAC_CVS, (void *)arg,		result = send_voice_apr(RTAC_CVS, (void *)arg,
	VOICE_CMD_GET_PARAM);		VOICE_CMD_GET_PARAM);
	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);
	result = send_voice_apr(RTAC_CVS, (void *)arg,		result = send_voice_apr(RTAC_CVS, (void *)arg,
	VOICE_CMD_SET_PARAM);		VOICE_CMD_SET_PARAM);
	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);
	result = send_voice_apr(RTAC_CVP, (void *)arg,		result = send_voice_apr(RTAC_CVP, (void *)arg,
	VOICE_CMD_GET_PARAM);		VOICE_CMD_GET_PARAM);
	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);
	result = send_voice_apr(RTAC_CVP, (void *)arg,		result = send_voice_apr(RTAC_CVP, (void *)arg,
	VOICE_CMD_SET_PARAM);		VOICE_CMD_SET_PARAM);
	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);
	result = send_rtac_afe_apr((void *)arg,		result = send_rtac_afe_apr((void *)arg,
	AFE_PORT_CMD_GET_PARAM_V2);		AFE_PORT_CMD_GET_PARAM_V2);
	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);
	result = send_rtac_afe_apr((void *)arg,		result = send_rtac_afe_apr((void *)arg,
	AFE_PORT_CMD_SET_PARAM_V2);		AFE_PORT_CMD_SET_PARAM_V2);
	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",
	@@ -1769,6 +1751,7 @@ static long rtac_ioctl(struct file *f,
	{		{
	int result = 0;		int result = 0;

			mutex_lock(&rtac_common.rtac_fops_mutex);
	if (!arg) {		if (!arg) {
	pr_err("%s: No data sent to driver!\n", __func__);		pr_err("%s: No data sent to driver!\n", __func__);
	result = -EFAULT;		result = -EFAULT;
	@@ -1776,6 +1759,7 @@ static long rtac_ioctl(struct file *f,
	result = rtac_ioctl_shared(f, cmd, (void __user *)arg);		result = rtac_ioctl_shared(f, cmd, (void __user *)arg);
	}		}

			mutex_unlock(&rtac_common.rtac_fops_mutex);
	return result;		return result;
	}		}

	@@ -1798,6 +1782,7 @@ static long rtac_compat_ioctl(struct file *f,
	{		{
	int result = 0;		int result = 0;

			mutex_lock(&rtac_common.rtac_fops_mutex);
	if (!arg) {		if (!arg) {
	pr_err("%s: No data sent to driver!\n", __func__);		pr_err("%s: No data sent to driver!\n", __func__);
	result = -EINVAL;		result = -EINVAL;
	@@ -1850,6 +1835,7 @@ process:
	break;		break;
	}		}
	done:		done:
			mutex_unlock(&rtac_common.rtac_fops_mutex);
	return result;		return result;
	}		}
	#else		#else
	@@ -1877,6 +1863,7 @@ static int __init rtac_init(void)
	/* Driver */		/* Driver */
	atomic_set(&rtac_common.usage_count, 0);		atomic_set(&rtac_common.usage_count, 0);
	atomic_set(&rtac_common.apr_err_code, 0);		atomic_set(&rtac_common.apr_err_code, 0);
			mutex_init(&rtac_common.rtac_fops_mutex);

	/* ADM */		/* ADM */
	memset(&rtac_adm_data, 0, sizeof(rtac_adm_data));		memset(&rtac_adm_data, 0, sizeof(rtac_adm_data));
	@@ -1885,7 +1872,6 @@ static 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);
	@@ -1902,7 +1888,6 @@ static 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);
	@@ -1918,7 +1903,6 @@ static 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);
	@@ -1939,7 +1923,6 @@ static 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);