October 2012 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ASoC: wm8750: Convert to direct regmap API usage
by Mark Brown 10 Oct '12

10 Oct '12

Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8750.c | 86 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 66 insertions(+), 20 deletions(-) diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c index 89151ca..7665d68 100644 --- a/sound/soc/codecs/wm8750.c +++ b/sound/soc/codecs/wm8750.c @@ -18,6 +18,7 @@ #include <linux/delay.h> #include <linux/pm.h> #include <linux/i2c.h> +#include <linux/regmap.h> #include <linux/spi/spi.h> #include <linux/slab.h> #include <linux/of_device.h> @@ -34,24 +35,55 @@ * We can't read the WM8750 register space when we * are using 2 wire for device control, so we cache them instead. */ -static const u16 wm8750_reg[] = { - 0x0097, 0x0097, 0x0079, 0x0079, /* 0 */ - 0x0000, 0x0008, 0x0000, 0x000a, /* 4 */ - 0x0000, 0x0000, 0x00ff, 0x00ff, /* 8 */ - 0x000f, 0x000f, 0x0000, 0x0000, /* 12 */ - 0x0000, 0x007b, 0x0000, 0x0032, /* 16 */ - 0x0000, 0x00c3, 0x00c3, 0x00c0, /* 20 */ - 0x0000, 0x0000, 0x0000, 0x0000, /* 24 */ - 0x0000, 0x0000, 0x0000, 0x0000, /* 28 */ - 0x0000, 0x0000, 0x0050, 0x0050, /* 32 */ - 0x0050, 0x0050, 0x0050, 0x0050, /* 36 */ - 0x0079, 0x0079, 0x0079, /* 40 */ +static const struct reg_default wm8750_reg_defaults[] = { + { 0, 0x0097 }, + { 1, 0x0097 }, + { 2, 0x0079 }, + { 3, 0x0079 }, + { 4, 0x0000 }, + { 5, 0x0008 }, + { 6, 0x0000 }, + { 7, 0x000a }, + { 8, 0x0000 }, + { 9, 0x0000 }, + { 10, 0x00ff }, + { 11, 0x00ff }, + { 12, 0x000f }, + { 13, 0x000f }, + { 14, 0x0000 }, + { 15, 0x0000 }, + { 16, 0x0000 }, + { 17, 0x007b }, + { 18, 0x0000 }, + { 19, 0x0032 }, + { 20, 0x0000 }, + { 21, 0x00c3 }, + { 22, 0x00c3 }, + { 23, 0x00c0 }, + { 24, 0x0000 }, + { 25, 0x0000 }, + { 26, 0x0000 }, + { 27, 0x0000 }, + { 28, 0x0000 }, + { 29, 0x0000 }, + { 30, 0x0000 }, + { 31, 0x0000 }, + { 32, 0x0000 }, + { 33, 0x0000 }, + { 34, 0x0050 }, + { 35, 0x0050 }, + { 36, 0x0050 }, + { 37, 0x0050 }, + { 38, 0x0050 }, + { 39, 0x0050 }, + { 40, 0x0079 }, + { 41, 0x0079 }, + { 42, 0x0079 }, }; /* codec private data */ struct wm8750_priv { unsigned int sysclk; - enum snd_soc_control_type control_type; }; #define wm8750_reset(c) snd_soc_write(c, WM8750_RESET, 0) @@ -668,10 +700,9 @@ static int wm8750_resume(struct snd_soc_codec *codec) static int wm8750_probe(struct snd_soc_codec *codec) { - struct wm8750_priv *wm8750 = snd_soc_codec_get_drvdata(codec); int ret; - ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8750->control_type); + ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP); if (ret < 0) { printk(KERN_ERR "wm8750: failed to set cache I/O: %d\n", ret); return ret; @@ -711,9 +742,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8750 = { .suspend = wm8750_suspend, .resume = wm8750_resume, .set_bias_level = wm8750_set_bias_level, - .reg_cache_size = ARRAY_SIZE(wm8750_reg), - .reg_word_size = sizeof(u16), - .reg_cache_default = wm8750_reg, .controls = wm8750_snd_controls, .num_controls = ARRAY_SIZE(wm8750_snd_controls), @@ -730,10 +758,21 @@ static const struct of_device_id wm8750_of_match[] = { }; MODULE_DEVICE_TABLE(of, wm8750_of_match); +static const struct regmap_config wm8750_regmap = { + .reg_bits = 7, + .val_bits = 9, + .max_register = WM8750_MOUTV, + + .reg_defaults = wm8750_reg_defaults, + .num_reg_defaults = ARRAY_SIZE(wm8750_reg_defaults), + .cache_type = REGCACHE_RBTREE, +}; + #if defined(CONFIG_SPI_MASTER) static int __devinit wm8750_spi_probe(struct spi_device *spi) { struct wm8750_priv *wm8750; + struct regmap *regmap; int ret; wm8750 = devm_kzalloc(&spi->dev, sizeof(struct wm8750_priv), @@ -741,7 +780,10 @@ static int __devinit wm8750_spi_probe(struct spi_device *spi) if (wm8750 == NULL) return -ENOMEM; - wm8750->control_type = SND_SOC_SPI; + regmap = devm_regmap_init_spi(spi, &wm8750_regmap); + if (IS_ERR(regmap)) + return PTR_ERR(regmap); + spi_set_drvdata(spi, wm8750); ret = snd_soc_register_codec(&spi->dev, @@ -779,6 +821,7 @@ static __devinit int wm8750_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { struct wm8750_priv *wm8750; + struct regmap *regmap; int ret; wm8750 = devm_kzalloc(&i2c->dev, sizeof(struct wm8750_priv), @@ -787,7 +830,10 @@ static __devinit int wm8750_i2c_probe(struct i2c_client *i2c, return -ENOMEM; i2c_set_clientdata(i2c, wm8750); - wm8750->control_type = SND_SOC_I2C; + + regmap = devm_regmap_init_i2c(i2c, &wm8750_regmap); + if (IS_ERR(regmap)) + return PTR_ERR(regmap); ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_wm8750, &wm8750_dai, 1); -- 1.7.10.4

