July 2015 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH v3 00/13] alsa-lib topology support
by Liam Girdwood 31 Jul '15

31 Jul '15

This series adds support for parsing topology data text files and converting to the binary topology format accepted by the kernel. Changes since V2 :- o Added documentation in doxygen format describing API and text file format. o use SNDERR macro for error reporting. o Added text copy helper. o Make all parsed keywords lowercase o Assignment for some structure copies instead of memcpy(). o Fixed the private data parser to handle byte, short and word data. Changes since V1 :- o Terminate all strncpy() strings with NULL. o Use snd_pcm_format_value() instead of local lookup. o Set a maximum size for private data files. o Set capture/playback stream direction for new PCMs o Only set TLV access flags for TLV CTLs. Liam Girdwood (13): topology: uapi: Add UAPI headers for topology ABI topology: Add topology core parser. topology: Add text section parser. topology: Add PCM parser. topology: Add operations parser topology: Add private data parser topology: Add DAPM object parser topology: Add CTL parser topology: Add Channel map parser. topology: Add binary file builder. topology: autotools: Add build support for topology core topology: doxygen: Add doxygen support for topology core. conf: topology: Add topology file for broadwell audio DSP configure.ac | 11 +- doc/doxygen.cfg.in | 7 +- doc/index.doxygen | 1 + include/Makefile.am | 4 + include/sound/Makefile.am | 3 +- include/sound/asoc.h | 388 ++++++++++++++++++ include/sound/tlv.h | 23 ++ include/topology.h | 497 ++++++++++++++++++++++ src/Makefile.am | 7 + src/conf/Makefile.am | 2 +- src/conf/topology/Makefile.am | 1 + src/conf/topology/broadwell/Makefile.am | 4 + src/conf/topology/broadwell/broadwell.conf | 375 +++++++++++++++++ src/topology/Makefile.am | 19 + src/topology/builder.c | 327 +++++++++++++++ src/topology/channel.c | 122 ++++++ src/topology/ctl.c | 613 +++++++++++++++++++++++++++ src/topology/dapm.c | 562 +++++++++++++++++++++++++ src/topology/data.c | 396 ++++++++++++++++++ src/topology/elem.c | 187 +++++++++ src/topology/ops.c | 84 ++++ src/topology/parser.c | 359 ++++++++++++++++ src/topology/pcm.c | 639 +++++++++++++++++++++++++++++ src/topology/text.c | 88 ++++ src/topology/tplg_local.h | 234 +++++++++++ 25 files changed, 4948 insertions(+), 5 deletions(-) create mode 100644 include/sound/asoc.h create mode 100644 include/sound/tlv.h create mode 100644 include/topology.h create mode 100644 src/conf/topology/Makefile.am create mode 100644 src/conf/topology/broadwell/Makefile.am create mode 100644 src/conf/topology/broadwell/broadwell.conf create mode 100644 src/topology/Makefile.am create mode 100644 src/topology/builder.c create mode 100644 src/topology/channel.c create mode 100644 src/topology/ctl.c create mode 100644 src/topology/dapm.c create mode 100644 src/topology/data.c create mode 100644 src/topology/elem.c create mode 100644 src/topology/ops.c create mode 100644 src/topology/parser.c create mode 100644 src/topology/pcm.c create mode 100644 src/topology/text.c create mode 100644 src/topology/tplg_local.h -- 2.1.4

2 16

[alsa-devel] [PATCH v2 0/22] On-demand device probing
by Tomeu Vizoso 31 Jul '15

31 Jul '15

