January 2017 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH 1/2] ASoC: Revert "Drop SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME flag"
by Sylwester Nawrocki 17 Jan '17

17 Jan '17

This reverts commit c6644119a3f80ea644bde10009d5e1013b5aff29 and restores the ability to specify DMA channel names per DAI dma_data. Unfortunately the functionality removed in the patch being reverted cannot be entirely replaced by specifying DMA channel names in struct snd_dmaengine_pcm_config as that does not cover devices with more than 2 DMA channels. Together with patch "ASoC: Revert "samsung: Remove unneeded initialization of chan_name"" this fixes broken sound on the s3c24xx SoC platforms. Signed-off-by: Sylwester Nawrocki <s.nawrocki(a)samsung.com> --- include/sound/dmaengine_pcm.h | 6 ++++++ sound/soc/soc-generic-dmaengine-pcm.c | 12 +++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/include/sound/dmaengine_pcm.h b/include/sound/dmaengine_pcm.h index 1c8f9e1..67be244 100644 --- a/include/sound/dmaengine_pcm.h +++ b/include/sound/dmaengine_pcm.h @@ -71,6 +71,7 @@ struct dma_chan *snd_dmaengine_pcm_request_channel(dma_filter_fn filter_fn, * @slave_id: Slave requester id for the DMA channel. * @filter_data: Custom DMA channel filter data, this will usually be used when * requesting the DMA channel. + * @chan_name: Custom channel name to use when requesting DMA channel. * @fifo_size: FIFO size of the DAI controller in bytes * @flags: PCM_DAI flags, only SND_DMAENGINE_PCM_DAI_FLAG_PACK for now */ @@ -80,6 +81,7 @@ struct snd_dmaengine_dai_dma_data { u32 maxburst; unsigned int slave_id; void *filter_data; + const char *chan_name; unsigned int fifo_size; unsigned int flags; }; @@ -105,6 +107,10 @@ void snd_dmaengine_pcm_set_config_from_dai_data( * playback. */ #define SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX BIT(3) +/* + * The PCM streams have custom channel names specified. + */ +#define SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME BIT(4) /** * struct snd_dmaengine_pcm_config - Configuration data for dmaengine based PCM diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c index 17eb149..d537864 100644 --- a/sound/soc/soc-generic-dmaengine-pcm.c +++ b/sound/soc/soc-generic-dmaengine-pcm.c @@ -263,6 +263,7 @@ static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd) struct dmaengine_pcm *pcm = soc_platform_to_pcm(rtd->platform); const struct snd_dmaengine_pcm_config *config = pcm->config; struct device *dev = rtd->platform->dev; + struct snd_dmaengine_dai_dma_data *dma_data; struct snd_pcm_substream *substream; size_t prealloc_buffer_size; size_t max_buffer_size; @@ -282,6 +283,13 @@ static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd) if (!substream) continue; + dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream); + + if (!pcm->chan[i] && + (pcm->flags & SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME)) + pcm->chan[i] = dma_request_slave_channel(dev, + dma_data->chan_name); + if (!pcm->chan[i] && (pcm->flags & SND_DMAENGINE_PCM_FLAG_COMPAT)) { pcm->chan[i] = dmaengine_pcm_compat_request_channel(rtd, substream); @@ -350,7 +358,9 @@ static int dmaengine_pcm_request_chan_of(struct dmaengine_pcm *pcm, const char *name; struct dma_chan *chan; - if ((pcm->flags & SND_DMAENGINE_PCM_FLAG_NO_DT) || !dev->of_node) + if ((pcm->flags & (SND_DMAENGINE_PCM_FLAG_NO_DT | + SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME)) || + !dev->of_node) return 0; if (config && config->dma_dev) { -- 1.9.1

1 1

Re: [alsa-devel] [PATCH v2 6/6] dell-led: move driver to drivers/platform/x86/dell-wmi-led.c
by Pavel Machek 17 Jan '17

17 Jan '17

Hi! > Thanks for the patch set. > > Would you mind fixing also the following issues raised by > checkpatch.pl?: > > WARNING: Missing a blank line after declarations > #376: FILE: drivers/platform/x86/dell-wmi-led.c:64: > + struct bios_args args; ... > The fixes could be placed in an incremental patch after this one. Anyway, move itself is ok (and the checkpatch issues are not that serious anyway.) Thanks, Acked-by: Pavel Machek <pavel(a)ucw.cz> -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

2 1

[alsa-devel] [PATCH 0/2] Add support for es8323 on the firefly-rk3288
by Romain Perier 17 Jan '17

17 Jan '17

This set of patches enables support for the es8323 codecs on the firefly-rk3288. It adds the required DT definitions to link rockchip-i2s to the es8388 analog output. Romain Perier (2): SoC: es8328-i2c: Add compatible for ES8323 arm: dts: Add support for ES8323 to the Firefly-RK3288 Documentation/devicetree/bindings/sound/es8328.txt | 5 ++++- arch/arm/boot/dts/rk3288-firefly.dtsi | 25 ++++++++++++++++++++++ sound/soc/codecs/es8328-i2c.c | 2 ++ 3 files changed, 31 insertions(+), 1 deletion(-) -- 2.9.3

1 2

[alsa-devel] [PATCH v3 0/2] ASoC: Add support for rt5640 sound card found on HP Pavilion x2 10-p000 tablet.
by Alexandrov Stansilav 16 Jan '17

16 Jan '17

Inside DSDT table there is record for this soundcard: Device (RTKC) { Name (_ADR, Zero) // _ADR: Address Name (_HID, "10EC3276") // _HID: Hardware ID Name (_CID, "10EC3276") // _CID: Compatible ID Name (_DDN, "ALC3276") // _DDN: DOS Device Name Name (_SUB, "103C827C") // _SUB: Subsystem ID Name (_PR0, Package (0x01) // _PR0: Power Resources for D0 original bugreport: https://bugzilla.kernel.org/show_bug.cgi?id=187621 v3: Fixed patch descriptions v2: Splited patch to codec and sst parts Alexandrov Stansilav (2): ASoc: rt5640: Add "10EC3276" ACPI ID ASoC: Intel: Atom: Add HP Pavilion x2 10 10-p000 machine entry sound/soc/codecs/rt5640.c | 1 + sound/soc/intel/atom/sst/sst_acpi.c | 2 ++ 2 files changed, 3 insertions(+) -- 2.10.2

4 5

[alsa-devel] [PATCH] pcm: direct: Fix deadlock in poll_descriptors
by Takashi Iwai 16 Jan '17

16 Jan '17

The recent change in PCM direct plugins to check XRUN in poll_descriptors callback caused a regression; as consequence, the whole playback hangs up. The culprit is a mutex dead lock by the call in snd_pcm_state() inside the new snd_pcm_direct_poll_descriptors(). The poll_descriptors code path is protected with pcm mutex, thus an unlocked version (__snd_pcm_state()) has to be used inside the callback instead. Fixes: 789ee39727a1 ("pcm: direct: check state before enter poll on timer") Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- src/pcm/pcm_direct.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c index f4d7c3f2f284..e4bef7860d01 100644 --- a/src/pcm/pcm_direct.c +++ b/src/pcm/pcm_direct.c @@ -676,7 +676,8 @@ int snd_pcm_direct_poll_descriptors(snd_pcm_t *pcm, struct pollfd *pfds, } /* this will also evaluate slave state and enter xrun if necessary */ - switch (snd_pcm_state(pcm)) { + /* using __snd_pcm_state() since this function is called inside lock */ + switch (__snd_pcm_state(pcm)) { case SND_PCM_STATE_XRUN: return -EPIPE; default: -- 2.11.0

1 0

[alsa-devel] [PATCH v2 0/4] ASoC: Dell IoT Gateway audio support
by Shrirang Bagul 16 Jan '17

16 Jan '17

This work is based on for-next branch of: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git These patches add basic audio support on new Dell Edge IoT Gateways. RT5660 codec is connected to SSP2 port on Intel Atom Baytrail E3815 SoC. The machine driver is based on bytcr_rt5640. These devices have line-in and line-out jacks with line-out mute enable gpio described in ACPI tables. Since v1: * rt5660: Use enumerations to define GPIO's described ACPI DSDT * Initialize rt5660 controls from card struct * Re-use existing bytcr_rt5640 machine driver to support rt5660 codec based audio Shrirang Bagul (4): ASoC: rt5660: Add ACPI support ASoC: Intel: bytcr_rt5640: move codec clks to card driver data ASoC: Intel: Support rt5660 codec for Baytrail ASoC: Intel: bytcr_rt5640: Support line-out mute gpio sound/soc/codecs/rt5660.c | 32 ++++++ sound/soc/intel/Kconfig | 11 +- sound/soc/intel/atom/sst/sst_acpi.c | 2 + sound/soc/intel/boards/bytcr_rt5640.c | 211 ++++++++++++++++++++++++++++++---- 4 files changed, 228 insertions(+), 28 deletions(-) -- 2.9.3

4 9

[alsa-devel] [PATCH v3] ALSA: mips: avoid potential uninitialized variable use
by Arnd Bergmann 16 Jan '17

16 Jan '17

MIPS allmodconfig results in this warning: sound/mips/hal2.c: In function 'hal2_gain_get': sound/mips/hal2.c:224:35: error: 'r' may be used uninitialized in this function [-Werror=maybe-uninitialized] sound/mips/hal2.c:223:35: error: 'l' may be used uninitialized in this function [-Werror=maybe-uninitialized] sound/mips/hal2.c: In function 'hal2_gain_put': sound/mips/hal2.c:260:13: error: 'new' may be used uninitialized in this function [-Werror=maybe-uninitialized] sound/mips/hal2.c:260:13: error: 'old' may be used uninitialized in this function [-Werror=maybe-uninitialized] Returning an error for all unexpected cases shuts up the warning Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- v3: actually send the correct patch, sorry for the mixup v2: return an error instead trying to handle gracefully sound/mips/hal2.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/mips/hal2.c b/sound/mips/hal2.c index ede449f0b50d..00fc9241d266 100644 --- a/sound/mips/hal2.c +++ b/sound/mips/hal2.c @@ -219,6 +219,8 @@ static int hal2_gain_get(struct snd_kcontrol *kcontrol, l = (tmp >> H2I_C2_L_GAIN_SHIFT) & 15; r = (tmp >> H2I_C2_R_GAIN_SHIFT) & 15; break; + default: + return -EINVAL; } ucontrol->value.integer.value[0] = l; ucontrol->value.integer.value[1] = r; @@ -256,6 +258,8 @@ static int hal2_gain_put(struct snd_kcontrol *kcontrol, new |= (r << H2I_C2_R_GAIN_SHIFT); hal2_i_write32(hal2, H2I_ADC_C2, new); break; + default: + return -EINVAL; } return old != new; } -- 2.9.0

2 1

[alsa-devel] [PATCH] ALSA: mips: avoid potential uninitialized variable use
by Arnd Bergmann 16 Jan '17

16 Jan '17

MIPS allmodconfig results in this warning: sound/mips/hal2.c: In function 'hal2_gain_get': sound/mips/hal2.c:224:35: error: 'r' may be used uninitialized in this function [-Werror=maybe-uninitialized] sound/mips/hal2.c:223:35: error: 'l' may be used uninitialized in this function [-Werror=maybe-uninitialized] sound/mips/hal2.c: In function 'hal2_gain_put': sound/mips/hal2.c:260:13: error: 'new' may be used uninitialized in this function [-Werror=maybe-uninitialized] sound/mips/hal2.c:260:13: error: 'old' may be used uninitialized in this function [-Werror=maybe-uninitialized] It's easy enough to avoid by adding a 'default' clause to the switch statements here. I assume that in practice no other case can happen, but adding a default puts us on the safe side and shuts up the warnings. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- sound/mips/hal2.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/mips/hal2.c b/sound/mips/hal2.c index ede449f0b50d..0af4f7a9b3e7 100644 --- a/sound/mips/hal2.c +++ b/sound/mips/hal2.c @@ -219,6 +219,9 @@ static int hal2_gain_get(struct snd_kcontrol *kcontrol, l = (tmp >> H2I_C2_L_GAIN_SHIFT) & 15; r = (tmp >> H2I_C2_R_GAIN_SHIFT) & 15; break; + default: + l = 0; + r = 0; } ucontrol->value.integer.value[0] = l; ucontrol->value.integer.value[1] = r; @@ -256,6 +259,9 @@ static int hal2_gain_put(struct snd_kcontrol *kcontrol, new |= (r << H2I_C2_R_GAIN_SHIFT); hal2_i_write32(hal2, H2I_ADC_C2, new); break; + default: + new = 0; + old = 0; } return old != new; } -- 2.9.0

2 2

[alsa-devel] [PATCH v2] ALSA: mips: avoid potential uninitialized variable use
by Arnd Bergmann 16 Jan '17

16 Jan '17

MIPS allmodconfig results in this warning: sound/mips/hal2.c: In function 'hal2_gain_get': sound/mips/hal2.c:224:35: error: 'r' may be used uninitialized in this function [-Werror=maybe-uninitialized] sound/mips/hal2.c:223:35: error: 'l' may be used uninitialized in this function [-Werror=maybe-uninitialized] sound/mips/hal2.c: In function 'hal2_gain_put': sound/mips/hal2.c:260:13: error: 'new' may be used uninitialized in this function [-Werror=maybe-uninitialized] sound/mips/hal2.c:260:13: error: 'old' may be used uninitialized in this function [-Werror=maybe-uninitialized] Returning an error for all unexpected cases shuts up the warning Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- v2: return an error instead trying to handle gracefully --- sound/mips/hal2.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/mips/hal2.c b/sound/mips/hal2.c index ede449f0b50d..0af4f7a9b3e7 100644 --- a/sound/mips/hal2.c +++ b/sound/mips/hal2.c @@ -219,6 +219,9 @@ static int hal2_gain_get(struct snd_kcontrol *kcontrol, l = (tmp >> H2I_C2_L_GAIN_SHIFT) & 15; r = (tmp >> H2I_C2_R_GAIN_SHIFT) & 15; break; + default: + l = 0; + r = 0; } ucontrol->value.integer.value[0] = l; ucontrol->value.integer.value[1] = r; @@ -256,6 +259,9 @@ static int hal2_gain_put(struct snd_kcontrol *kcontrol, new |= (r << H2I_C2_R_GAIN_SHIFT); hal2_i_write32(hal2, H2I_ADC_C2, new); break; + default: + new = 0; + old = 0; } return old != new; } -- 2.9.0

1 0

[alsa-devel] [PATCH v5 0/3] ucm: Automatically load the best config file based on the card long name
by mengdong.lin＠linux.intel.com 16 Jan '17

16 Jan '17

From: Mengdong Lin <mengdong.lin(a)linux.intel.com> Intel DSP platform drivers are used by many different devices. For user space to differentiate them, now ASoC provide API for machine drivers to include the DMI info (vendor, product and board) in card long name. This series will add UCM support for loading best device-specific configuration based on the card long name. Mengdong Lin (2): ucm: Load device-specific configuration file based on the card long name ucm: Add command 'get _file' to get the config file name of the opened card History: v2: Request the device-specific file name to match the card long name, no long use automatic key word matching and scoring to avoid error and uncertainty. And add command to check the name of actually loaded configuration file. v3: Fix num in strncpy of the long name, which should be MAX_CARD_LONG_NAME - 1, not MAX_CARD_LONG_NAME (80). v4: No code change. Just update on comments because the kernel v4 patches add DMI product version to the card long name, and use "-" as the separator between DMI fields. v5: Revise the comments. Add patch to assure the input card name not to exceed the maximum card long name supported by kernel to avoid use strncpy and strncmp later. Mengdong Lin (3): ucm: Assure the user input card name not to exceed max size of card long name ucm: Load device-specific configuration file based on the card long name ucm: Add command 'get _file' to get the config file name of the opened card include/use-case.h | 1 + src/ucm/main.c | 14 +++++++ src/ucm/parser.c | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++-- src/ucm/ucm_local.h | 3 ++ 4 files changed, 119 insertions(+), 4 deletions(-) -- 2.7.4

1 3