November 2010 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] ASoC update for 2.6.37
by Mark Brown 02 Nov '10

02 Nov '10

The following changes since commit 5a0b07433ddd808ecbb5f4287b61be6fa7af1b57: ASoC: Update WARN uses in wm_hubs (2010-11-01 15:44:57 -0400) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.37 Eric Miao (1): ASoC: fix the building issue of missing codec field in 'struct snd_soc_card' This is a clearly focused build fix. I'll do a merge up of 2.6.37-rc1 once this is pulled if that's OK? sound/soc/pxa/tosa.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

2 1

[alsa-devel] [PATCH] mfd: Add initial WM8958 support
by Mark Brown 02 Nov '10

02 Nov '10

The WM8958 is a derivative of the WM8994 which is register compatible with the addition of some extra features, mostly in the CODEC side. The major change visible at the MFD level is that rather than a single DBVDD supply we now have three separate DBVDDs so we must request and enable a different set of supplies. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- Since subsequent CODEC patches will depend on this I'd like to merge via ASoC if possible. drivers/mfd/wm8994-core.c | 93 +++++++++++++++++++++++++++++++-------- include/linux/mfd/wm8994/core.h | 8 +++ 2 files changed, 82 insertions(+), 19 deletions(-) diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c index b3b2aaf..8d221ba 100644 --- a/drivers/mfd/wm8994-core.c +++ b/drivers/mfd/wm8994-core.c @@ -218,6 +218,18 @@ static const char *wm8994_main_supplies[] = { "SPKVDD2", }; +static const char *wm8958_main_supplies[] = { + "DBVDD1", + "DBVDD2", + "DBVDD3", + "DCVDD", + "AVDD1", + "AVDD2", + "CPVDD", + "SPKVDD1", + "SPKVDD2", +}; + #ifdef CONFIG_PM static int wm8994_device_suspend(struct device *dev) { @@ -239,7 +251,7 @@ static int wm8994_device_suspend(struct device *dev) if (ret < 0) dev_err(dev, "Failed to save LDO registers: %d\n", ret); - ret = regulator_bulk_disable(ARRAY_SIZE(wm8994_main_supplies), + ret = regulator_bulk_disable(wm8994->num_supplies, wm8994->supplies); if (ret != 0) { dev_err(dev, "Failed to disable supplies: %d\n", ret); @@ -254,7 +266,7 @@ static int wm8994_device_resume(struct device *dev) struct wm8994 *wm8994 = dev_get_drvdata(dev); int ret; - ret = regulator_bulk_enable(ARRAY_SIZE(wm8994_main_supplies), + ret = regulator_bulk_enable(wm8994->num_supplies, wm8994->supplies); if (ret != 0) { dev_err(dev, "Failed to enable supplies: %d\n", ret); @@ -305,9 +317,10 @@ static int wm8994_ldo_in_use(struct wm8994_pdata *pdata, int ldo) /* * Instantiate the generic non-control parts of the device. */ -static int wm8994_device_init(struct wm8994 *wm8994, unsigned long id, int irq) +static int wm8994_device_init(struct wm8994 *wm8994, int irq) { struct wm8994_pdata *pdata = wm8994->dev->platform_data; + const char *devname; int ret, i; mutex_init(&wm8994->io_lock); @@ -323,25 +336,48 @@ static int wm8994_device_init(struct wm8994 *wm8994, unsigned long id, int irq) goto err; } + switch (wm8994->type) { + case WM8994: + wm8994->num_supplies = ARRAY_SIZE(wm8994_main_supplies); + break; + case WM8958: + wm8994->num_supplies = ARRAY_SIZE(wm8958_main_supplies); + break; + default: + BUG(); + return -EINVAL; + } + wm8994->supplies = kzalloc(sizeof(struct regulator_bulk_data) * - ARRAY_SIZE(wm8994_main_supplies), + wm8994->num_supplies, GFP_KERNEL); if (!wm8994->supplies) { ret = -ENOMEM; goto err; } - for (i = 0; i < ARRAY_SIZE(wm8994_main_supplies); i++) - wm8994->supplies[i].supply = wm8994_main_supplies[i]; - - ret = regulator_bulk_get(wm8994->dev, ARRAY_SIZE(wm8994_main_supplies), + switch (wm8994->type) { + case WM8994: + for (i = 0; i < ARRAY_SIZE(wm8994_main_supplies); i++) + wm8994->supplies[i].supply = wm8994_main_supplies[i]; + break; + case WM8958: + for (i = 0; i < ARRAY_SIZE(wm8958_main_supplies); i++) + wm8994->supplies[i].supply = wm8958_main_supplies[i]; + break; + default: + BUG(); + return -EINVAL; + } + + ret = regulator_bulk_get(wm8994->dev, wm8994->num_supplies, wm8994->supplies); if (ret != 0) { dev_err(wm8994->dev, "Failed to get supplies: %d\n", ret); goto err_supplies; } - ret = regulator_bulk_enable(ARRAY_SIZE(wm8994_main_supplies), + ret = regulator_bulk_enable(wm8994->num_supplies, wm8994->supplies); if (ret != 0) { dev_err(wm8994->dev, "Failed to enable supplies: %d\n", ret); @@ -353,7 +389,22 @@ static int wm8994_device_init(struct wm8994 *wm8994, unsigned long id, int irq) dev_err(wm8994->dev, "Failed to read ID register\n"); goto err_enable; } - if (ret != 0x8994) { + switch (ret) { + case 0x8994: + devname = "WM8994"; + if (wm8994->type != WM8994) + dev_warn(wm8994->dev, "Device registered as type %d\n", + wm8994->type); + wm8994->type = WM8994; + break; + case 0x8958: + devname = "WM8958"; + if (wm8994->type != WM8958) + dev_warn(wm8994->dev, "Device registered as type %d\n", + wm8994->type); + wm8994->type = WM8958; + break; + default: dev_err(wm8994->dev, "Device is not a WM8994, ID is %x\n", ret); ret = -EINVAL; @@ -370,14 +421,16 @@ static int wm8994_device_init(struct wm8994 *wm8994, unsigned long id, int irq) switch (ret) { case 0: case 1: - dev_warn(wm8994->dev, "revision %c not fully supported\n", - 'A' + ret); + if (wm8994->type == WM8994) + dev_warn(wm8994->dev, + "revision %c not fully supported\n", + 'A' + ret); break; default: - dev_info(wm8994->dev, "revision %c\n", 'A' + ret); break; } + dev_info(wm8994->dev, "%s revision %c\n", devname, 'A' + ret); if (pdata) { wm8994->irq_base = pdata->irq_base; @@ -423,10 +476,10 @@ static int wm8994_device_init(struct wm8994 *wm8994, unsigned long id, int irq) err_irq: wm8994_irq_exit(wm8994); err_enable: - regulator_bulk_disable(ARRAY_SIZE(wm8994_main_supplies), + regulator_bulk_disable(wm8994->num_supplies, wm8994->supplies); err_get: - regulator_bulk_free(ARRAY_SIZE(wm8994_main_supplies), wm8994->supplies); + regulator_bulk_free(wm8994->num_supplies, wm8994->supplies); err_supplies: kfree(wm8994->supplies); err: @@ -439,9 +492,9 @@ static void wm8994_device_exit(struct wm8994 *wm8994) { mfd_remove_devices(wm8994->dev); wm8994_irq_exit(wm8994); - regulator_bulk_disable(ARRAY_SIZE(wm8994_main_supplies), + regulator_bulk_disable(wm8994->num_supplies, wm8994->supplies); - regulator_bulk_free(ARRAY_SIZE(wm8994_main_supplies), wm8994->supplies); + regulator_bulk_free(wm8994->num_supplies, wm8994->supplies); kfree(wm8994->supplies); kfree(wm8994); } @@ -506,8 +559,9 @@ static int wm8994_i2c_probe(struct i2c_client *i2c, wm8994->read_dev = wm8994_i2c_read_device; wm8994->write_dev = wm8994_i2c_write_device; wm8994->irq = i2c->irq; + wm8994->type = id->driver_data; - return wm8994_device_init(wm8994, id->driver_data, i2c->irq); + return wm8994_device_init(wm8994, i2c->irq); } static int wm8994_i2c_remove(struct i2c_client *i2c) @@ -535,7 +589,8 @@ static int wm8994_i2c_resume(struct i2c_client *i2c) #endif static const struct i2c_device_id wm8994_i2c_id[] = { - { "wm8994", 0 }, + { "wm8994", WM8994 }, + { "wm8958", WM8958 }, { } }; MODULE_DEVICE_TABLE(i2c, wm8994_i2c_id); diff --git a/include/linux/mfd/wm8994/core.h b/include/linux/mfd/wm8994/core.h index de79bae..3fd3684 100644 --- a/include/linux/mfd/wm8994/core.h +++ b/include/linux/mfd/wm8994/core.h @@ -17,6 +17,11 @@ #include <linux/interrupt.h> +enum wm8994_type { + WM8994 = 0, + WM8958 = 1, +}; + struct regulator_dev; struct regulator_bulk_data; @@ -48,6 +53,8 @@ struct wm8994 { struct mutex io_lock; struct mutex irq_lock; + enum wm8994_type type; + struct device *dev; int (*read_dev)(struct wm8994 *wm8994, unsigned short reg, int bytes, void *dest); @@ -68,6 +75,7 @@ struct wm8994 { u16 gpio_regs[WM8994_NUM_GPIO_REGS]; struct regulator_dev *dbvdd; + int num_supplies; struct regulator_bulk_data *supplies; }; -- 1.7.1