1 0

[alsa-devel] [PATCH] ASoC: wm8971: Convert to direct regmap API usage
by Mark Brown 10 Oct '12

10 Oct '12

Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8971.c | 80 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 61 insertions(+), 19 deletions(-) diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c index 5ce6477..70dd27e 100644 --- a/sound/soc/codecs/wm8971.c +++ b/sound/soc/codecs/wm8971.c @@ -19,6 +19,7 @@ #include <linux/delay.h> #include <linux/pm.h> #include <linux/i2c.h> +#include <linux/regmap.h> #include <linux/slab.h> #include <sound/core.h> #include <sound/pcm.h> @@ -34,7 +35,6 @@ static struct workqueue_struct *wm8971_workq = NULL; /* codec private data */ struct wm8971_priv { - enum snd_soc_control_type control_type; unsigned int sysclk; }; @@ -43,18 +43,50 @@ struct wm8971_priv { * We can't read the WM8971 register space when we * are using 2 wire for device control, so we cache them instead. */ -static const u16 wm8971_reg[] = { - 0x0097, 0x0097, 0x0079, 0x0079, /* 0 */ - 0x0000, 0x0008, 0x0000, 0x000a, /* 4 */ - 0x0000, 0x0000, 0x00ff, 0x00ff, /* 8 */ - 0x000f, 0x000f, 0x0000, 0x0000, /* 12 */ - 0x0000, 0x007b, 0x0000, 0x0032, /* 16 */ - 0x0000, 0x00c3, 0x00c3, 0x00c0, /* 20 */ - 0x0000, 0x0000, 0x0000, 0x0000, /* 24 */ - 0x0000, 0x0000, 0x0000, 0x0000, /* 28 */ - 0x0000, 0x0000, 0x0050, 0x0050, /* 32 */ - 0x0050, 0x0050, 0x0050, 0x0050, /* 36 */ - 0x0079, 0x0079, 0x0079, /* 40 */ +static const struct reg_default wm8971_reg_defaults[] = { + { 0, 0x0097 }, + { 1, 0x0097 }, + { 2, 0x0079 }, + { 3, 0x0079 }, + { 4, 0x0000 }, + { 5, 0x0008 }, + { 6, 0x0000 }, + { 7, 0x000a }, + { 8, 0x0000 }, + { 9, 0x0000 }, + { 10, 0x00ff }, + { 11, 0x00ff }, + { 12, 0x000f }, + { 13, 0x000f }, + { 14, 0x0000 }, + { 15, 0x0000 }, + { 16, 0x0000 }, + { 17, 0x007b }, + { 18, 0x0000 }, + { 19, 0x0032 }, + { 20, 0x0000 }, + { 21, 0x00c3 }, + { 22, 0x00c3 }, + { 23, 0x00c0 }, + { 24, 0x0000 }, + { 25, 0x0000 }, + { 26, 0x0000 }, + { 27, 0x0000 }, + { 28, 0x0000 }, + { 29, 0x0000 }, + { 30, 0x0000 }, + { 31, 0x0000 }, + { 32, 0x0000 }, + { 33, 0x0000 }, + { 34, 0x0050 }, + { 35, 0x0050 }, + { 36, 0x0050 }, + { 37, 0x0050 }, + { 38, 0x0050 }, + { 39, 0x0050 }, + { 40, 0x0079 }, + { 41, 0x0079 }, + { 42, 0x0079 }, }; #define wm8971_reset(c) snd_soc_write(c, WM8971_RESET, 0) @@ -613,11 +645,10 @@ static int wm8971_resume(struct snd_soc_codec *codec) static int wm8971_probe(struct snd_soc_codec *codec) { - struct wm8971_priv *wm8971 = snd_soc_codec_get_drvdata(codec); int ret = 0; u16 reg; - ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8971->control_type); + ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP); if (ret < 0) { printk(KERN_ERR "wm8971: failed to set cache I/O: %d\n", ret); return ret; @@ -667,9 +698,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8971 = { .suspend = wm8971_suspend, .resume = wm8971_resume, .set_bias_level = wm8971_set_bias_level, - .reg_cache_size = ARRAY_SIZE(wm8971_reg), - .reg_word_size = sizeof(u16), - .reg_cache_default = wm8971_reg, .controls = wm8971_snd_controls, .num_controls = ARRAY_SIZE(wm8971_snd_controls), @@ -679,10 +707,21 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8971 = { .num_dapm_routes = ARRAY_SIZE(wm8971_dapm_routes), }; +static const struct regmap_config wm8971_regmap = { + .reg_bits = 7, + .val_bits = 9, + .max_register = WM8971_MOUTV, + + .reg_defaults = wm8971_reg_defaults, + .num_reg_defaults = ARRAY_SIZE(wm8971_reg_defaults), + .cache_type = REGCACHE_RBTREE, +}; + static __devinit int wm8971_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { struct wm8971_priv *wm8971; + struct regmap *regmap; int ret; wm8971 = devm_kzalloc(&i2c->dev, sizeof(struct wm8971_priv), @@ -690,7 +729,10 @@ static __devinit int wm8971_i2c_probe(struct i2c_client *i2c, if (wm8971 == NULL) return -ENOMEM; - wm8971->control_type = SND_SOC_I2C; + regmap = devm_regmap_init_i2c(i2c, &wm8971_regmap); + if (IS_ERR(regmap)) + return PTR_ERR(regmap); + i2c_set_clientdata(i2c, wm8971); ret = snd_soc_register_codec(&i2c->dev, -- 1.7.10.4

