Merge "asoc: msm-pcm: Add mutex lock to protect prvt data" into audio-drivers.lnx.2.0.c7 (762f5de5) · Commits · e / devices / android_kernel_fairphone_FP3

asoc/msm-pcm-loopback-v2.c

+12 −3

Original line number	Diff line number	Diff line
		/* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2013-2017, 2019 The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -136,7 +136,7 @@ static int msm_loopback_session_mute_put(struct snd_kcontrol *kcontrol,
		ret = -EINVAL;
		goto done;
		}

		mutex_lock(&loopback_session_lock);
		pr_debug("%s: mute=%d\n", __func__, mute);
		hfp_tx_mute = mute;
		for (n = 0; n < LOOPBACK_SESSION_MAX; n++) {
		@@ -149,6 +149,7 @@ static int msm_loopback_session_mute_put(struct snd_kcontrol *kcontrol,
		pr_err("%s: Send mute command failed rc=%d\n",
		__func__, ret);
		}
		mutex_unlock(&loopback_session_lock);
		done:
		return ret;
		}
		@@ -351,6 +352,8 @@ static void stop_pcm(struct msm_pcm_loopback *pcm)

		if (pcm->audio_client == NULL)
		return;

		mutex_lock(&loopback_session_lock);
		q6asm_cmd(pcm->audio_client, CMD_CLOSE);

		if (pcm->playback_substream != NULL) {
		@@ -365,6 +368,7 @@ static void stop_pcm(struct msm_pcm_loopback *pcm)
		}
		q6asm_audio_client_free(pcm->audio_client);
		pcm->audio_client = NULL;
		mutex_unlock(&loopback_session_lock);
		}

		static int msm_pcm_close(struct snd_pcm_substream *substream)
		@@ -495,12 +499,15 @@ static int msm_pcm_volume_ctl_put(struct snd_kcontrol *kcontrol,
		rc = -ENODEV;
		goto exit;
		}
		mutex_lock(&loopback_session_lock);
		prtd = substream->runtime->private_data;
		if (!prtd) {
		rc = -ENODEV;
		mutex_unlock(&loopback_session_lock);
		goto exit;
		}
		rc = pcm_loopback_set_volume(prtd, volume);
		mutex_unlock(&loopback_session_lock);

		exit:
		return rc;
		@@ -521,13 +528,15 @@ static int msm_pcm_volume_ctl_get(struct snd_kcontrol *kcontrol,
		rc = -ENODEV;
		goto exit;
		}
		mutex_lock(&loopback_session_lock);
		prtd = substream->runtime->private_data;
		if (!prtd) {
		rc = -ENODEV;
		mutex_unlock(&loopback_session_lock);
		goto exit;
		}
		ucontrol->value.integer.value[0] = prtd->volume;

		mutex_unlock(&loopback_session_lock);
		exit:
		return rc;
		}

asoc/msm-pcm-q6-noirq.c

+51 −5

Original line number	Diff line number	Diff line
		/* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -15,6 +15,7 @@
		#include <linux/module.h>
		#include <linux/moduleparam.h>
		#include <linux/time.h>
		#include <linux/mutex.h>
		#include <linux/wait.h>
		#include <linux/platform_device.h>
		#include <linux/slab.h>
		@@ -577,6 +578,7 @@ static int msm_pcm_prepare(struct snd_pcm_substream *substream)

		static int msm_pcm_close(struct snd_pcm_substream *substream)
		{
		struct msm_plat_data *pdata = NULL;
		struct snd_pcm_runtime *runtime = substream->runtime;
		struct snd_soc_pcm_runtime *soc_prtd = substream->private_data;
		struct msm_audio *prtd = runtime->private_data;
		@@ -585,6 +587,20 @@ static int msm_pcm_close(struct snd_pcm_substream *substream)
		int dir = 0;
		int ret = 0;

		if (!soc_prtd) {
		pr_debug("%s private_data not found\n",
		__func__);
		return 0;
		}

		pdata = (struct msm_plat_data *)
		dev_get_drvdata(soc_prtd->platform->dev);
		if (!pdata) {
		pr_err("%s: pdata not found\n", __func__);
		return -ENODEV;
		}

		mutex_lock(&pdata->lock);
		if (ac) {
		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
		dir = IN;
		@@ -619,6 +635,7 @@ static int msm_pcm_close(struct snd_pcm_substream *substream)
		SNDRV_PCM_STREAM_CAPTURE);
		kfree(prtd);
		runtime->private_data = NULL;
		mutex_unlock(&pdata->lock);

		return 0;
		}
		@@ -643,8 +660,10 @@ static int msm_pcm_volume_ctl_get(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol)
		{
		struct snd_pcm_volume *vol = snd_kcontrol_chip(kcontrol);
		struct msm_plat_data *pdata = NULL;
		struct snd_pcm_substream *substream =
		vol->pcm->streams[vol->stream].substream;
		struct snd_soc_pcm_runtime *soc_prtd = NULL;
		struct msm_audio *prtd;

		pr_debug("%s\n", __func__);
		@@ -652,13 +671,24 @@ static int msm_pcm_volume_ctl_get(struct snd_kcontrol *kcontrol,
		pr_err("%s substream not found\n", __func__);
		return -ENODEV;
		}
		if (!substream->runtime) {
		pr_err("%s substream runtime not found\n", __func__);
		soc_prtd = substream->private_data;
		if (!substream->runtime \|\| !soc_prtd) {
		pr_debug("%s substream runtime or private_data not found\n",
		__func__);
		return 0;
		}

		pdata = (struct msm_plat_data *)
		dev_get_drvdata(soc_prtd->platform->dev);
		if (!pdata) {
		pr_err("%s: pdata not found\n", __func__);
		return -ENODEV;
		}
		mutex_lock(&pdata->lock);
		prtd = substream->runtime->private_data;
		if (prtd)
		ucontrol->value.integer.value[0] = prtd->volume;
		mutex_unlock(&pdata->lock);
		return 0;
		}

		@@ -667,8 +697,10 @@ static int msm_pcm_volume_ctl_put(struct snd_kcontrol *kcontrol,
		{
		int rc = 0;
		struct snd_pcm_volume *vol = snd_kcontrol_chip(kcontrol);
		struct msm_plat_data *pdata = NULL;
		struct snd_pcm_substream *substream =
		vol->pcm->streams[vol->stream].substream;
		struct snd_soc_pcm_runtime *soc_prtd = NULL;
		struct msm_audio *prtd;
		int volume = ucontrol->value.integer.value[0];

		@@ -677,15 +709,26 @@ static int msm_pcm_volume_ctl_put(struct snd_kcontrol *kcontrol,
		pr_err("%s substream not found\n", __func__);
		return -ENODEV;
		}
		if (!substream->runtime) {
		pr_err("%s substream runtime not found\n", __func__);
		soc_prtd = substream->private_data;
		if (!substream->runtime \|\| !soc_prtd) {
		pr_err("%s substream runtime or private_data not found\n",
		__func__);
		return 0;
		}

		pdata = (struct msm_plat_data *)
		dev_get_drvdata(soc_prtd->platform->dev);
		if (!pdata) {
		pr_err("%s: pdata not found\n", __func__);
		return -ENODEV;
		}
		mutex_lock(&pdata->lock);
		prtd = substream->runtime->private_data;
		if (prtd) {
		rc = msm_pcm_set_volume(prtd, volume);
		prtd->volume = volume;
		}
		mutex_unlock(&pdata->lock);
		return rc;
		}

		@@ -1233,6 +1276,8 @@ static int msm_pcm_probe(struct platform_device *pdev)

		pdata->perf_mode = perf_mode;

		mutex_init(&pdata->lock);

		dev_set_drvdata(&pdev->dev, pdata);

		dev_dbg(&pdev->dev, "%s: dev name %s\n",
		@@ -1253,6 +1298,7 @@ static int msm_pcm_remove(struct platform_device *pdev)

		dev_dbg(&pdev->dev, "Pull mode remove\n");
		pdata = dev_get_drvdata(&pdev->dev);
		mutex_destroy(&pdata->lock);
		devm_kfree(&pdev->dev, pdata);
		snd_soc_unregister_platform(&pdev->dev);
		return 0;

asoc/msm-pcm-q6-v2.c

+22 −5

Original line number	Diff line number	Diff line
		@@ -1135,10 +1135,10 @@ static int msm_pcm_adsp_stream_cmd_put(struct snd_kcontrol *kcontrol,

		if (!pdata) {
		pr_err("%s pdata is NULL\n", __func__);
		ret = -ENODEV;
		goto done;
		return -ENODEV;
		}

		mutex_lock(&pdata->lock);
		substream = pdata->pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream;
		if (!substream) {
		pr_err("%s substream not found\n", __func__);
		@@ -1165,7 +1165,6 @@ static int msm_pcm_adsp_stream_cmd_put(struct snd_kcontrol *kcontrol,
		goto done;
		}

		mutex_lock(&pdata->lock);
		event_data = (struct msm_adsp_event_data *)ucontrol->value.bytes.data;
		if ((event_data->event_type < ADSP_STREAM_PP_EVENT) \|\|
		(event_data->event_type >= ADSP_STREAM_EVENT_MAX)) {
		@@ -1335,8 +1334,10 @@ static int msm_pcm_volume_ctl_get(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol)
		{
		struct snd_pcm_volume *vol = snd_kcontrol_chip(kcontrol);
		struct msm_plat_data *pdata = NULL;
		struct snd_pcm_substream *substream =
		vol->pcm->streams[vol->stream].substream;
		struct snd_soc_pcm_runtime *soc_prtd = NULL;
		struct msm_audio *prtd;

		pr_debug("%s\n", __func__);
		@@ -1344,13 +1345,25 @@ static int msm_pcm_volume_ctl_get(struct snd_kcontrol *kcontrol,
		pr_err("%s substream not found\n", __func__);
		return -ENODEV;
		}
		if (!substream->runtime) {
		pr_err("%s substream runtime not found\n", __func__);
		soc_prtd = substream->private_data;
		if (!substream->runtime \|\| !soc_prtd) {
		pr_debug("%s substream runtime or private_data not found\n",
		__func__);
		return 0;
		}

		pdata = (struct msm_plat_data *)
		dev_get_drvdata(soc_prtd->platform->dev);
		if (!pdata) {
		pr_err("%s: pdata not found\n", __func__);
		return -ENODEV;
		}

		mutex_lock(&pdata->lock);
		prtd = substream->runtime->private_data;
		if (prtd)
		ucontrol->value.integer.value[0] = prtd->volume;
		mutex_unlock(&pdata->lock);
		return 0;
		}

		@@ -1450,9 +1463,11 @@ static int msm_pcm_compress_ctl_get(struct snd_kcontrol *kcontrol,
		pr_err("%s substream runtime not found\n", __func__);
		return 0;
		}
		mutex_lock(&pdata->lock);
		prtd = substream->runtime->private_data;
		if (prtd)
		ucontrol->value.integer.value[0] = prtd->compress_enable;
		mutex_unlock(&pdata->lock);
		return 0;
		}

		@@ -1481,12 +1496,14 @@ static int msm_pcm_compress_ctl_put(struct snd_kcontrol *kcontrol,
		pr_err("%s substream runtime not found\n", __func__);
		return 0;
		}
		mutex_lock(&pdata->lock);
		prtd = substream->runtime->private_data;
		if (prtd) {
		pr_debug("%s: setting compress flag to 0x%x\n",
		__func__, compress);
		prtd->compress_enable = compress;
		}
		mutex_unlock(&pdata->lock);
		return rc;
		}