2 2

[alsa-devel] ASoC updates for 2.6.37
by Mark Brown 02 Nov '10

02 Nov '10

The following changes since commit 89e1e66d6be8a520cdcd26043cda2cc870a34015: ALSA: usb-audio: automatically detect feedback format (2010-10-27 09:17:41 +0200) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.37 All minor and localised fixes with the exception of the patches from Jarkko which improve build test coverage. Jarkko Nikula (2): ASoC: Fix SND_SOC_ALL_CODECS typo for jz4740 ASoC: Include cx20442 to SND_SOC_ALL_CODECS Joe Perches (1): ASoC: Update WARN uses in wm_hubs Mark Brown (2): ASoC: Check return value of struct_strtoul() in pmdown_time_set() ASoC: Remove volatility from WM8900 POWER1 register sound/soc/codecs/Kconfig | 3 ++- sound/soc/codecs/wm8900.c | 6 ------ sound/soc/codecs/wm_hubs.c | 2 +- sound/soc/soc-core.c | 5 ++++- 4 files changed, 7 insertions(+), 9 deletions(-)

2 1

Re: [alsa-devel] [PATCH] AudioScience HPI driver: Unsafe memory management when allocating control cache
by Eliot Blennerhassett 02 Nov '10

02 Nov '10

On 30/10/10 08:35, Jesper Juhl wrote: > I noticed that sound/pci/asihpi/hpicmn.c::hpi_alloc_control_cache() does > not check the return value from kmalloc(), which may fail. > If kmalloc() fails we'll dereference a null pointer and things will go bad > fast. > There are two memory allocations in that function and there's also the > problem that the first may succeed and the second may fail and nothing is > done about that either which will also go wrong down the line. Thanks Jesper, your changes look fine. Acked-by: Eliot Blennerhassett <linux(a)audioscience.com>