1 0

Re: [alsa-devel] [3.6-rc7] switcheroo race with Intel HDA...
by Takashi Iwai 10 Oct '12

10 Oct '12

At Tue, 9 Oct 2012 22:26:40 +0800, Daniel J Blueman wrote: > > On 9 October 2012 21:04, Takashi Iwai <tiwai(a)suse.de> wrote: > > At Tue, 9 Oct 2012 19:23:56 +0800, > > Daniel J Blueman wrote: > >> On 9 October 2012 18:07, Takashi Iwai <tiwai(a)suse.de> wrote: > >> > At Tue, 09 Oct 2012 12:04:08 +0200, > >> > Takashi Iwai wrote: > >> >> At Tue, 9 Oct 2012 00:34:09 +0800, > >> >> Daniel J Blueman wrote: > >> >> > On 8 October 2012 20:58, Takashi Iwai <tiwai(a)suse.de> wrote: > >> >> > > At Tue, 25 Sep 2012 13:20:05 +0800, > >> >> > > Daniel J Blueman wrote: > >> >> > >> On my Macbook with a discrete Nvidia GPU, there is a race between > >> >> > >> selecting the integrated GPU and putting the discrete GPU into D3 [1], > >> >> > >> reliably causing a kernel oops [2]. > >> >> > >> > >> >> > >> Introducing a delay of ~1s between the calls prevents this. When the > >> >> > >> second 'OFF' write path executes, it looks like struct azx at > >> >> > >> card->private_data hasn't yet been allocated yet [3], so there is > >> >> > >> likely some locking missing. > >> >> > > > >> >> > > It's rather pci_get_drvdata() returning NULL (i.e. card is NULL, thus > >> >> > > card->private_data causes Oops). Could you check the patch like below > >> >> > > and see whether you get a kernel warning (but no Oops) or the problem > >> >> > > gets fixed by shifting the assignment of pci drvdata? > >> >> > [...] > >> >> > > >> >> > Good patching. Calling pci_set_drvdata later prevents the oops in HDA, > >> >> > though we see unexpected 0x0 responses in the response ring buffer > >> >> > [1], which we don't see when there's a >~1.5s delay between IGD and > >> >> > OFF. > >> >> > >> >> If the previous patch fixed, it means that the switching occurred > >> >> during the device was being probed. Maybe a better approach to > >> >> register the VGA switcheroo after the proper initialization. > >> >> > >> >> The patch below is a revised one. Please give it a try. > >> > > >> > Also, it's not clear which card spews the spurious response. > >> > Apply the patch below in addition. > >> [...] > >> > >> hda-intel: 0000:01:00.1: spurious response 0x0:0x0, last cmd=0x1f0004 > >> $ lspci -s :1:0.1 > >> 01:00.1 Audio device: NVIDIA Corporation Device 0e1b (rev ff) > >> > >> It's the NVIDIA device which presumably hasn't completed it's > >> transition to D3 at the time the OFF is executed. > > > > OK, then could you try the patch below on the top of previous two > > patches? > > The first IGD switcheroo command fails to switch to the integrated GPU: > > # cat /sys/kernel/debug/vgaswitcheroo/switch > 0:DIS:+:Pwr:0000:01:00.0 > 1:IGD: :Pwr:0000:00:02.0 > 2:DIS-Audio: :Pwr:0000:01:00.1 > # echo IGD >/sys/kernel/debug/vgaswitcheroo/switch > vga_switcheroo: client 1 refused switch > > I also instrumented snd_hda_lock_devices, but none of the failure > paths are being taken, which would leave inconsistent state, as the > return value isn't checked. Hm, right, the return value of snd_hda_lock_devices() isn't checked, but I don't understand how this results like above. Basically switching is protected by mutex in vga_switcheroo.c, so the whole operation in the client side should be serialized. In anyway, try the patch below cleanly, and see the spurious message error coming up at which timing. thanks, Takashi --- diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 6833835..4518b05 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -501,6 +501,7 @@ struct azx { /* VGA-switcheroo setup */ unsigned int use_vga_switcheroo:1; + unsigned int vga_switcheroo_registered:1; unsigned int init_failed:1; /* delayed init failed */ unsigned int disabled:1; /* disabled by VGA-switcher */ @@ -1597,6 +1598,8 @@ static int DELAYED_INIT_MARK azx_codec_create(struct azx *chip, const char *mode int c, codecs, err; int max_slots; + printk(KERN_DEBUG "XXX %s: azx_codec_create entered\n", + pci_name(chip->pci)); memset(&bus_temp, 0, sizeof(bus_temp)); bus_temp.private_data = chip; bus_temp.modelname = model; @@ -1673,6 +1676,8 @@ static int DELAYED_INIT_MARK azx_codec_create(struct azx *chip, const char *mode snd_printk(KERN_ERR SFX "no codecs initialized\n"); return -ENXIO; } + printk(KERN_DEBUG "XXX %s: azx_codec_create done\n", + pci_name(chip->pci)); return 0; } @@ -2615,6 +2620,8 @@ static void azx_vs_set_state(struct pci_dev *pci, return; disabled = (state == VGA_SWITCHEROO_OFF); + printk(KERN_DEBUG "XXX %s: chip->disabled=%d, disabled=%d\n", + pci_name(chip->pci), chip->disabled, disabled); if (chip->disabled == disabled) return; @@ -2638,14 +2645,26 @@ static void azx_vs_set_state(struct pci_dev *pci, disabled ? "Disabling" : "Enabling", pci_name(chip->pci)); if (disabled) { + printk(KERN_DEBUG "XXX %s: azx_suspend...\n", + pci_name(chip->pci)); azx_suspend(&pci->dev); + printk(KERN_DEBUG "XXX %s: azx_suspend done...\n", + pci_name(chip->pci)); chip->disabled = true; - snd_hda_lock_devices(chip->bus); + if (snd_hda_lock_devices(chip->bus)) + snd_printk(KERN_WARNING SFX + "Cannot lock devices!\n"); } else { snd_hda_unlock_devices(chip->bus); chip->disabled = false; + printk(KERN_DEBUG "XXX %s: azx_resume...\n", + pci_name(chip->pci)); azx_resume(&pci->dev); + printk(KERN_DEBUG "XXX %s: azx_resume done...\n", + pci_name(chip->pci)); } + printk(KERN_DEBUG "XXX %s: switching finished: disabled=%d\n", + pci_name(chip->pci), chip->disabled); } } @@ -2683,14 +2702,20 @@ static const struct vga_switcheroo_client_ops azx_vs_ops = { static int __devinit register_vga_switcheroo(struct azx *chip) { + int err; + if (!chip->use_vga_switcheroo) return 0; /* FIXME: currently only handling DIS controller * is there any machine with two switchable HDMI audio controllers? */ - return vga_switcheroo_register_audio_client(chip->pci, &azx_vs_ops, + err = vga_switcheroo_register_audio_client(chip->pci, &azx_vs_ops, VGA_SWITCHEROO_DIS, chip->bus != NULL); + if (err < 0) + return err; + chip->vga_switcheroo_registered = 1; + return 0; } #else #define init_vga_switcheroo(chip) /* NOP */ @@ -2712,7 +2737,8 @@ static int azx_free(struct azx *chip) if (use_vga_switcheroo(chip)) { if (chip->disabled && chip->bus) snd_hda_unlock_devices(chip->bus); - vga_switcheroo_unregister_client(chip->pci); + if (chip->vga_switcheroo_registered) + vga_switcheroo_unregister_client(chip->pci); } if (chip->initialized) { @@ -3062,14 +3088,6 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci, } ok: - err = register_vga_switcheroo(chip); - if (err < 0) { - snd_printk(KERN_ERR SFX - "Error registering VGA-switcheroo client\n"); - azx_free(chip); - return err; - } - err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops); if (err < 0) { snd_printk(KERN_ERR SFX "Error creating device [card]!\n"); @@ -3340,6 +3358,13 @@ static int __devinit azx_probe(struct pci_dev *pci, if (pci_dev_run_wake(pci)) pm_runtime_put_noidle(&pci->dev); + err = register_vga_switcheroo(chip); + if (err < 0) { + snd_printk(KERN_ERR SFX + "Error registering VGA-switcheroo client\n"); + goto out_free; + } + dev++; return 0;

