diff options
| author | Viorel Suman <viorel.suman@nxp.com> | 2019-07-12 12:07:42 +0300 |
|---|---|---|
| committer | Viorel Suman <viorel.suman@nxp.com> | 2019-07-12 13:18:50 +0300 |
| commit | be4e4003c7dd8fc2fa2ea368dc82b0dfcc2294fa (patch) | |
| tree | fdf4f7ccc85ab62ec0c640f575d6b70a974f4971 /sound | |
| parent | 9f6803b34348ee8e6fbf15e817947b69a5fdb43b (diff) | |
MLK-21775-4: ASoC: fsl_micfil: synchronize HWVAD enable/disable
HWVAD may be disabled from different context - from userspace
via SYSFS interface, and from VAD interrupt context on VAD event
detection. Synchronize HVWAD enable/disable in order to get a
proper HWVAD state after each operation.
Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
Reviewed-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
(cherry picked from commit b5472e3f3dd1bd8959c1333a2aa01516e806c329)
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/fsl/fsl_micfil.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sound/soc/fsl/fsl_micfil.c b/sound/soc/fsl/fsl_micfil.c index cb26d8f8c5c3..e3d05cc58c6e 100644 --- a/sound/soc/fsl/fsl_micfil.c +++ b/sound/soc/fsl/fsl_micfil.c @@ -61,6 +61,8 @@ struct fsl_micfil { int vad_rate_index; atomic_t recording_state; atomic_t hwvad_state; + /* spinlock to control HWVAD enable/disable */ + spinlock_t hwvad_lock; }; struct fsl_micfil_soc_data { @@ -1926,7 +1928,10 @@ static irqreturn_t voice_detected_fn(int irq, void *devid) int ret; /* disable hwvad */ + spin_lock(&micfil->hwvad_lock); ret = disable_hwvad(dev, true); + spin_unlock(&micfil->hwvad_lock); + if (ret) dev_err(dev, "Failed to disable HWVAD module: %d\n", ret); @@ -2211,13 +2216,14 @@ static ssize_t micfil_hwvad_handler(struct kobject *kobj, struct kobject *nand_kobj = kobj->parent; struct device *dev = container_of(nand_kobj, struct device, kobj); struct fsl_micfil *micfil = dev_get_drvdata(dev); - unsigned long vad_channel; + unsigned long vad_channel, flags; int ret; ret = kstrtoul(buf, 16, &vad_channel); if (ret < 0) return -EINVAL; + spin_lock_irqsave(&micfil->hwvad_lock, flags); if (vad_channel <= 7) { micfil->vad_channel = vad_channel; ret = enable_hwvad(dev, true); @@ -2225,6 +2231,7 @@ static ssize_t micfil_hwvad_handler(struct kobject *kobj, micfil->vad_channel = -1; ret = disable_hwvad(dev, true); } + spin_unlock_irqrestore(&micfil->hwvad_lock, flags); if (ret) { dev_err(dev, "Failed to %s hwvad: %d\n", @@ -2381,6 +2388,8 @@ static int fsl_micfil_probe(struct platform_device *pdev) /* set default rate to first value in available vad rates */ micfil->vad_rate_index = 0; + /* init HWVAD enable/disable spinlock */ + spin_lock_init(&micfil->hwvad_lock); platform_set_drvdata(pdev, micfil); |