2 1

[alsa-devel] iec958 and 24-bit audio
by pl bossart 01 Nov '10

01 Nov '10

When I try playing 24-bit audio files on my SPDIF output, I get this [alsa-lib]$ aplay -Diec958 file24bits.wav aplay: set_params:1059: Sample format non available Available formats: - S16_LE - S32_LE Is there an built-in assumption that the iec958 device can only take as input what the slave hardware device supports? The IEC subframes can convey 24 bit audio, and it's possible to insert the 24 bits starting from bit 4 when adding the preambles and status bits. What am I missing? Thanks, -Poerre

2 3

[alsa-devel] [PATCH 00/39] Cleanup WARN #defines
by Joe Perches 01 Nov '10

01 Nov '10

WARN uses sometimes use KERN_<level> but mostly don't have any prefix. Change the WARN macros and the warn_slowpath function to preface KERN_WARNING and remove all the KERN_<level> uses from WARN sites. Neatening clean up of include/asm-generic/bug.h Update WARN macros Add KERN_WARNING to WARN output Remove any KERN_<level> from WARN uses Coalesce formats Align WARN arguments Add some missing newlines to WARN uses Add some missing first test argument (1, fmt, args) to WARN uses Joe Perches (39): include/asm-generic/bug.h: Update WARN macros arch/alpha: Update WARN uses arch/arm: Update WARN uses arch/powerpc: Update WARN uses arch/x86: Update WARN uses drivers/acpi: Update WARN uses drivers/base: Update WARN uses drivers/block: Update WARN uses drivers/cpuidle: Update WARN uses drivers/firewire: Update WARN uses drivers/firmware: Update WARN uses drivers/gpio: Update WARN uses drivers/gpu/drm: Update WARN uses drivers/media/video: Update WARN uses drivers/mfd: Update WARN uses drivers/net/can: Update WARN uses drivers/net/usb: Update WARN uses drivers/net/wireless/iwlwifi: Update WARN uses drivers/regulator: Update WARN uses drivers/scsi/fcoe: Update WARN uses drivers/staging: Update WARN uses drivers/usb/musb: Update WARN uses drivers/video/omap2/dss: Update WARN uses fs/nfsd: Update WARN uses fs/notify/inotify: Update WARN uses fs/sysfs: Update WARN uses fs/proc: Update WARN uses fs: Update WARN uses include/linux/device.h: Update WARN uses kernel/irq: Update WARN uses kernel/panic.c: Update warn_slowpath to use %pV kernel: Update WARN uses lib: Update WARN uses mm: Update WARN uses net/core/dev.c: Update WARN uses net/ipv4/tcp.c: Update WARN uses net/mac80211: Update WARN uses net/rfkill/input.c: Update WARN uses sound/soc/codecs/wm_hubs.c: Update WARN uses arch/alpha/kernel/pci-sysfs.c | 14 ++-- arch/arm/mach-davinci/clock.c | 4 +- arch/arm/mach-davinci/da830.c | 2 +- arch/arm/mach-davinci/da850.c | 12 ++-- arch/arm/mach-omap2/clkt_clksel.c | 12 ++-- arch/arm/mach-omap2/clock.c | 16 ++-- arch/arm/mach-omap2/devices.c | 4 +- arch/arm/mach-omap2/omap_hwmod.c | 47 +++++++----- arch/arm/mach-omap2/pm34xx.c | 7 +- arch/arm/mach-omap2/serial.c | 2 +- arch/arm/mach-omap2/timer-gp.c | 3 +- arch/arm/mach-tegra/clock.c | 3 +- arch/arm/mach-tegra/timer.c | 2 +- arch/arm/mach-u300/padmux.c | 14 +--- arch/arm/plat-omap/omap-pm-noop.c | 10 ++-- arch/powerpc/kernel/hw_breakpoint.c | 4 +- arch/x86/kernel/acpi/boot.c | 2 +- arch/x86/kernel/apic/apic.c | 2 +- arch/x86/kernel/apic/es7000_32.c | 2 +- arch/x86/kernel/cpu/perf_event.c | 4 +- arch/x86/kernel/pci-calgary_64.c | 4 +- arch/x86/kernel/tsc_sync.c | 4 +- arch/x86/kernel/xsave.c | 2 +- arch/x86/mm/ioremap.c | 5 +- arch/x86/mm/pageattr-test.c | 2 +- arch/x86/mm/pageattr.c | 5 +- arch/x86/platform/sfi/sfi.c | 4 +- drivers/acpi/ec.c | 4 +- drivers/base/class.c | 4 +- drivers/base/core.c | 5 +- drivers/base/memory.c | 4 +- drivers/base/sys.c | 10 +-- drivers/block/floppy.c | 2 +- drivers/cpuidle/driver.c | 2 +- drivers/firewire/core-transaction.c | 6 +- drivers/firmware/dmi_scan.c | 2 +- drivers/gpio/gpiolib.c | 4 +- drivers/gpio/it8761e_gpio.c | 2 +- drivers/gpu/drm/drm_crtc_helper.c | 2 +- drivers/gpu/drm/i915/i915_gem.c | 3 +- drivers/gpu/drm/radeon/evergreen.c | 2 +- drivers/gpu/drm/radeon/r100.c | 4 +- drivers/gpu/drm/radeon/r300.c | 2 +- drivers/gpu/drm/radeon/r600.c | 4 +- drivers/gpu/drm/radeon/radeon_fence.c | 3 +- drivers/gpu/drm/radeon/radeon_ttm.c | 3 +- drivers/gpu/drm/radeon/rs400.c | 2 +- drivers/gpu/drm/radeon/rs600.c | 4 +- drivers/media/video/s5p-fimc/fimc-core.c | 2 +- drivers/media/video/sr030pc30.c | 2 +- drivers/mfd/ezx-pcap.c | 5 +- drivers/net/can/mscan/mscan.c | 2 +- drivers/net/usb/ipheth.c | 2 +- drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 3 +- drivers/net/wireless/iwlwifi/iwl-agn-sta.c | 6 +- drivers/net/wireless/iwlwifi/iwl-tx.c | 6 +- drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 +- drivers/regulator/core.c | 3 +- drivers/scsi/fcoe/libfcoe.c | 2 +- drivers/staging/memrar/memrar_allocator.c | 2 +- drivers/staging/solo6x10/solo6010-v4l2-enc.c | 2 +- drivers/usb/musb/musb_host.c | 6 +- drivers/video/omap2/dss/core.c | 3 +- fs/bio.c | 2 +- fs/buffer.c | 2 +- fs/nfsd/nfs4state.c | 3 +- fs/notify/inotify/inotify_fsnotify.c | 4 +- fs/proc/generic.c | 9 +-- fs/super.c | 5 +- fs/sysfs/dir.c | 3 +- fs/sysfs/file.c | 4 +- fs/sysfs/group.c | 4 +- fs/sysfs/symlink.c | 10 +-- include/asm-generic/bug.h | 101 ++++++++++++++++---------- include/linux/device.h | 2 +- kernel/irq/chip.c | 2 +- kernel/irq/manage.c | 2 +- kernel/notifier.c | 2 +- kernel/panic.c | 40 +++++------ kernel/pm_qos_params.c | 6 +- lib/debugobjects.c | 21 +++--- lib/iomap.c | 2 +- lib/kobject.c | 9 +-- lib/kobject_uevent.c | 4 +- lib/list_debug.c | 24 +++---- lib/plist.c | 12 ++-- mm/percpu.c | 4 +- mm/vmalloc.c | 5 +- net/core/dev.c | 3 +- net/ipv4/tcp.c | 16 ++--- net/mac80211/agg-tx.c | 5 +- net/mac80211/iface.c | 4 +- net/mac80211/mlme.c | 2 +- net/mac80211/rx.c | 4 +- net/mac80211/tx.c | 4 +- net/mac80211/util.c | 4 +- net/mac80211/work.c | 4 +- net/rfkill/input.c | 5 +- sound/soc/codecs/wm_hubs.c | 2 +- 99 files changed, 319 insertions(+), 330 deletions(-) -- 1.7.3.1.g432b3.dirty