1 0

[alsa-devel] [PATCH 1/4] ASoC: wm8770: Convert to direct regmap API usage
by Mark Brown 10 Oct '12

10 Oct '12

Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8770.c | 100 +++++++++++++++++++++++++++++---------------- 1 file changed, 65 insertions(+), 35 deletions(-) diff --git a/sound/soc/codecs/wm8770.c b/sound/soc/codecs/wm8770.c index c7c0034..21ec563 100644 --- a/sound/soc/codecs/wm8770.c +++ b/sound/soc/codecs/wm8770.c @@ -17,6 +17,7 @@ #include <linux/of_device.h> #include <linux/pm.h> #include <linux/spi/spi.h> +#include <linux/regmap.h> #include <linux/regulator/consumer.h> #include <linux/slab.h> #include <sound/core.h> @@ -35,19 +36,52 @@ static const char *wm8770_supply_names[WM8770_NUM_SUPPLIES] = { "DVDD" }; -static const u16 wm8770_reg_defs[WM8770_CACHEREGNUM] = { - 0x7f, 0x7f, 0x7f, 0x7f, - 0x7f, 0x7f, 0x7f, 0x7f, - 0x7f, 0xff, 0xff, 0xff, - 0xff, 0xff, 0xff, 0xff, - 0xff, 0xff, 0, 0x90, 0, - 0, 0x22, 0x22, 0x3e, - 0xc, 0xc, 0x100, 0x189, - 0x189, 0x8770 +static const struct reg_default wm8770_reg_defaults[] = { + { 0, 0x7f }, + { 1, 0x7f }, + { 2, 0x7f }, + { 3, 0x7f }, + { 4, 0x7f }, + { 5, 0x7f }, + { 6, 0x7f }, + { 7, 0x7f }, + { 8, 0x7f }, + { 9, 0xff }, + { 10, 0xff }, + { 11, 0xff }, + { 12, 0xff }, + { 13, 0xff }, + { 14, 0xff }, + { 15, 0xff }, + { 16, 0xff }, + { 17, 0xff }, + { 18, 0 }, + { 19, 0x90 }, + { 20, 0 }, + { 21, 0 }, + { 22, 0x22 }, + { 23, 0x22 }, + { 24, 0x3e }, + { 25, 0xc }, + { 26, 0xc }, + { 27, 0x100 }, + { 28, 0x189 }, + { 29, 0x189 }, + { 30, 0x8770 }, }; +static bool wm8770_volatile_reg(struct device *dev, unsigned int reg) +{ + switch (reg) { + case WM8770_RESET: + return true; + default: + return false; + } +} + struct wm8770_priv { - enum snd_soc_control_type control_type; + struct regmap *regmap; struct regulator_bulk_data supplies[WM8770_NUM_SUPPLIES]; struct notifier_block disable_nb[WM8770_NUM_SUPPLIES]; struct snd_soc_codec *codec; @@ -71,7 +105,7 @@ static int wm8770_regulator_event_##n(struct notifier_block *nb, \ struct wm8770_priv *wm8770 = container_of(nb, struct wm8770_priv, \ disable_nb[n]); \ if (event & REGULATOR_EVENT_DISABLE) { \ - wm8770->codec->cache_sync = 1; \ + regcache_mark_dirty(wm8770->regmap); \ } \ return 0; \ } @@ -466,24 +500,6 @@ static int wm8770_set_sysclk(struct snd_soc_dai *dai, return 0; } -static void wm8770_sync_cache(struct snd_soc_codec *codec) -{ - int i; - u16 *cache; - - if (!codec->cache_sync) - return; - - codec->cache_only = 0; - cache = codec->reg_cache; - for (i = 0; i < codec->driver->reg_cache_size; i++) { - if (i == WM8770_RESET || cache[i] == wm8770_reg_defs[i]) - continue; - snd_soc_write(codec, i, cache[i]); - } - codec->cache_sync = 0; -} - static int wm8770_set_bias_level(struct snd_soc_codec *codec, enum snd_soc_bias_level level) { @@ -507,7 +523,9 @@ static int wm8770_set_bias_level(struct snd_soc_codec *codec, ret); return ret; } - wm8770_sync_cache(codec); + + regcache_sync(wm8770->regmap); + /* global powerup */ snd_soc_write(codec, WM8770_PWDNCTRL, 0); } @@ -580,7 +598,7 @@ static int wm8770_probe(struct snd_soc_codec *codec) wm8770 = snd_soc_codec_get_drvdata(codec); wm8770->codec = codec; - ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8770->control_type); + ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_REGMAP); if (ret < 0) { dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); return ret; @@ -678,9 +696,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8770 = { .resume = wm8770_resume, .set_bias_level = wm8770_set_bias_level, .idle_bias_off = true, - .reg_cache_size = ARRAY_SIZE(wm8770_reg_defs), - .reg_word_size = sizeof (u16), - .reg_cache_default = wm8770_reg_defs }; static const struct of_device_id wm8770_of_match[] = { @@ -689,6 +704,18 @@ static const struct of_device_id wm8770_of_match[] = { }; MODULE_DEVICE_TABLE(of, wm8770_of_match); +static const struct regmap_config wm8770_regmap = { + .reg_bits = 7, + .val_bits = 9, + .max_register = WM8770_RESET, + + .reg_defaults = wm8770_reg_defaults, + .num_reg_defaults = ARRAY_SIZE(wm8770_reg_defaults), + .cache_type = REGCACHE_RBTREE, + + .volatile_reg = wm8770_volatile_reg, +}; + static int __devinit wm8770_spi_probe(struct spi_device *spi) { struct wm8770_priv *wm8770; @@ -699,7 +726,10 @@ static int __devinit wm8770_spi_probe(struct spi_device *spi) if (!wm8770) return -ENOMEM; - wm8770->control_type = SND_SOC_SPI; + wm8770->regmap = devm_regmap_init_spi(spi, &wm8770_regmap); + if (IS_ERR(wm8770->regmap)) + return PTR_ERR(wm8770->regmap); + spi_set_drvdata(spi, wm8770); ret = snd_soc_register_codec(&spi->dev, -- 1.7.10.4

