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

dsp/rtac.c

+13 −29

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

		static struct rtac_common_data rtac_common;
		@@ -125,10 +126,6 @@ struct mutex rtac_asm_apr_mutex;
		struct mutex rtac_voice_mutex;
		struct mutex rtac_voice_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)
		{
		@@ -329,7 +326,9 @@ static int rtac_open(struct inode inode, struct file f)

		pr_debug("%s\n", __func__);

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

		@@ -341,12 +340,15 @@ static int rtac_release(struct inode inode, struct file f)

		pr_debug("%s\n", __func__);

		mutex_lock(&rtac_common.rtac_fops_mutex);
		atomic_dec(&rtac_common.usage_count);
		pr_debug("%s: ref count %d!\n", __func__,
		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;
		}

		for (i = 0; i < MAX_RTAC_BLOCKS; i++) {
		result2 = rtac_unmap_cal_buffer(i);
		@@ -363,6 +365,7 @@ static int rtac_release(struct inode inode, struct file f)
		result = result2;
		}
		}
		mutex_unlock(&rtac_common.rtac_fops_mutex);
		done:
		return result;
		}
		@@ -1727,62 +1730,42 @@ static long rtac_ioctl_shared(struct file *f,
		}

		case AUDIO_GET_RTAC_ADM_CAL:
		mutex_lock(&rtac_adm_cal_mutex);
		result = send_adm_apr((void *)arg, ADM_CMD_GET_PP_PARAMS_V5);
		mutex_unlock(&rtac_adm_cal_mutex);
		break;
		case AUDIO_SET_RTAC_ADM_CAL:
		mutex_lock(&rtac_adm_cal_mutex);
		result = send_adm_apr((void *)arg, ADM_CMD_SET_PP_PARAMS_V5);
		mutex_unlock(&rtac_adm_cal_mutex);
		break;
		case AUDIO_GET_RTAC_ASM_CAL:
		mutex_lock(&rtac_asm_cal_mutex);
		result = send_rtac_asm_apr((void *)arg,
		ASM_STREAM_CMD_GET_PP_PARAMS_V2);
		mutex_unlock(&rtac_asm_cal_mutex);
		break;
		case AUDIO_SET_RTAC_ASM_CAL:
		mutex_lock(&rtac_asm_cal_mutex);
		result = send_rtac_asm_apr((void *)arg,
		ASM_STREAM_CMD_SET_PP_PARAMS_V2);
		mutex_unlock(&rtac_asm_cal_mutex);
		break;
		case AUDIO_GET_RTAC_CVS_CAL:
		mutex_lock(&rtac_voice_cal_mutex);
		result = send_voice_apr(RTAC_CVS, (void *) arg,
		VSS_ICOMMON_CMD_GET_PARAM_V2);
		mutex_unlock(&rtac_voice_cal_mutex);
		break;
		case AUDIO_SET_RTAC_CVS_CAL:
		mutex_lock(&rtac_voice_cal_mutex);
		result = send_voice_apr(RTAC_CVS, (void *) arg,
		VSS_ICOMMON_CMD_SET_PARAM_V2);
		mutex_unlock(&rtac_voice_cal_mutex);
		break;
		case AUDIO_GET_RTAC_CVP_CAL:
		mutex_lock(&rtac_voice_cal_mutex);
		result = send_voice_apr(RTAC_CVP, (void *) arg,
		VSS_ICOMMON_CMD_GET_PARAM_V2);
		mutex_unlock(&rtac_voice_cal_mutex);
		break;
		case AUDIO_SET_RTAC_CVP_CAL:
		mutex_lock(&rtac_voice_cal_mutex);
		result = send_voice_apr(RTAC_CVP, (void *) arg,
		VSS_ICOMMON_CMD_SET_PARAM_V2);
		mutex_unlock(&rtac_voice_cal_mutex);
		break;
		case AUDIO_GET_RTAC_AFE_CAL:
		mutex_lock(&rtac_afe_cal_mutex);
		result = send_rtac_afe_apr((void *)arg,
		AFE_PORT_CMD_GET_PARAM_V2);
		mutex_unlock(&rtac_afe_cal_mutex);
		break;
		case AUDIO_SET_RTAC_AFE_CAL:
		mutex_lock(&rtac_afe_cal_mutex);
		result = send_rtac_afe_apr((void *)arg,
		AFE_PORT_CMD_SET_PARAM_V2);
		mutex_unlock(&rtac_afe_cal_mutex);
		break;
		default:
		pr_err("%s: Invalid IOCTL, command = %d!\n",
		@@ -1798,6 +1781,7 @@ static long rtac_ioctl(struct file *f,
		{
		int result = 0;

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

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

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

		mutex_lock(&rtac_common.rtac_fops_mutex);
		if (!arg) {
		pr_err("%s: No data sent to driver!\n", __func__);
		result = -EINVAL;
		@@ -1879,6 +1865,7 @@ static long rtac_compat_ioctl(struct file *f,
		break;
		}
		done:
		mutex_unlock(&rtac_common.rtac_fops_mutex);
		return result;
		}
		#else
		@@ -1906,6 +1893,7 @@ int __init rtac_init(void)
		/* Driver */
		atomic_set(&rtac_common.usage_count, 0);
		atomic_set(&rtac_common.apr_err_code, 0);
		mutex_init(&rtac_common.rtac_fops_mutex);

		/* ADM */
		memset(&rtac_adm_data, 0, sizeof(rtac_adm_data));
		@@ -1914,7 +1902,6 @@ int __init rtac_init(void)
		init_waitqueue_head(&rtac_adm_apr_data.cmd_wait);
		mutex_init(&rtac_adm_mutex);
		mutex_init(&rtac_adm_apr_mutex);
		mutex_init(&rtac_adm_cal_mutex);

		rtac_adm_buffer = kzalloc(
		rtac_cal[ADM_RTAC_CAL].map_data.map_size, GFP_KERNEL);
		@@ -1928,7 +1915,6 @@ int __init rtac_init(void)
		init_waitqueue_head(&rtac_asm_apr_data[i].cmd_wait);
		}
		mutex_init(&rtac_asm_apr_mutex);
		mutex_init(&rtac_asm_cal_mutex);

		rtac_asm_buffer = kzalloc(
		rtac_cal[ASM_RTAC_CAL].map_data.map_size, GFP_KERNEL);
		@@ -1942,7 +1928,6 @@ int __init rtac_init(void)
		atomic_set(&rtac_afe_apr_data.cmd_state, 0);
		init_waitqueue_head(&rtac_afe_apr_data.cmd_wait);
		mutex_init(&rtac_afe_apr_mutex);
		mutex_init(&rtac_afe_cal_mutex);

		rtac_afe_buffer = kzalloc(
		rtac_cal[AFE_RTAC_CAL].map_data.map_size, GFP_KERNEL);
		@@ -1961,7 +1946,6 @@ int __init rtac_init(void)
		}
		mutex_init(&rtac_voice_mutex);
		mutex_init(&rtac_voice_apr_mutex);
		mutex_init(&rtac_voice_cal_mutex);

		rtac_voice_buffer = kzalloc(
		rtac_cal[VOICE_RTAC_CAL].map_data.map_size, GFP_KERNEL);