2 2

Re: [alsa-devel] [PATCH] cs46xx memory management fixes for cs46xx_dsp_spos_create() - make sure we free and don't do pointless work.
by Ondrej Zary 01 Nov '10

01 Nov '10

On Saturday 30 October 2010 00:18:57 Benny Sjöstrand wrote: > Hello again! > > Just doing a reply-all. > It's has been many years since I did anything to the cs46xx driver, so > I'm wondering > if there's anyone out there still using a cs46xx sound card? > I think the changes look's correct, but I can't test it, I do not have a > cs46xx hardware anymore. Sure, there are many of these cards "out there". I just got a "new" Terratec DMX Xfire 1024 (CS4624). I'll test the patch. > > /Benny > > Jesper Juhl wrote: > > Hi, > > > > When reading through sound/pci/cs46xx/dsp_spos.c I noticed a couple of > > things in cs46xx_dsp_spos_create(). > > > > It seems to me that we don't always free the various memory buffers we > > allocate and we also do some work (structure member assignment) early, > > that is completely pointless if some of the memory allocations fail and > > we end up just aborting the whole thing. > > > > I don't have hardware to test, so the patch below is compile tested only, > > but it makes the following changes: > > > > - Make sure we always free all allocated memory on failures. > > - Don't do pointless work assigning to structure members before we know > > all memory allocations, that may abort progress, have completed > > successfully. > > - Remove some trailing whitespace. > > > > If it looks ok, please merge, otherwise I'd be interested in knowing > > what's wrong so I can improve it. > > > > > > Signed-off-by: Jesper Juhl <jj(a)chaosbits.net> > > --- > > dsp_spos.c | 33 +++++++++++---------------------- > > 1 file changed, 11 insertions(+), 22 deletions(-) > > > > diff --git a/sound/pci/cs46xx/dsp_spos.c b/sound/pci/cs46xx/dsp_spos.c > > index 3e5ca8f..e377287 100644 > > --- a/sound/pci/cs46xx/dsp_spos.c > > +++ b/sound/pci/cs46xx/dsp_spos.c > > @@ -225,39 +225,25 @@ struct dsp_spos_instance *cs46xx_dsp_spos_create > > (struct snd_cs46xx * chip) { > > struct dsp_spos_instance * ins = kzalloc(sizeof(struct > > dsp_spos_instance), GFP_KERNEL); > > > > - if (ins == NULL) > > + if (ins == NULL) > > return NULL; > > > > /* better to use vmalloc for this big table */ > > - ins->symbol_table.nsymbols = 0; > > ins->symbol_table.symbols = vmalloc(sizeof(struct dsp_symbol_entry) * > > DSP_MAX_SYMBOLS); > > - ins->symbol_table.highest_frag_index = 0; > > - > > - if (ins->symbol_table.symbols == NULL) { > > + ins->code.data = kmalloc(DSP_CODE_BYTE_SIZE, GFP_KERNEL); > > + ins->modules = kmalloc(sizeof(struct dsp_module_desc) * > > DSP_MAX_MODULES, GFP_KERNEL); + if (!ins->symbol_table.symbols || > > !ins->code.data || !ins->modules) { cs46xx_dsp_spos_destroy(chip); > > goto error; > > } > > - > > + ins->symbol_table.nsymbols = 0; > > + ins->symbol_table.highest_frag_index = 0; > > ins->code.offset = 0; > > ins->code.size = 0; > > - ins->code.data = kmalloc(DSP_CODE_BYTE_SIZE, GFP_KERNEL); > > - > > - if (ins->code.data == NULL) { > > - cs46xx_dsp_spos_destroy(chip); > > - goto error; > > - } > > - > > ins->nscb = 0; > > ins->ntask = 0; > > - > > ins->nmodules = 0; > > - ins->modules = kmalloc(sizeof(struct dsp_module_desc) * > > DSP_MAX_MODULES, GFP_KERNEL); - > > - if (ins->modules == NULL) { > > - cs46xx_dsp_spos_destroy(chip); > > - goto error; > > - } > > > > /* default SPDIF input sample rate > > to 48000 khz */ > > @@ -271,8 +257,8 @@ struct dsp_spos_instance *cs46xx_dsp_spos_create > > (struct snd_cs46xx * chip) > > > > /* set left and right validity bits and > > default channel status */ > > - ins->spdif_csuv_default = > > - ins->spdif_csuv_stream = > > + ins->spdif_csuv_default = > > + ins->spdif_csuv_stream = > > /* byte 0 */ ((unsigned int)_wrap_all_bits( > > (SNDRV_PCM_DEFAULT_CON_SPDIF & 0xff)) << 24) | /* byte 1 */ > > ((unsigned int)_wrap_all_bits( ((SNDRV_PCM_DEFAULT_CON_SPDIF >> 8) & > > 0xff)) << 16) | /* byte 3 */ (unsigned int)_wrap_all_bits( > > (SNDRV_PCM_DEFAULT_CON_SPDIF >> 24) & 0xff) | @@ -281,6 +267,9 @@ struct > > dsp_spos_instance *cs46xx_dsp_spos_create (struct snd_cs46xx * chip) > > return ins; > > > > error: > > + kfree(ins->modules); > > + kfree(ins->code.data); > > + vfree(ins->symbol_table.symbols); > > kfree(ins); > > return NULL; > > } > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo(a)vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- Ondrej Zary