1 3

Re: [alsa-devel] [PATCH 0/2] Convert davinci ASoC to genalloc SRAM
by Daniel Mack 10 Oct '12

10 Oct '12

On 10.10.2012 11:59, Kumar, Anil wrote: > On Wed, Oct 10, 2012 at 12:34:47, Daniel Mack wrote: >> On 10.10.2012 08:54, Kumar, Anil wrote: >>> On Thu, Oct 04, 2012 at 15:45:43, Porter, Matt wrote: >>>> This series converts davinci ASoC to use genalloc and enables >>>> that support on DA850. It applies on top of the uio_pruss/genalloc >>>> series [1] which allows DaVinci to provide a gen_pool via pdata >>>> for driver use. >>>> >>>> I've tested this on the AM180x EVM. Note that prior to this, >>>> the SRAM paths in the driver were completely unused. I've only >>>> enabled ping-pong buffering on the platform I can test as it's >>>> best to allow those with DM644x and similar platforms to set the >>>> playback/capture sram size to something that's known to work >>>> for them. >>>> >>>> [1] http://www.spinics.net/lists/arm-kernel/msg198854.html >>> >>> Tested on DA850 EVM after applying patches from [1] above. >>> Tested on Linux-torvalds 3.6-rc6 master branch. >>> Tested ASoC module (aplay & arecord for various frequencies) >>> >>> Acked-by: Kumar, Anil <anilkumar.v(a)ti.com> >> >> As you're on it, could you also quickly merge this branch >> >> git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git >> topic/davinci >> >> And see if my recent patches for more McASP flexibility cause any >> trouble on your hardware? >> >> >> Daniel >> >> > > I have merged it with 3.6-rc6 and I have got error at compile time. > I have fixed this locally with the following patch [1]. > Kindly confirm if the patch is correct? I did the same thing locally, but I considered this a merge conflict. > With that > Tested on DA850 EVM > Tested on Linux-torvalds 3.6-rc6 master branch merged + [1] > Tested ASoC module (aplay & arecord for various frequencies) > > Tested-By: Kumar, Anil <anilkumar.v(a)ti.com> Ok, that's good to hear. Thanks a lot :) Daniel > diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h > index 09da4e5..9c02a45 100644 > --- a/include/linux/dmaengine.h > +++ b/include/linux/dmaengine.h > @@ -591,7 +591,7 @@ struct dma_device { > struct dma_async_tx_descriptor *(*device_prep_dma_cyclic)( > struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len, > size_t period_len, enum dma_transfer_direction direction, > - unsigned long flags, void *context); > + void *context); > struct dma_async_tx_descriptor *(*device_prep_interleaved_dma)( > struct dma_chan *chan, struct dma_interleaved_template *xt, > unsigned long flags); > @@ -656,7 +656,7 @@ static inline struct dma_async_tx_descriptor *dmaengine_prep_dma_cyclic( > size_t period_len, enum dma_transfer_direction dir) > { > return chan->device->device_prep_dma_cyclic(chan, buf_addr, buf_len, > - period_len, dir, flags, NULL); > + period_len, dir, NULL); > } >