Hello, I have a problem with the panel on my Tegra Chromebook taking longer than expected to be ready during boot (Stéphane Marchesin reported what is basically the same issue in [0]), and have looked into ordered probing as a better way of solving this than moving nodes around in the DT or playing with initcall levels and linking order. While reading the thread [1] that Alexander Holler started with his series to make probing order deterministic, it occurred to me that it should be possible to achieve the same by probing devices as they are referenced by other devices. This basically reuses the information that is already implicit in the probe() implementations, saving us from refactoring existing drivers or adding information to DTBs. During review of v1 of this series Linus Walleij suggested that it should be the device driver core to make sure that dependencies are ready before probing a device. I gave this idea a try [2] but Mark Brown pointed out to the logic duplication between the resource acquisition and dependency discovery code paths (though I think it's fairly minor). To address that code duplication I experimented with Arnd's devm_probe [3] concept of having drivers declare their dependencies instead of acquiring them during probe, and while it worked [4], I don't think we end up winning anything when compared to just probing devices on-demand from resource getters. One remaining objection is to the "sprinkling" of calls to fwnode_ensure_device() in the resource getters of each subsystem, but I think it's the right thing to do given that the storage of resources is currently subsystem-specific. We could avoid the above by moving resource storage into the core, but I don't think there's a compelling case for that. I have tested this on boards with Tegra, iMX.6, Exynos and OMAP SoCs, and these patches were enough to eliminate all the deferred probes (except one in PandaBoard because omap_dma_system doesn't have a firmware node as of yet). With this series I get the kernel to output to the panel in 0.5s, instead of 2.8s. Regards, Tomeu [0] http://lists.freedesktop.org/archives/dri-devel/2014-August/066527.html [1] https://lkml.org/lkml/2014/5/12/452 [2] https://lkml.org/lkml/2015/6/17/305 [3] http://article.gmane.org/gmane.linux.ports.arm.kernel/277689 [4] https://lkml.org/lkml/2015/7/21/441 Changes in v2: - Move delay to platform.c - Use set_primary_fwnode() - Use of_node_full_name() - Move the logic for finding a platform device from its firmware node to of/platform.c as it's not needed for ACPI nodes. - Add acpi_dev_get_device() - Add fwnode_ensure_device() so the mechanism for probing devices on demand is independent of the firmware format. - Acquire regulator device lock before returning from regulator_dev_lookup() Tomeu Vizoso (22): platform: delay device-driver matches until late_initcall of/platform: Set fwnode field for new devices device property: add fwnode_get_name() of/platform: add of_platform_device_find() ACPI: add acpi_dev_get_device() device property: add fwnode_ensure_device() gpio: Probe GPIO drivers on demand gpio: Probe pinctrl devices on demand regulator: core: Reduce critical area in _regulator_get regulator: core: Probe regulators on demand drm: Probe panels on demand drm/tegra: Probe dpaux devices on demand i2c: core: Probe i2c master devices on demand pwm: Probe PWM chip devices on demand backlight: Probe backlight devices on demand usb: phy: Probe phy devices on demand clk: Probe clk providers on demand pinctrl: Probe pinctrl devices on demand phy: core: Probe phy providers on demand dma: of: Probe DMA controllers on demand power-supply: Probe power supplies on demand ASoC: core: Probe components on demand drivers/base/platform.c | 28 +++++++++++ drivers/base/property.c | 73 +++++++++++++++++++++++++++ drivers/clk/clk.c | 3 ++ drivers/dma/of-dma.c | 2 + drivers/gpio/gpiolib-of.c | 4 ++ drivers/gpu/drm/drm_panel.c | 2 + drivers/gpu/drm/tegra/dpaux.c | 2 + drivers/i2c/i2c-core.c | 2 + drivers/of/platform.c | 61 +++++++++++++++++++++++ drivers/phy/phy-core.c | 2 + drivers/pinctrl/devicetree.c | 1 + drivers/power/power_supply_core.c | 2 + drivers/pwm/core.c | 2 + drivers/regulator/core.c | 99 +++++++++++++++++++++---------------- drivers/usb/phy/phy.c | 2 + drivers/video/backlight/backlight.c | 2 + include/linux/acpi.h | 10 ++++ include/linux/of_platform.h | 1 + include/linux/property.h | 4 ++ sound/soc/soc-core.c | 6 ++- 20 files changed, 264 insertions(+), 44 deletions(-) -- 2.4.3

3 4

[alsa-devel] [PATCH] ASoC: cs4349: Fix up setting PWR_DWN bit
by Axel Lin 30 Jul '15

30 Jul '15

The PWR_DWN is Bit 7, so current code does not set the PWR_DWN bit. Fix it. Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- sound/soc/codecs/cs4349.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/cs4349.c b/sound/soc/codecs/cs4349.c index 852be85..0d010c2 100644 --- a/sound/soc/codecs/cs4349.c +++ b/sound/soc/codecs/cs4349.c @@ -326,7 +326,7 @@ static int cs4349_runtime_suspend(struct device *dev) struct cs4349_private *cs4349 = dev_get_drvdata(dev); int ret; - ret = regmap_update_bits(cs4349->regmap, CS4349_MISC, PWR_DWN, 1); + ret = regmap_update_bits(cs4349->regmap, CS4349_MISC, PWR_DWN, PWR_DWN); if (ret < 0) return ret; -- 2.1.0

3 2

[alsa-devel] [PATCH] ASoC: cs4349: Remove unneeded NULL test for cs4349->reset_gpio
by Axel Lin 30 Jul '15

30 Jul '15

It's safe to call gpiod_set_value_cansleep() with NULL desc. Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- sound/soc/codecs/cs4349.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/cs4349.c b/sound/soc/codecs/cs4349.c index a7538ae..852be85 100644 --- a/sound/soc/codecs/cs4349.c +++ b/sound/soc/codecs/cs4349.c @@ -300,8 +300,7 @@ static int cs4349_i2c_probe(struct i2c_client *client, if (IS_ERR(cs4349->reset_gpio)) return PTR_ERR(cs4349->reset_gpio); - if (cs4349->reset_gpio) - gpiod_set_value_cansleep(cs4349->reset_gpio, 1); + gpiod_set_value_cansleep(cs4349->reset_gpio, 1); i2c_set_clientdata(client, cs4349); @@ -316,8 +315,7 @@ static int cs4349_i2c_remove(struct i2c_client *client) snd_soc_unregister_codec(&client->dev); /* Hold down reset */ - if (cs4349->reset_gpio) - gpiod_set_value_cansleep(cs4349->reset_gpio, 0); + gpiod_set_value_cansleep(cs4349->reset_gpio, 0); return 0; } @@ -335,8 +333,7 @@ static int cs4349_runtime_suspend(struct device *dev) regcache_cache_only(cs4349->regmap, true); /* Hold down reset */ - if (cs4349->reset_gpio) - gpiod_set_value_cansleep(cs4349->reset_gpio, 0); + gpiod_set_value_cansleep(cs4349->reset_gpio, 0); return 0; } @@ -350,8 +347,7 @@ static int cs4349_runtime_resume(struct device *dev) if (ret < 0) return ret; - if (cs4349->reset_gpio) - gpiod_set_value_cansleep(cs4349->reset_gpio, 1); + gpiod_set_value_cansleep(cs4349->reset_gpio, 1); regcache_cache_only(cs4349->regmap, false); regcache_sync(cs4349->regmap); -- 2.1.0

3 2

[alsa-devel] [PATCH] ASoC: cs4349: Fix setting digital interface format
by Axel Lin 30 Jul '15

30 Jul '15

Mode Control - Register 02h Digital Interface Format (DIF[2:0]) Bits 6-4 DIF2 DIF1 DIF0 Description 0 0 0 Left-Justified, up to 24-bit data 0 0 1 I²S, up to 24-bit data 0 1 0 Right-Justified, 16-bit data 0 1 1 Right-Justified, 24-bit data 1 0 0 TDM slot 0 1 0 1 TDM slot 1 1 1 0 TDM slot 2 1 1 1 TDM slot 3 The DIF_MASK is 0x70, so current code does not correctly set the DIFx setting. Fix it. Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- I assume the path "ASoC: cs4349: Don't use rtd->codec" will be applied first, so this patch is on top of that patch. sound/soc/codecs/cs4349.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/cs4349.c b/sound/soc/codecs/cs4349.c index 7f5c3c70..989289d 100644 --- a/sound/soc/codecs/cs4349.c +++ b/sound/soc/codecs/cs4349.c @@ -98,17 +98,16 @@ static int cs4349_pcm_hw_params(struct snd_pcm_substream *substream, { struct snd_soc_codec *codec = dai->codec; struct cs4349_private *cs4349 = snd_soc_codec_get_drvdata(codec); - int mode, fmt, ret; + int fmt, ret; - mode = snd_soc_read(codec, CS4349_MODE); cs4349->rate = params_rate(params); switch (cs4349->mode) { case SND_SOC_DAIFMT_I2S: - mode |= MODE_FORMAT(DIF_I2S); + fmt = DIF_I2S; break; case SND_SOC_DAIFMT_LEFT_J: - mode |= MODE_FORMAT(DIF_LEFT_JST); + fmt = DIF_LEFT_JST; break; case SND_SOC_DAIFMT_RIGHT_J: switch (params_width(params)) { @@ -121,13 +120,13 @@ static int cs4349_pcm_hw_params(struct snd_pcm_substream *substream, default: return -EINVAL; } - mode |= MODE_FORMAT(fmt); break; default: return -EINVAL; } - ret = snd_soc_write(codec, CS4349_MODE, mode); + ret = snd_soc_update_bits(codec, CS4349_MODE, DIF_MASK, + MODE_FORMAT(fmt)); if (ret < 0) return ret; -- 2.1.0

3 2

[alsa-devel] [RFC][PATCH] ALSA: control: ensure returning from blocked system-call after closing
by Takashi Sakamoto 30 Jul '15

30 Jul '15

Some operations with blocking flag for ALSA control character devices don't return to userspace when closing a file descriptor corresponding to the character device. I think this is a bug of ALSA core. While, I find no resources to assist this aspect. In a manual of close(2)/read(2), there'no description about it. On SUSv2, there's descriptions for pipe or FIFO for this behaviour, while nothing for character devices. On Linux kernel documentation, I cannot find this kind of explaination. Thus, I just stand on my experiences to use these operations for files on filesystems, sockets and virtual character devices. It may merely be due to my misunderstanding. Well, additionally, in unsubscribed state, read operation for the character device returns with EBADFD. On the other hand, in subscribed state and once the operations are going to be blocked, they don't return to userspace even if any unsubscribe ioctl(2) operations are executed. This losts a consistency about the actual effects of unsubscribe operation. It's my pleasure to discuss about these bugs (and my patch candidate to fix them). You can see these bugs with this sample program. = Sample program = #include <stdio.h> #include <stdlib.h> #include <errno.h> #include <string.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> #include <unistd.h> #include <sys/ioctl.h> #include <sound/asound.h> #include <pthread.h> static void *thread_run(void *arg) { int fd = *(int *)arg; char buf[512] = {}; while (read(fd, buf, sizeof(buf)) >= 0) ; return (void *)NULL; } int main(int argc, char *argv[]) { pthread_t thread = pthread_self(); int fd; int subscribe; fd = open("/dev/snd/controlC0", O_RDONLY); if (fd < 0) { printf("%s\n", strerror(errno)); return EXIT_FAILURE; } subscribe = 1; if (ioctl(fd, SNDRV_CTL_IOCTL_SUBSCRIBE_EVENTS, &subscribe) < 0) { printf("%s\n", strerror(errno)); close(fd); return EXIT_FAILURE; } if (pthread_create(&thread, NULL, thread_run, (void *)&fd) < 0) { printf("%s\n", strerror(errno)); close(fd); return EXIT_FAILURE; } sleep(1); if (argc == 1) { close(fd); } else { subscribe = 0; if (ioctl(fd, SNDRV_CTL_IOCTL_SUBSCRIBE_EVENTS, &subscribe) < 0) { printf("%s\n", strerror(errno)); close(fd); return EXIT_FAILURE; } } /* Here, I expect blocking state of read(2) should be released. But... */ pthread_join(thread, NULL); return EXIT_SUCCESS; } Takashi Sakamoto (1): ALSA: control: add .flush operation to release blocking operation sound/core/control.c | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) -- 2.1.4

3 4

[alsa-devel] [PATCH 1/2] ASoC: cs4349: Fix suspend/resume
by Lars-Peter Clausen 30 Jul '15

30 Jul '15

dev_get_drvdata() will not return the snd_soc_runtime to which this CODEC is attached, so the current code will result in undefined behavior. To fix this just use regmap_update_bits(cs4349->regmap, ...) directly instead of snd_soc_update_bits(rtd->codec, ...). Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> --- sound/soc/codecs/cs4349.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/cs4349.c b/sound/soc/codecs/cs4349.c index a8df8a74..db18799 100644 --- a/sound/soc/codecs/cs4349.c +++ b/sound/soc/codecs/cs4349.c @@ -328,10 +328,9 @@ static int cs4349_i2c_remove(struct i2c_client *client) static int cs4349_runtime_suspend(struct device *dev) { struct cs4349_private *cs4349 = dev_get_drvdata(dev); - struct snd_soc_pcm_runtime *rtd = dev_get_drvdata(dev); int ret; - ret = snd_soc_update_bits(rtd->codec, CS4349_MISC, PWR_DWN, 1); + ret = regmap_update_bits(cs4349->regmap, CS4349_MISC, PWR_DWN, 1); if (ret < 0) return ret; @@ -347,10 +346,9 @@ static int cs4349_runtime_suspend(struct device *dev) static int cs4349_runtime_resume(struct device *dev) { struct cs4349_private *cs4349 = dev_get_drvdata(dev); - struct snd_soc_pcm_runtime *rtd = dev_get_drvdata(dev); int ret; - ret = snd_soc_update_bits(rtd->codec, CS4349_MISC, PWR_DWN, 0); + ret = regmap_update_bits(cs4349->regmap, CS4349_MISC, PWR_DWN, 0); if (ret < 0) return ret; -- 2.1.4

3 4

[alsa-devel] [PATCH 1/2] ASoC: cs4349: Set .writeable_reg for cs4349_regmap
by Axel Lin 30 Jul '15

30 Jul '15

The first valid register index is 1 rather than 0, and the CS4349_CHIPID is readonly. So set .writeable_reg to avoid writing to these registers. Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- sound/soc/codecs/cs4349.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/cs4349.c b/sound/soc/codecs/cs4349.c index f4fccc6..eb55889 100644 --- a/sound/soc/codecs/cs4349.c +++ b/sound/soc/codecs/cs4349.c @@ -54,14 +54,17 @@ struct cs4349_private { static bool cs4349_readable_register(struct device *dev, unsigned int reg) { switch (reg) { - case CS4349_CHIPID: - case CS4349_MODE: - case CS4349_VMI: - case CS4349_MUTE: - case CS4349_VOLA: - case CS4349_VOLB: - case CS4349_RMPFLT: - case CS4349_MISC: + case CS4349_CHIPID ... CS4349_MISC: + return true; + default: + return false; + } +} + +static bool cs4349_writeable_register(struct device *dev, unsigned int reg) +{ + switch (reg) { + case CS4349_MODE ... CS4349_MISC: return true; default: return false; @@ -272,6 +275,7 @@ static const struct regmap_config cs4349_regmap = { .reg_defaults = cs4349_reg_defaults, .num_reg_defaults = ARRAY_SIZE(cs4349_reg_defaults), .readable_reg = cs4349_readable_register, + .writeable_reg = cs4349_writeable_register, .cache_type = REGCACHE_RBTREE, }; -- 2.1.0

3 4

[alsa-devel] [PATCH] ALSA: hda - Fix MacBook Pro 5,2 quirk
by Takashi Iwai 30 Jul '15

30 Jul '15

MacBook Pro 5,2 with ALC889 codec had already a fixup entry, but this seems not working correctly, a fix for pin NID 0x15 is needed in addition. It's equivalent with the fixup for MacBook Air 1,1, so use this instead. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=102131 Reported-and-tested-by: Jeffery Miller <jefferym(a)gmail.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_realtek.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 18ae17ebb356..c456c04e0928 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -2222,7 +2222,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = { SND_PCI_QUIRK(0x106b, 0x4300, "iMac 9,1", ALC889_FIXUP_IMAC91_VREF), SND_PCI_QUIRK(0x106b, 0x4600, "MacbookPro 5,2", ALC889_FIXUP_IMAC91_VREF), SND_PCI_QUIRK(0x106b, 0x4900, "iMac 9,1 Aluminum", ALC889_FIXUP_IMAC91_VREF), - SND_PCI_QUIRK(0x106b, 0x4a00, "Macbook 5,2", ALC889_FIXUP_IMAC91_VREF), + SND_PCI_QUIRK(0x106b, 0x4a00, "Macbook 5,2", ALC889_FIXUP_MBA11_VREF), SND_PCI_QUIRK(0x1071, 0x8258, "Evesham Voyaeger", ALC882_FIXUP_EAPD), SND_PCI_QUIRK(0x1462, 0x7350, "MSI-7350", ALC889_FIXUP_CD), -- 2.4.6

1 0

[alsa-devel] [PATCH 1/6] ASoC: fsl_ssi: enable IPG clock during AC'97 reg access
by Maciej S. Szmigiero 30 Jul '15

30 Jul '15

IPG clock have to be enabled during AC'97 CODEC register access in fsl_ssi driver. Signed-off-by: Maciej Szmigiero <mail(a)maciej.szmigiero.name> --- sound/soc/fsl/fsl_ssi.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 484ff20..8185edc 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -1127,10 +1127,17 @@ static void fsl_ssi_ac97_write(struct snd_ac97 *ac97, unsigned short reg, struct regmap *regs = fsl_ac97_data->regs; unsigned int lreg; unsigned int lval; + int ret; if (reg > 0x7f) return; + ret = clk_prepare_enable(fsl_ac97_data->clk); + if (ret) { + pr_err("ac97 write clk_prepare_enable failed: %d\n", + ret); + return; + } lreg = reg << 12; regmap_write(regs, CCSR_SSI_SACADD, lreg); @@ -1141,6 +1148,8 @@ static void fsl_ssi_ac97_write(struct snd_ac97 *ac97, unsigned short reg, regmap_update_bits(regs, CCSR_SSI_SACNT, CCSR_SSI_SACNT_RDWR_MASK, CCSR_SSI_SACNT_WR); udelay(100); + + clk_disable_unprepare(fsl_ac97_data->clk); } static unsigned short fsl_ssi_ac97_read(struct snd_ac97 *ac97, @@ -1151,6 +1160,14 @@ static unsigned short fsl_ssi_ac97_read(struct snd_ac97 *ac97, unsigned short val = -1; u32 reg_val; unsigned int lreg; + int ret; + + ret = clk_prepare_enable(fsl_ac97_data->clk); + if (ret) { + pr_err("ac97 read clk_prepare_enable failed: %d\n", + ret); + return -1; + } lreg = (reg & 0x7f) << 12; regmap_write(regs, CCSR_SSI_SACADD, lreg); @@ -1162,6 +1179,8 @@ static unsigned short fsl_ssi_ac97_read(struct snd_ac97 *ac97, regmap_read(regs, CCSR_SSI_SACDAT, &reg_val); val = (reg_val >> 4) & 0xffff; + clk_disable_unprepare(fsl_ac97_data->clk); + return val; }

2 2