3 4

[alsa-devel] [RFC_iv/iv 1/1] ASoC: Add optional name_prefix to struct snd_soc_dev_map
by Jarkko Nikula 01 Nov '10

01 Nov '10

There is a need to prefix codec kcontrol, widget and internal route names in an ASoC machine that has multiple codecs with conflicting names. The name collision would occur when codec drivers try to registering kcontrols with the same name or when building the audio paths between codecs. This patch solves the issue by introducing optional name_prefix field to struct snd_soc_dev_map that machine drivers can specify. ASoC core then uses that prefix for prefixing names for codec kcontrols, widgets and codec internal routes. Following example illustrates how two same codec instances are registered in a machine driver. The name collision is avoided by specifying a name prefix for the second codec. That prefix is then used in audio map that connects output of first codec to the input of second and output of second codec to a machine widget. static const struct snd_soc_dapm_route map0[] = { {"Spk", NULL, "MONO"}, }; static const struct snd_soc_dapm_route map1[] = { {"foo LINEIN", NULL, "MONO"}, {"Vibra", NULL, "foo MONO"}, }; static struct snd_soc_dev_map bar_dev[] = { { ... .codec_name = "simple-codec.0", .init = bar_codec0_init, ... }, { ... .codec_name = "simple-codec.1", .init = bar_codec1_init, .name_prefix = "foo", ... }, }; Signed-off-by: Jarkko Nikula <jhnikula(a)gmail.com> --- include/sound/soc.h | 4 ++++ sound/soc/soc-core.c | 16 ++++++++++++++-- sound/soc/soc-dapm.c | 34 ++++++++++++++++++++++++++++++++-- 3 files changed, 50 insertions(+), 4 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 17f985c..18de502 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -424,6 +424,7 @@ struct snd_soc_ops { /* SoC Audio Codec device */ struct snd_soc_codec { const char *name; + const char *name_prefix; int id; struct device *dev; struct snd_soc_codec_driver *driver; @@ -547,6 +548,9 @@ struct snd_soc_dev_map { /* machine stream operations */ struct snd_soc_ops *ops; + + /* optional name prefix for kcontrols and widgets */ + const char *name_prefix; }; /* SoC card */ diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index b904a20..2c9b6ef 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1416,6 +1416,7 @@ static int soc_probe_dev_map(struct snd_soc_card *card, int num) /* probe the CODEC */ if (!codec->probed) { codec->dapm->card = card; + codec->name_prefix = dev_map->name_prefix; if (codec->driver->probe) { ret = codec->driver->probe(codec); if (ret < 0) { @@ -1469,11 +1470,14 @@ static int soc_probe_dev_map(struct snd_soc_card *card, int num) /* now that all clients have probed, initialise the DAI link */ if (dev_map->init) { + /* machine controls, routes and widgets are not prefixed */ + rtd->codec->name_prefix = NULL; ret = dev_map->init(rtd); if (ret < 0) { printk(KERN_ERR "asoc: failed to init %s\n", dev_map->stream_name); return ret; } + rtd->codec->name_prefix = dev_map->name_prefix; } /* Make sure all DAPM widgets are instantiated */ @@ -2030,14 +2034,22 @@ int snd_soc_add_controls(struct snd_soc_codec *codec, const struct snd_kcontrol_new *controls, int num_controls) { struct snd_card *card = codec->card->snd_card; + char prefixed_name[44], *name; int err, i; for (i = 0; i < num_controls; i++) { const struct snd_kcontrol_new *control = &controls[i]; - err = snd_ctl_add(card, snd_soc_cnew(control, codec, NULL)); + if (codec->name_prefix) { + snprintf(prefixed_name, sizeof(prefixed_name), "%s %s", + codec->name_prefix, control->name); + name = prefixed_name; + } else { + name = control->name; + } + err = snd_ctl_add(card, snd_soc_cnew(control, codec, name)); if (err < 0) { dev_err(codec->dev, "%s: Failed to add %s: %d\n", - codec->name, control->name, err); + codec->name, name, err); return err; } } diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 2bccc9d..34bc7a8 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -1291,6 +1291,7 @@ static void dapm_free_widgets(struct snd_soc_dapm_context *dapm) kfree(p->long_name); kfree(p); } + kfree(w->name); kfree(w); } } @@ -1339,11 +1340,25 @@ static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm, struct snd_soc_dapm_path *path; struct snd_soc_dapm_widget *wsource = NULL, *wsink = NULL, *w; struct snd_soc_dapm_widget *wtsource = NULL, *wtsink = NULL; - const char *sink = route->sink; + const char *sink; const char *control = route->control; - const char *source = route->source; + const char *source; + char prefixed_sink[80]; + char prefixed_source[80]; int ret = 0; + if (dapm->codec->name_prefix) { + snprintf(prefixed_sink, sizeof(prefixed_sink), "%s %s", + dapm->codec->name_prefix, route->sink); + sink = prefixed_sink; + snprintf(prefixed_source, sizeof(prefixed_source), "%s %s", + dapm->codec->name_prefix, route->source); + source = prefixed_source; + } else { + sink = route->sink; + source = route->source; + } + /* * find src and dest widgets over all widgets but favor a widget from * current DAPM context @@ -1983,10 +1998,25 @@ int snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, const struct snd_soc_dapm_widget *widget) { struct snd_soc_dapm_widget *w; + size_t name_len; if ((w = dapm_cnew_widget(widget)) == NULL) return -ENOMEM; + name_len = strlen(widget->name) + 1; + if (dapm->codec->name_prefix) + name_len += 1 + strlen(dapm->codec->name_prefix); + w->name = kmalloc(name_len, GFP_KERNEL); + if (w->name == NULL) { + kfree(w); + return -ENOMEM; + } + if (dapm->codec->name_prefix) + snprintf(w->name, name_len, "%s %s", + dapm->codec->name_prefix, widget->name); + else + snprintf(w->name, name_len, "%s", widget->name); + dapm->n_widgets++; w->dapm = dapm; w->codec = dapm->codec; -- 1.7.2.3

2 4

Re: [alsa-devel] [RFC_iii/iv 1/2] ASoC: Rename dai_link as dev_map
by Mark Brown 01 Nov '10

01 Nov '10

On Fri, Oct 29, 2010 at 03:02:59PM +0300, Jarkko Nikula wrote: > Thus far the struct snd_soc_dai_link is used to tie together platform, codec > and cpu dai drivers in a machine driver and all of these devices has been > required for a link. My main thought with this now that I see the change is that it'd be easier and probably clearer to add an explicit list of devices rather than to repurpose the DAI links. This will probably be simpler since we can avoid things like having to work out if we've seen and initialised a device before when it has multiple DAIs involved.

2 2

[alsa-devel] [RFC_ii/iv 1/3] ASoC: Move DAPM paths from DAPM context to snd_soc_card
by Jarkko Nikula 01 Nov '10

01 Nov '10

Decoupling DAPM paths from DAPM context is a first prerequisite when extending ASoC core to cross-device paths. This patch is almost a nullop and does not allow to construct cross-device setup but the path clean-up part in dapm_free_widgets is prepared to remove cross-device paths between a device being removed and others. Signed-off-by: Jarkko Nikula <jhnikula(a)gmail.com> --- include/sound/soc-dapm.h | 2 +- include/sound/soc.h | 2 + sound/soc/codecs/tlv320aic3x.c | 2 +- sound/soc/soc-core.c | 3 +- sound/soc/soc-dapm.c | 41 ++++++++++++++++++++++++++------------- 5 files changed, 33 insertions(+), 17 deletions(-) diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index c6dd14a..29b6808 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -466,7 +466,6 @@ struct snd_soc_dapm_widget { struct snd_soc_dapm_context { u32 pop_time; struct list_head widgets; - struct list_head paths; enum snd_soc_bias_level bias_level; enum snd_soc_bias_level suspend_bias_level; struct delayed_work delayed_work; @@ -474,6 +473,7 @@ struct snd_soc_dapm_context { struct device *dev; /* from parent - for debug */ struct snd_soc_codec *codec; /* parent codec */ + struct snd_soc_card *card; /* parent card */ #ifdef CONFIG_DEBUG_FS struct dentry *debugfs_dapm; #endif diff --git a/include/sound/soc.h b/include/sound/soc.h index 4bbd65f..4e3f0e5 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -589,6 +589,8 @@ struct snd_soc_card { struct list_head codec_dev_list; struct list_head platform_dev_list; struct list_head dai_dev_list; + + struct list_head paths; }; /* SoC machine DAI configuration, glues a codec and cpu DAI together */ diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index d007e05..25b2517 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c @@ -183,7 +183,7 @@ static int snd_soc_dapm_put_volsw_aic3x(struct snd_kcontrol *kcontrol, if (snd_soc_test_bits(widget->codec, reg, val_mask, val)) { /* find dapm widget path assoc with kcontrol */ - list_for_each_entry(path, &widget->dapm->paths, list) { + list_for_each_entry(path, &widget->dapm->card->paths, list) { if (path->kcontrol != kcontrol) continue; diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 3c1c2ac..010728a 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1406,6 +1406,7 @@ static int soc_probe_dai_link(struct snd_soc_card *card, int num) /* probe the CODEC */ if (!codec->probed) { + codec->dapm->card = card; if (codec->driver->probe) { ret = codec->driver->probe(codec); if (ret < 0) { @@ -1662,6 +1663,7 @@ static int soc_probe(struct platform_device *pdev) INIT_LIST_HEAD(&card->dai_dev_list); INIT_LIST_HEAD(&card->codec_dev_list); INIT_LIST_HEAD(&card->platform_dev_list); + INIT_LIST_HEAD(&card->paths); ret = snd_soc_register_card(card); if (ret != 0) { @@ -2964,7 +2966,6 @@ static struct snd_soc_dapm_context *soc_new_dapm_context(struct device *dev) dapm = kzalloc(sizeof(struct snd_soc_dapm_context), GFP_KERNEL); if (dapm) { INIT_LIST_HEAD(&dapm->widgets); - INIT_LIST_HEAD(&dapm->paths); dapm->bias_level = SND_SOC_BIAS_OFF; dapm->dev = dev; } diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index cee0c96..62d3e0c 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -251,7 +251,7 @@ static int dapm_connect_mux(struct snd_soc_dapm_context *dapm, for (i = 0; i < e->max; i++) { if (!(strcmp(control_name, e->texts[i]))) { - list_add(&path->list, &dapm->paths); + list_add(&path->list, &dapm->card->paths); list_add(&path->list_sink, &dest->sources); list_add(&path->list_source, &src->sinks); path->name = (char*)e->texts[i]; @@ -273,7 +273,7 @@ static int dapm_connect_mixer(struct snd_soc_dapm_context *dapm, /* search for mixer kcontrol */ for (i = 0; i < dest->num_kcontrols; i++) { if (!strcmp(control_name, dest->kcontrols[i].name)) { - list_add(&path->list, &dapm->paths); + list_add(&path->list, &dapm->card->paths); list_add(&path->list_sink, &dest->sources); list_add(&path->list_source, &src->sinks); path->name = dest->kcontrols[i].name; @@ -429,7 +429,7 @@ static inline void dapm_clear_walk(struct snd_soc_dapm_context *dapm) { struct snd_soc_dapm_path *p; - list_for_each_entry(p, &dapm->paths, list) + list_for_each_entry(p, &dapm->card->paths, list) p->walked = 0; } @@ -1133,7 +1133,7 @@ static int dapm_mux_update_power(struct snd_soc_dapm_widget *widget, return 0; /* find dapm widget path assoc with kcontrol */ - list_for_each_entry(path, &widget->dapm->paths, list) { + list_for_each_entry(path, &widget->dapm->card->paths, list) { if (path->kcontrol != kcontrol) continue; @@ -1167,7 +1167,7 @@ static int dapm_mixer_update_power(struct snd_soc_dapm_widget *widget, return -ENODEV; /* find dapm widget path assoc with kcontrol */ - list_for_each_entry(path, &widget->dapm->paths, list) { + list_for_each_entry(path, &widget->dapm->card->paths, list) { if (path->kcontrol != kcontrol) continue; @@ -1257,14 +1257,27 @@ static void dapm_free_widgets(struct snd_soc_dapm_context *dapm) list_for_each_entry_safe(w, next_w, &dapm->widgets, list) { list_del(&w->list); + /* + * remove source and sink paths associated to this widget. + * While removing the path, remove reference to it from both + * source and sink widgets so that path is removed only once. + */ + list_for_each_entry_safe(p, next_p, &w->sources, list_sink) { + list_del(&p->list_sink); + list_del(&p->list_source); + list_del(&p->list); + kfree(p->long_name); + kfree(p); + } + list_for_each_entry_safe(p, next_p, &w->sinks, list_source) { + list_del(&p->list_sink); + list_del(&p->list_source); + list_del(&p->list); + kfree(p->long_name); + kfree(p); + } kfree(w); } - - list_for_each_entry_safe(p, next_p, &dapm->paths, list) { - list_del(&p->list); - kfree(p->long_name); - kfree(p); - } } static int snd_soc_dapm_set_pin(struct snd_soc_dapm_context *dapm, @@ -1357,7 +1370,7 @@ static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm, /* connect static paths */ if (control == NULL) { - list_add(&path->list, &dapm->paths); + list_add(&path->list, &dapm->card->paths); list_add(&path->list_sink, &wsink->sources); list_add(&path->list_source, &wsource->sinks); path->connect = 1; @@ -1378,7 +1391,7 @@ static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm, case snd_soc_dapm_supply: case snd_soc_dapm_aif_in: case snd_soc_dapm_aif_out: - list_add(&path->list, &dapm->paths); + list_add(&path->list, &dapm->card->paths); list_add(&path->list_sink, &wsink->sources); list_add(&path->list_source, &wsource->sinks); path->connect = 1; @@ -1401,7 +1414,7 @@ static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm, case snd_soc_dapm_mic: case snd_soc_dapm_line: case snd_soc_dapm_spk: - list_add(&path->list, &dapm->paths); + list_add(&path->list, &dapm->card->paths); list_add(&path->list_sink, &wsink->sources); list_add(&path->list_source, &wsource->sinks); path->connect = 0; -- 1.7.2.3

2 7