1 0

[alsa-devel] [PATCH] ALSA: hda - Add missing hda_gen_spec to struct via_spec
by Takashi Iwai 10 Oct '12

10 Oct '12

The commit [4b527b65 ALSA: hda - limit internal mic boost for Asus X202E] introduced the use of auto-parser code, but it forgot to add struct hda_gen_spec at the head of codec->spec which the auto-parser assumes silently. Without this record, it may result in memory corruption. This patch adds the missing piece. Cc: <stable(a)vger.kernel.org> [v3.5+] Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- David, I queued this fix now. I'm going to send a pull request tomorrow or on Friday. sound/pci/hda/patch_via.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c index eae466a..72a2f60 100644 --- a/sound/pci/hda/patch_via.c +++ b/sound/pci/hda/patch_via.c @@ -118,6 +118,8 @@ enum { }; struct via_spec { + struct hda_gen_spec gen; + /* codec parameterization */ const struct snd_kcontrol_new *mixers[6]; unsigned int num_mixers; @@ -246,6 +248,7 @@ static struct via_spec * via_new_spec(struct hda_codec *codec) /* VT1708BCE & VT1708S are almost same */ if (spec->codec_type == VT1708BCE) spec->codec_type = VT1708S; + snd_hda_gen_init(&spec->gen); return spec; } @@ -1627,6 +1630,7 @@ static void via_free(struct hda_codec *codec) vt1708_stop_hp_work(spec); kfree(spec->bind_cap_vol); kfree(spec->bind_cap_sw); + snd_hda_gen_free(&spec->gen); kfree(spec); } -- 1.7.12.2

