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

[alsa-devel] [PATCH] Revert "ALSA: usb-audio: purge needless variable length array"
by Takashi Iwai 30 May '17

30 May '17

This reverts commit 89b593c30e83 ("ALSA: usb-audio: purge needless variable length array"). The patch turned out to cause a severe regression, triggering an Oops at snd_usb_ctl_msg(). It was overseen that snd_usb_ctl_msg() writes back the response to the given buffer, while the patch changed it to a read-only const buffer. (One should always double-check when an extra pointer cast is present...) As a simple fix, just revert the affected commit. It was merely a cleanup. Although it brings VLA again, it's clearer as a fix. We'll address the VLA later in another patch. Fixes: 89b593c30e83 ("ALSA: usb-audio: purge needless variable length array") Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=195875 Cc: <stable(a)vger.kernel.org> # v4.11+ Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/usb/mixer_us16x08.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/usb/mixer_us16x08.c b/sound/usb/mixer_us16x08.c index dc48eedea92e..29d2c9282987 100644 --- a/sound/usb/mixer_us16x08.c +++ b/sound/usb/mixer_us16x08.c @@ -698,12 +698,12 @@ static int snd_us16x08_meter_get(struct snd_kcontrol *kcontrol, struct snd_usb_audio *chip = elem->head.mixer->chip; struct snd_us16x08_meter_store *store = elem->private_data; u8 meter_urb[64]; - char tmp[sizeof(mix_init_msg2)] = {0}; + char tmp[max(sizeof(mix_init_msg1), sizeof(mix_init_msg2))]; switch (kcontrol->private_value) { case 0: - snd_us16x08_send_urb(chip, (char *)mix_init_msg1, - sizeof(mix_init_msg1)); + memcpy(tmp, mix_init_msg1, sizeof(mix_init_msg1)); + snd_us16x08_send_urb(chip, tmp, 4); snd_us16x08_recv_urb(chip, meter_urb, sizeof(meter_urb)); kcontrol->private_value++; @@ -721,7 +721,7 @@ static int snd_us16x08_meter_get(struct snd_kcontrol *kcontrol, case 3: memcpy(tmp, mix_init_msg2, sizeof(mix_init_msg2)); tmp[2] = snd_get_meter_comp_index(store); - snd_us16x08_send_urb(chip, tmp, sizeof(mix_init_msg2)); + snd_us16x08_send_urb(chip, tmp, 10); snd_us16x08_recv_urb(chip, meter_urb, sizeof(meter_urb)); kcontrol->private_value = 0; -- 2.13.0

1 0

[alsa-devel] [RFC PATCH] ASoC: Intel: sst: Delete sst_save_shim64(); saved regs are never used
by Douglas Anderson 30 May '17

30 May '17

