mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Lars-Peter Clausen <lars@metafoo.de>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>,
	Liam Girdwood <lrg@slimlogic.co.uk>
Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org,
	Lars-Peter Clausen <lars@metafoo.de>,
	Peter Hsiang <Peter.Hsiang@maxim-ic.com>
Subject: [PATCH 2/9] ASoC: codecs: max98088: Fix register cache incoherency
Date: Tue, 28 Dec 2010 21:37:56 +0100	[thread overview]
Message-ID: <1293568684-9626-3-git-send-email-lars@metafoo.de> (raw)
In-Reply-To: <1293568684-9626-1-git-send-email-lars@metafoo.de>

The multi-component patch(commit f0fba2ad1) moved the allocation of the
register cache from the driver to the ASoC core. Most drivers where adjusted to
this, but the max98088 driver still uses its own register cache for its
private functions, while functions from the ASoC core use the generic cache.
Thus we end up with two from each other incoherent caches, which can lead to
undefined behaviour.
This patch fixes the issue by changing the max98088 driver to use the
generic register cache in its private functions.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Cc: Peter Hsiang <Peter.Hsiang@maxim-ic.com>

---
Compile tested only
---
 sound/soc/codecs/max98088.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c
index d63e287..6447dbb 100644
--- a/sound/soc/codecs/max98088.c
+++ b/sound/soc/codecs/max98088.c
@@ -40,7 +40,6 @@ struct max98088_cdata {
 };
 
 struct max98088_priv {
-       u8 reg_cache[M98088_REG_CNT];
        enum max98088_type devtype;
        void *control_data;
        struct max98088_pdata *pdata;
@@ -1588,7 +1587,7 @@ static int max98088_dai2_set_fmt(struct snd_soc_dai *codec_dai,
 
 static void max98088_sync_cache(struct snd_soc_codec *codec)
 {
-       struct max98088_priv *max98088 = snd_soc_codec_get_drvdata(codec);
+       u16 *reg_cache = codec->reg_cache;
        int i;
 
        if (!codec->cache_sync)
@@ -1599,14 +1598,14 @@ static void max98088_sync_cache(struct snd_soc_codec *codec)
        /* write back cached values if they're writeable and
         * different from the hardware default.
         */
-       for (i = 1; i < ARRAY_SIZE(max98088->reg_cache); i++) {
+       for (i = 1; i < codec->driver->reg_cache_size; i++) {
                if (!max98088_access[i].writable)
                        continue;
 
-               if (max98088->reg_cache[i] == max98088_reg[i])
+               if (reg_cache[i] == max98088_reg[i])
                        continue;
 
-               snd_soc_write(codec, i, max98088->reg_cache[i]);
+               snd_soc_write(codec, i, reg_cache[i]);
        }
 
        codec->cache_sync = 0;
@@ -1951,7 +1950,6 @@ static int max98088_probe(struct snd_soc_codec *codec)
        int ret = 0;
 
        codec->cache_sync = 1;
-       memcpy(codec->reg_cache, max98088_reg, sizeof(max98088_reg));
 
        ret = snd_soc_codec_set_cache_io(codec, 8, 8, SND_SOC_I2C);
        if (ret != 0) {
-- 
1.7.2.3


  parent reply	other threads:[~2010-12-28 20:38 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-12-28 20:37 [PATCH 0/9 v2] ASoC: codecs: Fix register cache incoherencies Lars-Peter Clausen
2010-12-28 20:37 ` [PATCH 1/9] ASoC: codecs: Remove unused reg_cache fields from device structs Lars-Peter Clausen
2010-12-28 20:37 ` Lars-Peter Clausen [this message]
2010-12-28 20:37 ` [PATCH 3/9] ASoC: codecs: wm8523: Fix register cache incoherency Lars-Peter Clausen
2010-12-28 20:37 ` [PATCH 4/9] ASoC: codecs: wm8741: " Lars-Peter Clausen
2010-12-28 20:37 ` [PATCH 5/9] ASoC: codecs: wm8904: " Lars-Peter Clausen
2010-12-28 20:38 ` [PATCH 6/9] ASoC: codecs: wm8955: " Lars-Peter Clausen
2010-12-28 20:38 ` [PATCH 7/9] ASoC: codecs: wm8962: " Lars-Peter Clausen
2010-12-28 20:38 ` [PATCH 8/9] ASoC: codecs: wm9090: " Lars-Peter Clausen
2010-12-28 20:38 ` [PATCH 9/9] ASoC: codecs: wm8753: " Lars-Peter Clausen
2010-12-28 23:43   ` Mark Brown
2010-12-28 20:38 ` Lars-Peter Clausen
2010-12-28 23:34   ` Mark Brown
2010-12-28 23:42 ` [PATCH 0/9 v2] ASoC: codecs: Fix register cache incoherencies Mark Brown
  -- strict thread matches above, loose matches on Subject: below --
2010-12-24 13:47 [PATCH 0/9] " Lars-Peter Clausen
2010-12-24 13:47 ` [PATCH 2/9] ASoC: codecs: max98088: Fix register cache incoherency Lars-Peter Clausen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1293568684-9626-3-git-send-email-lars@metafoo.de \
    --to=lars@metafoo.de \
    --cc=Peter.Hsiang@maxim-ic.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lrg@slimlogic.co.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®