2 2

Re: [alsa-devel] [PATCH 0/2] Convert davinci ASoC to genalloc SRAM
by Daniel Mack 10 Oct '12

10 Oct '12

On 10.10.2012 08:54, Kumar, Anil wrote: > On Thu, Oct 04, 2012 at 15:45:43, Porter, Matt wrote: >> This series converts davinci ASoC to use genalloc and enables >> that support on DA850. It applies on top of the uio_pruss/genalloc >> series [1] which allows DaVinci to provide a gen_pool via pdata >> for driver use. >> >> I've tested this on the AM180x EVM. Note that prior to this, >> the SRAM paths in the driver were completely unused. I've only >> enabled ping-pong buffering on the platform I can test as it's >> best to allow those with DM644x and similar platforms to set the >> playback/capture sram size to something that's known to work >> for them. >> >> [1] http://www.spinics.net/lists/arm-kernel/msg198854.html > > Tested on DA850 EVM after applying patches from [1] above. > Tested on Linux-torvalds 3.6-rc6 master branch. > Tested ASoC module (aplay & arecord for various frequencies) > > Acked-by: Kumar, Anil <anilkumar.v(a)ti.com> As you're on it, could you also quickly merge this branch git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/davinci And see if my recent patches for more McASP flexibility cause any trouble on your hardware? Daniel

1 0

Re: [alsa-devel] sound/pci/pcxhr/pcxhr.c:916:2: warning: 'flush_work_sync' is deprecated (declared at include/linux/workqueue.h:448)
by Takashi Iwai 10 Oct '12

10 Oct '12