In commit 9a075265c6dc ("ASoC: Intel: sst: Remove unused function sst_restore_shim64()"), we deleted the sst_restore_shim64() since it was never used. ...but a quick look at the code shows that we should also be able to remove the sst_save_shim64() function and the structure members we were storing data in. Note that the saving code (and the comments talking about how important it is to do the save) has been around since commit 336cfbb05edf ("ASoC: Intel: mrfld- add ACPI module"). Signed-off-by: Douglas Anderson <dianders(a)chromium.org> --- This problem was found only by code inspection and only compile tested. Hence, RFC. sound/soc/intel/atom/sst/sst.c | 19 ------------------- sound/soc/intel/atom/sst/sst.h | 2 -- 2 files changed, 21 deletions(-) diff --git a/sound/soc/intel/atom/sst/sst.c b/sound/soc/intel/atom/sst/sst.c index 2d43b8693c0c..5ee92257ca85 100644 --- a/sound/soc/intel/atom/sst/sst.c +++ b/sound/soc/intel/atom/sst/sst.c @@ -382,21 +382,6 @@ void sst_context_cleanup(struct intel_sst_drv *ctx) } EXPORT_SYMBOL_GPL(sst_context_cleanup); -static inline void sst_save_shim64(struct intel_sst_drv *ctx, - void __iomem *shim, - struct sst_shim_regs64 *shim_regs) -{ - unsigned long irq_flags; - - spin_lock_irqsave(&ctx->ipc_spin_lock, irq_flags); - - shim_regs->imrx = sst_shim_read64(shim, SST_IMRX); - shim_regs->csr = sst_shim_read64(shim, SST_CSR); - - - spin_unlock_irqrestore(&ctx->ipc_spin_lock, irq_flags); -} - void sst_configure_runtime_pm(struct intel_sst_drv *ctx) { pm_runtime_set_autosuspend_delay(ctx->dev, SST_SUSPEND_DELAY); @@ -416,8 +401,6 @@ void sst_configure_runtime_pm(struct intel_sst_drv *ctx) pm_runtime_set_active(ctx->dev); else pm_runtime_put_noidle(ctx->dev); - - sst_save_shim64(ctx, ctx->shim, ctx->shim_regs64); } EXPORT_SYMBOL_GPL(sst_configure_runtime_pm); @@ -441,8 +424,6 @@ static int intel_sst_runtime_suspend(struct device *dev) flush_workqueue(ctx->post_msg_wq); ctx->ops->reset(ctx); - /* save the shim registers because PMC doesn't save state */ - sst_save_shim64(ctx, ctx->shim, ctx->shim_regs64); return ret; } diff --git a/sound/soc/intel/atom/sst/sst.h b/sound/soc/intel/atom/sst/sst.h index 5c9a51cc77aa..d8cac09e8997 100644 --- a/sound/soc/intel/atom/sst/sst.h +++ b/sound/soc/intel/atom/sst/sst.h @@ -318,12 +318,10 @@ struct sst_ipc_reg { }; struct sst_shim_regs64 { - u64 csr; u64 pisr; u64 pimr; u64 isrx; u64 isrd; - u64 imrx; u64 imrd; u64 ipcx; u64 ipcd; -- 2.13.0.219.gdb65acc882-goog

3 2

[alsa-devel] [PATCH][V2] sound/core/pcm_timer.c: include pcm_local.h and remove some extraneous tabs
by Colin King 30 May '17

30 May '17

From: Colin Ian King <colin.king(a)canonical.com> We need to include pcm_local.h to clean up some smatch warnings: symbol 'snd_pcm_timer_done' was not declared. Should it be static? symbol 'snd_pcm_timer_init' was not declared. Should it be static? symbol 'snd_pcm_timer_resolution_change' was not declared. Should it be static? Also remove some extraneous tabs on empty lines and replace space intentation with a tab. Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/core/pcm_timer.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/core/pcm_timer.c b/sound/core/pcm_timer.c index 20ecd8f18080..11389f13de73 100644 --- a/sound/core/pcm_timer.c +++ b/sound/core/pcm_timer.c @@ -25,6 +25,8 @@ #include <sound/pcm.h> #include <sound/timer.h> +#include "pcm_local.h" + /* * Timer functions */ @@ -33,8 +35,8 @@ void snd_pcm_timer_resolution_change(struct snd_pcm_substream *substream) { unsigned long rate, mult, fsize, l, post; struct snd_pcm_runtime *runtime = substream->runtime; - - mult = 1000000000; + + mult = 1000000000; rate = runtime->rate; if (snd_BUG_ON(!rate)) return; @@ -65,7 +67,7 @@ void snd_pcm_timer_resolution_change(struct snd_pcm_substream *substream) static unsigned long snd_pcm_timer_resolution(struct snd_timer * timer) { struct snd_pcm_substream *substream; - + substream = timer->private_data; return substream->runtime ? substream->runtime->timer_resolution : 0; } @@ -73,7 +75,7 @@ static unsigned long snd_pcm_timer_resolution(struct snd_timer * timer) static int snd_pcm_timer_start(struct snd_timer * timer) { struct snd_pcm_substream *substream; - + substream = snd_timer_chip(timer); substream->timer_running = 1; return 0; @@ -82,7 +84,7 @@ static int snd_pcm_timer_start(struct snd_timer * timer) static int snd_pcm_timer_stop(struct snd_timer * timer) { struct snd_pcm_substream *substream; - + substream = snd_timer_chip(timer); substream->timer_running = 0; return 0; @@ -112,7 +114,7 @@ void snd_pcm_timer_init(struct snd_pcm_substream *substream) { struct snd_timer_id tid; struct snd_timer *timer; - + tid.dev_sclass = SNDRV_TIMER_SCLASS_NONE; tid.dev_class = SNDRV_TIMER_CLASS_PCM; tid.card = substream->pcm->card->number; -- 2.11.0

2 1

[alsa-devel] [alsa-lib] bug in USB-Audio.conf
by Alexander Tsoy 30 May '17

30 May '17

Hello! I've noticed that there is a bug in USB-Audio.conf. "USB- Audio.pcm.default" doesn't allow custom "default" definitions, but there is one: USB-Audio."Audiophile USB (tm)".pcm.default Moreover there is a typo in this definition in dsnoop args: DEVICE=1 -> DEV=1. So what is the best course of action here? We can fix USB- Audio.conf (I have a working patch that I've tested with another card) or given that Audiophile USB is likely already in a semi-broken state for a long time, may be it is better to remove the exclusion in the driver [1] and remove all definitions for this card from USB- Audio.conf? [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/ commit/?id=5ee20bc792467d7d612157e0a9962765aa943b08 -- Alexander Tsoy <alexander(a)tsoy.me>

2 1

[alsa-devel] [PATCH] pcm: dshare: Call snd_pcm_dshare_state() directly
by Takashi Iwai 30 May '17

30 May '17

... otherwise it may be a deadlock if recursive lock isn't available. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- src/pcm/pcm_dshare.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c index 4c57fb4a3028..7cdfea2a1572 100644 --- a/src/pcm/pcm_dshare.c +++ b/src/pcm/pcm_dshare.c @@ -227,6 +227,8 @@ static int snd_pcm_dshare_sync_ptr(snd_pcm_t *pcm) * plugin implementation */ +static snd_pcm_state_t snd_pcm_dshare_state(snd_pcm_t *pcm); + static int snd_pcm_dshare_status(snd_pcm_t *pcm, snd_pcm_status_t * status) { snd_pcm_direct_t *dshare = pcm->private_data; @@ -244,7 +246,7 @@ static int snd_pcm_dshare_status(snd_pcm_t *pcm, snd_pcm_status_t * status) default: break; } - status->state = snd_pcm_state(pcm); + status->state = snd_pcm_dshare_state(pcm); status->trigger_tstamp = dshare->trigger_tstamp; status->avail = snd_pcm_mmap_playback_avail(pcm); status->avail_max = status->avail > dshare->avail_max ? status->avail : dshare->avail_max; -- 2.13.0

1 0

[alsa-devel] [PATCH v2 0/3] ASoC: Intel: Skylake: Add Support for MIC select module
by Subhransu S. Prusty 30 May '17

30 May '17

This series adds support in DSP to add support for MIC select module which allows user to select 1 to N channels from DMIC channel input. Further it also adds support in bxt-rt298 machine for such a module. Changes in v2: - check for index in array range Dharageswari R (3): ASoC: Intel: Skylake: Add mic-select module type ASoC: Intel: Skylake: Add enum control for mic selection ASoC: Intel: Boards: Add 4-channel DMIC fixup. sound/soc/intel/boards/bxt_rt298.c | 7 +- sound/soc/intel/skylake/skl-messages.c | 2 + sound/soc/intel/skylake/skl-topology.c | 155 +++++++++++++++++++++++++++ sound/soc/intel/skylake/skl-topology.h | 20 ++++ sound/soc/intel/skylake/skl-tplg-interface.h | 2 + 5 files changed, 181 insertions(+), 5 deletions(-) -- 1.9.1

2 5

[alsa-devel] [PATCH] ASoC: sgtl5000: add avc enable control
by Richard Leitner 30 May '17

30 May '17

This control enables the automatic volume control (AVC) of SGTL5000 using its DAP_AVC_CTRL register. Signed-off-by: Richard Leitner <richard.leitner(a)skidata.com> --- sound/soc/codecs/sgtl5000.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index 5a2702e..ad8c9a8 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -434,6 +434,8 @@ static const struct snd_kcontrol_new sgtl5000_snd_controls[] = { 0x1f, 1, lineout_volume), SOC_SINGLE("Lineout Playback Switch", SGTL5000_CHIP_ANA_CTRL, 8, 1, 1), + + SOC_SINGLE("AVC Enable", SGTL5000_DAP_AVC_CTRL, 0, 1, 0), }; /* mute the codec used by alsa core */ -- 2.1.4

2 2

[alsa-devel] [PATCH] gpiolib: remove unused variable 'i'
by Colin King 30 May '17

30 May '17

From: Colin Ian King <colin.king(a)canonical.com> Fixes smatch warning: unused variable 'i' [-Wunused-variable] Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- drivers/gpio/gpiolib.c | 2 -- sound/soc/generic/audio-graph-scu-card.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index be8097097326..62ffb4e293d2 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1471,8 +1471,6 @@ static struct gpio_chip *find_chip_by_name(const char *name) static int gpiochip_irqchip_init_valid_mask(struct gpio_chip *gpiochip) { - int i; - if (!gpiochip->irq_need_valid_mask) return 0; diff --git a/sound/soc/generic/audio-graph-scu-card.c b/sound/soc/generic/audio-graph-scu-card.c index c5c52d1f500c..e15f63c74f59 100644 --- a/sound/soc/generic/audio-graph-scu-card.c +++ b/sound/soc/generic/audio-graph-scu-card.c @@ -246,7 +246,7 @@ static int asoc_graph_card_parse_of(struct graph_card_data *priv) continue; if (rcpu_ep != cpu_ep) { - dev_err(dev, "remote-endpoint missmatch (%s/%s/%s)\n", + dev_err(dev, "remote-endpoint mismatch (%s/%s/%s)\n", cpu_ep->name, codec_ep->name, rcpu_ep->name); ret = -EINVAL; goto parse_of_err; -- 2.11.0

3 2

[alsa-devel] [PATCH] ALSA: sound/core/pcm_timer.c: include pcm_local.h and remove some extraneous tabs
by Colin King 30 May '17

30 May '17

From: Colin Ian King <colin.king(a)canonical.com> We need to include pcm_local.h to clean up some smatch warnings: symbol 'snd_pcm_timer_done' was not declared. Should it be static? symbol 'snd_pcm_timer_init' was not declared. Should it be static? symbol 'snd_pcm_timer_resolution_change' was not declared. Should it be static? Also remove some extraneous tabs on empty lines. Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/core/pcm_timer.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sound/core/pcm_timer.c b/sound/core/pcm_timer.c index 20ecd8f18080..b182cac00dd8 100644 --- a/sound/core/pcm_timer.c +++ b/sound/core/pcm_timer.c @@ -25,6 +25,8 @@ #include <sound/pcm.h> #include <sound/timer.h> +#include "pcm_local.h" + /* * Timer functions */ @@ -33,7 +35,7 @@ void snd_pcm_timer_resolution_change(struct snd_pcm_substream *substream) { unsigned long rate, mult, fsize, l, post; struct snd_pcm_runtime *runtime = substream->runtime; - + mult = 1000000000; rate = runtime->rate; if (snd_BUG_ON(!rate)) @@ -65,7 +67,7 @@ void snd_pcm_timer_resolution_change(struct snd_pcm_substream *substream) static unsigned long snd_pcm_timer_resolution(struct snd_timer * timer) { struct snd_pcm_substream *substream; - + substream = timer->private_data; return substream->runtime ? substream->runtime->timer_resolution : 0; } @@ -73,7 +75,7 @@ static unsigned long snd_pcm_timer_resolution(struct snd_timer * timer) static int snd_pcm_timer_start(struct snd_timer * timer) { struct snd_pcm_substream *substream; - + substream = snd_timer_chip(timer); substream->timer_running = 1; return 0; @@ -82,7 +84,7 @@ static int snd_pcm_timer_start(struct snd_timer * timer) static int snd_pcm_timer_stop(struct snd_timer * timer) { struct snd_pcm_substream *substream; - + substream = snd_timer_chip(timer); substream->timer_running = 0; return 0; @@ -112,7 +114,7 @@ void snd_pcm_timer_init(struct snd_pcm_substream *substream) { struct snd_timer_id tid; struct snd_timer *timer; - + tid.dev_sclass = SNDRV_TIMER_SCLASS_NONE; tid.dev_class = SNDRV_TIMER_CLASS_PCM; tid.card = substream->pcm->card->number; -- 2.11.0

2 1

[alsa-devel] [PATCH 00/15] make more driver use devm_of_platform_populate()
by Benjamin Gaignard 30 May '17

30 May '17

Number of calls to of_platform_populate() aren't unbalanced by a call to of_platform_depopulate() that could generate issue will loading/unloading the drivers. Make those drivers use devm_of_platform_populate() fix the problem without need to add remove function. In some case replacing of_platform_populate() by devm_of_platform_populate() allow to delete driver remove function and save some lines of code. This series of patches based on v4.12-rc3 tag. CC: Alexandre Torgue <alexandre.torgue(a)st.com> CC: David Airlie <airlied(a)linux.ie> CC: Fabrice Gasnier <fabrice.gasnier(a)st.com> CC: Hartmut Knaack <knaack.h(a)gmx.de> CC: Jaroslav Kysela <perex(a)perex.cz> CC: Javier Martinez Canillas <javier(a)osg.samsung.com> CC: Jonathan Cameron <jic23(a)kernel.org> CC: Krzysztof Kozlowski <krzk(a)kernel.org> CC: Kukjin Kim <kgene(a)kernel.org> CC: Kyungmin Park <kyungmin.park(a)samsung.com> CC: Lars-Peter Clausen <lars(a)metafoo.de> CC: Lee Jones <lee.jones(a)linaro.org> CC: Liam Girdwood <lgirdwood(a)gmail.com> CC: Mark Brown <broonie(a)kernel.org> CC: Mauro Carvalho Chehab <mchehab(a)kernel.org> CC: Olivier Moysan <olivier.moysan(a)st.com> CC: Rob Clark <robdclark(a)gmail.com> CC: Shawn Guo <shawnguo(a)kernel.org> CC: Sylwester Nawrocki <s.nawrocki(a)samsung.com> CC: Takashi Iwai <tiwai(a)suse.com> CC: Tony Lindgren <tony(a)atomide.com> CC: linux-iio(a)vger.kernel.org CC: linux-arm-kernel(a)lists.infradead.org CC: linux-kernel(a)vger.kernel.org CC: dri-devel(a)lists.freedesktop.org CC: linux-arm-msm(a)vger.kernel.org CC: freedreno(a)lists.freedesktop.org CC: linux-samsung-soc(a)vger.kernel.org CC: alsa-devel(a)alsa-project.org CC: linux-media(a)vger.kernel.org Benjamin Gaignard (15): iio: adc: stm32: use devm_of_platform_populate() iio: dac: stm32: use devm_of_platform_populate() drm: zte: use devm_of_platform_populate() drm: msm: use devm_of_platform_populate() mfd: stm32-timers: use devm_of_platform_populate mfd: atmel: use devm_of_platform_populate() mfd: cros_ec: use devm_of_platform_populate() mfd: exynos: use devm_of_platform_populate() mfd: fsl-imx25: use devm_of_platform_populate() mfd: motorola-cpcap: use devm_of_platform_populate() mfd: palmas: use devm_of_platform_populate() mfd: qcom-spmi-pmic: use devm_of_platform_populate() mfd: smsc-ece: use devm_of_platform_populate() sound: stm32: use devm_of_platform_populate() media: exynos4-is: use devm_of_platform_populate() drivers/gpu/drm/msm/msm_drv.c | 10 ++-------- drivers/gpu/drm/zte/zx_drm_drv.c | 2 +- drivers/iio/adc/stm32-adc-core.c | 4 +--- drivers/iio/dac/stm32-dac-core.c | 3 +-- drivers/media/platform/exynos4-is/fimc-is.c | 7 ++----- drivers/mfd/atmel-flexcom.c | 2 +- drivers/mfd/cros_ec.c | 2 +- drivers/mfd/exynos-lpass.c | 2 +- drivers/mfd/fsl-imx25-tsadc.c | 5 +---- drivers/mfd/motorola-cpcap.c | 13 +------------ drivers/mfd/palmas.c | 2 +- drivers/mfd/qcom-spmi-pmic.c | 9 +-------- drivers/mfd/smsc-ece1099.c | 3 +-- drivers/mfd/stm32-timers.c | 10 +--------- sound/soc/stm/stm32_sai.c | 11 +---------- 15 files changed, 17 insertions(+), 68 deletions(-) -- 1.9.1

2 2