hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ASoC: samsung: i2s: Get rid of a static spinlock 

This patch makes the spinlock serializing access to the primary/secondary
PCM a per I2S controller lock, rather than a global one. There is no need
to have a global lock across multiple I2S controllers in the SoC.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Acked-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Sylwester Nawrocki 2019-02-14 10:37:39 +01:00 committed by Mark Brown
parent 5944170f49
commit defc67c6e3
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sound/soc/samsung/i2s.c
View File

@ -88,9 +88,6 @@ struct i2s_dai {
struct samsung_i2s_priv *priv; struct samsung_i2s_priv *priv;
}; };
/* Lock for cross i/f checks */
static DEFINE_SPINLOCK(lock);
struct samsung_i2s_priv { struct samsung_i2s_priv {
struct platform_device *pdev; struct platform_device *pdev;
struct platform_device *pdev_sec; struct platform_device *pdev_sec;
@ -101,6 +98,9 @@ struct samsung_i2s_priv {
/* Spinlock protecting access to the device's registers */ /* Spinlock protecting access to the device's registers */
spinlock_t lock; spinlock_t lock;
/* Lock for cross i/f checks */
spinlock_t pcm_lock;
/* CPU DAIs and their corresponding drivers */ /* CPU DAIs and their corresponding drivers */
struct i2s_dai *dai; struct i2s_dai *dai;
struct snd_soc_dai_driver *dai_drv; struct snd_soc_dai_driver *dai_drv;
@ -832,7 +832,7 @@ static int i2s_startup(struct snd_pcm_substream *substream,
pm_runtime_get_sync(dai->dev); pm_runtime_get_sync(dai->dev);
spin_lock_irqsave(&lock, flags); spin_lock_irqsave(&priv->pcm_lock, flags);
i2s->mode |= DAI_OPENED; i2s->mode |= DAI_OPENED;
@ -844,7 +844,7 @@ static int i2s_startup(struct snd_pcm_substream *substream,
if (!any_active(i2s) && (priv->quirks & QUIRK_NEED_RSTCLR)) if (!any_active(i2s) && (priv->quirks & QUIRK_NEED_RSTCLR))
writel(CON_RSTCLR, i2s->priv->addr + I2SCON); writel(CON_RSTCLR, i2s->priv->addr + I2SCON);
spin_unlock_irqrestore(&lock, flags); spin_unlock_irqrestore(&priv->pcm_lock, flags);
return 0; return 0;
} }
@ -852,11 +852,12 @@ static int i2s_startup(struct snd_pcm_substream *substream,
static void i2s_shutdown(struct snd_pcm_substream *substream, static void i2s_shutdown(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai) struct snd_soc_dai *dai)
{ {
struct samsung_i2s_priv *priv = snd_soc_dai_get_drvdata(dai);
struct i2s_dai *i2s = to_info(dai); struct i2s_dai *i2s = to_info(dai);
struct i2s_dai *other = get_other_dai(i2s); struct i2s_dai *other = get_other_dai(i2s);
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&lock, flags); spin_lock_irqsave(&priv->pcm_lock, flags);
i2s->mode &= ~DAI_OPENED; i2s->mode &= ~DAI_OPENED;
i2s->mode &= ~DAI_MANAGER; i2s->mode &= ~DAI_MANAGER;
@ -868,7 +869,7 @@ static void i2s_shutdown(struct snd_pcm_substream *substream,
i2s->rfs = 0; i2s->rfs = 0;
i2s->bfs = 0; i2s->bfs = 0;
spin_unlock_irqrestore(&lock, flags); spin_unlock_irqrestore(&priv->pcm_lock, flags);
pm_runtime_put(dai->dev); pm_runtime_put(dai->dev);
} }
@ -1406,6 +1407,7 @@ static int samsung_i2s_probe(struct platform_device *pdev)
pri_dai = &priv->dai[SAMSUNG_I2S_ID_PRIMARY - 1]; pri_dai = &priv->dai[SAMSUNG_I2S_ID_PRIMARY - 1];
spin_lock_init(&priv->lock); spin_lock_init(&priv->lock);
spin_lock_init(&priv->pcm_lock);
if (!np) { if (!np) {
if (i2s_pdata == NULL) { if (i2s_pdata == NULL) {