At Wed, 10 Oct 2012 07:36:43 +0800, Fengguang Wu wrote: > > Hi Takashi, > > FYI, there *will* be new compile warnings in > > 672a112 ALSA: pcxhr - Kill tasklets > > sound/pci/pcxhr/pcxhr.c: In function 'pcxhr_prepare': > sound/pci/pcxhr/pcxhr.c:916:2: warning: 'flush_work_sync' is deprecated (declared at include/linux/workqueue.h:448) [-Wdeprecated-declarations] > sound/pci/pcxhr/pcxhr.c: In function 'pcxhr_hw_free': > sound/pci/pcxhr/pcxhr.c:978:2: warning: 'flush_work_sync' is deprecated (declared at include/linux/workqueue.h:448) [-Wdeprecated-declarations] Thanks, fixed now. Takashi > > vim +916 sound/pci/pcxhr/pcxhr.c > > e12229b4 Markus Bollinger 2005-12-06 901 > e12229b4 Markus Bollinger 2005-12-06 902 /* > e12229b4 Markus Bollinger 2005-12-06 903 * prepare callback for all pcms > e12229b4 Markus Bollinger 2005-12-06 904 */ > e12229b4 Markus Bollinger 2005-12-06 905 static int pcxhr_prepare(struct snd_pcm_substream *subs) > e12229b4 Markus Bollinger 2005-12-06 906 { > e12229b4 Markus Bollinger 2005-12-06 907 struct snd_pcxhr *chip = snd_pcm_substream_chip(subs); > e12229b4 Markus Bollinger 2005-12-06 908 struct pcxhr_mgr *mgr = chip->mgr; > e12229b4 Markus Bollinger 2005-12-06 909 int err = 0; > e12229b4 Markus Bollinger 2005-12-06 910 > e12229b4 Markus Bollinger 2005-12-06 911 snd_printdd("pcxhr_prepare : period_size(%lx) periods(%x) buffer_size(%lx)\n", > e12229b4 Markus Bollinger 2005-12-06 912 subs->runtime->period_size, subs->runtime->periods, > e12229b4 Markus Bollinger 2005-12-06 913 subs->runtime->buffer_size); > e12229b4 Markus Bollinger 2005-12-06 914 > 672a1128 Takashi Iwai 2011-06-14 915 cancel_work_sync(&mgr->timer_work); > 672a1128 Takashi Iwai 2011-06-14 @916 flush_work_sync(&mgr->trigger_work); > 672a1128 Takashi Iwai 2011-06-14 917 > 62932df8 Ingo Molnar 2006-01-16 918 mutex_lock(&mgr->setup_mutex); > e12229b4 Markus Bollinger 2005-12-06 919 > e12229b4 Markus Bollinger 2005-12-06 920 do { > e12229b4 Markus Bollinger 2005-12-06 921 /* only the first stream can choose the sample rate */ > e12229b4 Markus Bollinger 2005-12-06 922 /* set the clock only once (first stream) */ > 8937fd88 Takashi Iwai 2006-01-10 923 if (mgr->sample_rate != subs->runtime->rate) { > e12229b4 Markus Bollinger 2005-12-06 924 err = pcxhr_set_clock(mgr, subs->runtime->rate); > > --- > 0-DAY kernel build testing backend Open Source Technology Center > Fengguang Wu, Yuanhan Liu Intel Corporation

1 0

[alsa-devel] [PATCH v2 1/3] ALSA: core: keep track of boundary wrap-around
by Pierre-Louis Bossart 10 Oct '12

10 Oct '12

Keep track of boundary crossing when hw_ptr exceeds boundary limit and wraps-around. This will help keep track of total number of frames played/received at the kernel level Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- include/sound/pcm.h | 1 + sound/core/pcm_lib.c | 26 +++++++++++++++++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/include/sound/pcm.h b/include/sound/pcm.h index cdca2ab..ba13e0b 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -281,6 +281,7 @@ struct snd_pcm_runtime { unsigned long hw_ptr_jiffies; /* Time when hw_ptr is updated */ unsigned long hw_ptr_buffer_jiffies; /* buffer time in jiffies */ snd_pcm_sframes_t delay; /* extra delay; typically FIFO size */ + u64 hw_ptr_wrap; /* offset for hw_ptr due to boundary wrap-around */ /* -- HW params -- */ snd_pcm_access_t access; /* access mode */ diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index 7ae6719..ec996ca 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -315,6 +315,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream, unsigned long jdelta; unsigned long curr_jiffies; struct timespec curr_tstamp; + int crossed_boundary = 0; old_hw_ptr = runtime->status->hw_ptr; @@ -359,8 +360,10 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream, hdelta = curr_jiffies - runtime->hw_ptr_jiffies; if (hdelta > runtime->hw_ptr_buffer_jiffies/2) { hw_base += runtime->buffer_size; - if (hw_base >= runtime->boundary) + if (hw_base >= runtime->boundary) { hw_base = 0; + crossed_boundary++; + } new_hw_ptr = hw_base + pos; goto __delta; } @@ -370,8 +373,10 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream, /* pointer crosses the end of the ring buffer */ if (new_hw_ptr < old_hw_ptr) { hw_base += runtime->buffer_size; - if (hw_base >= runtime->boundary) + if (hw_base >= runtime->boundary) { hw_base = 0; + crossed_boundary++; + } new_hw_ptr = hw_base + pos; } __delta: @@ -409,8 +414,10 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream, while (hdelta > xrun_threshold) { delta += runtime->buffer_size; hw_base += runtime->buffer_size; - if (hw_base >= runtime->boundary) + if (hw_base >= runtime->boundary) { hw_base = 0; + crossed_boundary++; + } new_hw_ptr = hw_base + pos; hdelta -= runtime->hw_ptr_buffer_jiffies; } @@ -455,8 +462,10 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream, /* the delta value is small or zero in most cases */ while (delta > 0) { new_hw_ptr += runtime->period_size; - if (new_hw_ptr >= runtime->boundary) + if (new_hw_ptr >= runtime->boundary) { new_hw_ptr -= runtime->boundary; + crossed_boundary--; + } delta--; } /* align hw_base to buffer_size */ @@ -506,6 +515,11 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream, runtime->hw_ptr_base = hw_base; runtime->status->hw_ptr = new_hw_ptr; runtime->hw_ptr_jiffies = curr_jiffies; + if (crossed_boundary) { + BUG_ON(crossed_boundary > 1); + BUG_ON(crossed_boundary < 0); + runtime->hw_ptr_wrap += runtime->boundary; + } if (runtime->tstamp_mode == SNDRV_PCM_TSTAMP_ENABLE) runtime->status->tstamp = curr_tstamp; @@ -1660,8 +1674,10 @@ static int snd_pcm_lib_ioctl_reset(struct snd_pcm_substream *substream, if (snd_pcm_running(substream) && snd_pcm_update_hw_ptr(substream) >= 0) runtime->status->hw_ptr %= runtime->buffer_size; - else + else { runtime->status->hw_ptr = 0; + runtime->hw_ptr_wrap = 0; + } snd_pcm_stream_unlock_irqrestore(substream, flags); return 0; } -- 1.7.9.5

2 7

[alsa-devel] [PATCH] ALSA: ASoC: McASP: treat SNDRV_PCM_FORMAT_U24_* as 32 bit words
by Daniel Mack 10 Oct '12

10 Oct '12

Signed-off-by: Daniel Mack <zonque(a)gmail.com> Reported-by: Mike Looijmans <mike.looijmans(a)topic.nl> Cc: Mike Looijmans <mike.looijmans(a)topic.nl> --- sound/soc/davinci/davinci-mcasp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 501f8b4..82877a9 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -868,12 +868,12 @@ static int davinci_mcasp_hw_params(struct snd_pcm_substream *substream, case SNDRV_PCM_FORMAT_U24_3LE: case SNDRV_PCM_FORMAT_S24_3LE: - case SNDRV_PCM_FORMAT_U24_LE: - case SNDRV_PCM_FORMAT_S24_LE: dma_params->data_type = 3; word_length = DAVINCI_AUDIO_WORD_24; break; + case SNDRV_PCM_FORMAT_U24_LE: + case SNDRV_PCM_FORMAT_S24_LE: case SNDRV_PCM_FORMAT_U32_LE: case SNDRV_PCM_FORMAT_S32_LE: dma_params->data_type = 4; -- 1.7.11.4

2 1