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

[alsa-devel] [PATCH] ALSA: timer: Fix negative queue usage by racy accesses
by Takashi Iwai 04 Jul '16

04 Jul '16

The user timer tu->qused counter may go to a negative value when multiple concurrent reads are performed since both the check and the decrement of tu->qused are done in two individual locked contexts. This results in bogus read outs, and the endless loop in the user-space side. The fix is to move the decrement of the tu->qused counter into the same spinlock context as the zero-check of the counter. Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/core/timer.c b/sound/core/timer.c index e722022d325d..9a6157ea6881 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -1955,6 +1955,7 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer, qhead = tu->qhead++; tu->qhead %= tu->queue_size; + tu->qused--; spin_unlock_irq(&tu->qlock); if (tu->tread) { @@ -1968,7 +1969,6 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer, } spin_lock_irq(&tu->qlock); - tu->qused--; if (err < 0) goto _error; result += unit; -- 2.9.0

1 0

[alsa-devel] [PATCH] ASoC: codecs: Allow user to select WM9713 codec
by Alexander Shiyan 04 Jul '16

04 Jul '16

Add simple description and necessary options to allow to select Wolfson WM9713 codec. Signed-off-by: Alexander Shiyan <shc_work(a)mail.ru> --- sound/soc/codecs/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 4d82a58..6721427 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -1010,8 +1010,9 @@ config SND_SOC_WM9712 tristate config SND_SOC_WM9713 - tristate + tristate "Wolfson Microelectronics WM9713 codec" select REGMAP_AC97 + select SND_SOC_AC97_BUS # Amp config SND_SOC_LM4857 -- 2.4.9

2 1

Re: [alsa-devel] DPCM: skip DAPM_STREAM_STOP event to BE, if still used by other FE
by Mark Brown 04 Jul '16

04 Jul '16

On Mon, Jul 04, 2016 at 10:26:54AM +0800, KaiChieh Chuang wrote: > On Thu, 2016-06-30 at 03:08 +0800, Mark Brown wrote: > > On Sun, Jun 05, 2016 at 02:58:59PM +0800, Kai Chieh Chuang wrote: > > > The BE receiving SND_SOC_DAPM_STREAM_STOP event, while still used by a > > > FE who is in STREAM_START state. The DAPM will just inactive BE related > > > widget/dai without checking. This just doesn't seems right. > > Why not? The backend is still active and running, why would it expect > > to be stopped unless it's supposed to actually stop? > Yes, I don't expect it to stop. > But at this situation, the BE change to state STREAM_STOP while > still used by a FE in STREAM_START state. > Shouldn't the BE stay in the STREAM_START state? Yes, but that sounded like the situation you were describing? It's really hard to follow what you're trying to say here, perhaps just send the fix you're proposing?

1 0

[alsa-devel] [PATCH] ASoC: bt-sco: add config prompt
by Garlic Tseng 04 Jul '16

04 Jul '16

Add config prompt for bt-sco codec driver Signed-off-by: Garlic Tseng <garlic.tseng(a)mediatek.com> --- sound/soc/codecs/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index f2f8603..1cd6ab3 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -383,7 +383,7 @@ config SND_SOC_ALC5632 tristate config SND_SOC_BT_SCO - tristate + tristate "Dummy BT SCO codec driver" config SND_SOC_CQ0093VC tristate -- 1.9.1

2 1

Re: [alsa-devel] [PATCH 3/3] [alsa-lib] conf/ucm: chtrt5645: Add UCM config for chtrt5645
by Mark Brown 04 Jul '16

04 Jul '16

On Sun, Jul 03, 2016 at 11:06:07PM -0600, Stephen Just wrote: > Add a UCM configuration for the rt5645 codec on Intel's Cherry-Trail > platform. Tested on the Microsoft Surface 3. This is not a kernel patch, it should be sent separately and sent to the alsa-lib maintainers (at least Taksahi).

1 0

[alsa-devel] [PATCH] clkdev: add devm_of_clk_get()
by Kuninori Morimoto 04 Jul '16

04 Jul '16

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> This is based on devm_clk_get() Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- drivers/clk/clkdev.c | 26 ++++++++++++++++++++++++++ include/linux/clk.h | 7 +++++++ 2 files changed, 33 insertions(+) diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c index 89cc700..93a613b 100644 --- a/drivers/clk/clkdev.c +++ b/drivers/clk/clkdev.c @@ -55,6 +55,32 @@ struct clk *of_clk_get(struct device_node *np, int index) } EXPORT_SYMBOL(of_clk_get); +static void devm_of_clk_release(struct device *dev, void *res) +{ + clk_put(*(struct clk **)res); +} + +struct clk *devm_of_clk_get(struct device *dev, + struct device_node *np, int index) +{ + struct clk **ptr, *clk; + + ptr = devres_alloc(devm_of_clk_release, sizeof(*ptr), GFP_KERNEL); + if (!ptr) + return ERR_PTR(-ENOMEM); + + clk = of_clk_get(np, index); + if (!IS_ERR(clk)) { + *ptr = clk; + devres_add(dev, ptr); + } else { + devres_free(ptr); + } + + return clk; +} +EXPORT_SYMBOL(devm_of_clk_get); + static struct clk *__of_clk_get_by_name(struct device_node *np, const char *dev_id, const char *name) diff --git a/include/linux/clk.h b/include/linux/clk.h index 834179f..01005e78 100644 --- a/include/linux/clk.h +++ b/include/linux/clk.h @@ -494,6 +494,8 @@ struct of_phandle_args; #if defined(CONFIG_OF) && defined(CONFIG_COMMON_CLK) struct clk *of_clk_get(struct device_node *np, int index); +struct clk *devm_of_clk_get(struct device *dev, + struct device_node *np, int index); struct clk *of_clk_get_by_name(struct device_node *np, const char *name); struct clk *of_clk_get_from_provider(struct of_phandle_args *clkspec); #else @@ -501,6 +503,11 @@ static inline struct clk *of_clk_get(struct device_node *np, int index) { return ERR_PTR(-ENOENT); } +struct clk *devm_of_clk_get(struct device *dev, + struct device_node *np, int index) +{ + return ERR_PTR(-ENOENT); +} static inline struct clk *of_clk_get_by_name(struct device_node *np, const char *name) { -- 1.9.1

2 2

[alsa-devel] [PATCH v5 0/9] ASoC: Mediatek: Add support for MT2701 SOC
by Garlic Tseng 04 Jul '16

04 Jul '16

This patch adds basic support for Mediatek AFE for MT2701 SoC. The patch is based on broonie tree "for-next" branch. Change since v4: * remove SND_SOC_MEDIATEK config prompt * fix config prompt to meaningful one for SND_SOC_MT2701_CS42448 * remove some unnecessary random space change Change since v3: * fix comments style. Change since v2: * fix comments style. * replace EXPORT_SYMBOL with EXPORT_SYMBOL_GPL * reduce debug message * move mutex lock for irq-allocated to AFE struct * remove func mtk_simple_isr and call snd_pcm_period_elapsed directly * mt2701 driver probe will fail if clock initial error * fix dapm on/off switch control naming Change since v1: implement common private structure, fe dai and platform driver. let mt8173 and mt2701 use the common structure. Garlic Tseng (9): ASoC: mediatek: Refine mt8173 driver and change config option ASoC: mediatek: implement mediatek common structure ASoC: mediatek: let mt8173 use mediatek common structure ASoC: mediatek: add documents for mt2701 ASoC: mediatek: add structure define and clock control for 2701 ASoC: mediatek: add mt2701 platform driver implementation. ASoC: bt-sco: extend rate and add a general compatible string ASoC: mediatek: add BT implementation ASoC: mediatek: Add mt2701-cs42448 driver and config option. Documentation/devicetree/bindings/sound/bt-sco.txt | 2 +- .../devicetree/bindings/sound/mt2701-afe-pcm.txt | 150 ++ .../devicetree/bindings/sound/mt2701-cs42448.txt | 43 + sound/soc/codecs/bt-sco.c | 5 +- sound/soc/mediatek/Kconfig | 37 +- sound/soc/mediatek/Makefile | 10 +- sound/soc/mediatek/common/Makefile | 16 + sound/soc/mediatek/common/mtk-afe-fe-dai.c | 379 +++++ sound/soc/mediatek/common/mtk-afe-fe-dai.h | 45 + .../soc/mediatek/common/mtk-afe-platform-driver.c | 90 ++ .../soc/mediatek/common/mtk-afe-platform-driver.h | 23 + sound/soc/mediatek/common/mtk-base-afe.h | 104 ++ sound/soc/mediatek/mt2701/Makefile | 19 + sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.c | 464 ++++++ sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.h | 38 + sound/soc/mediatek/mt2701/mt2701-afe-common.h | 181 +++ sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 1698 ++++++++++++++++++++ sound/soc/mediatek/mt2701/mt2701-cs42448.c | 422 +++++ sound/soc/mediatek/mt2701/mt2701-reg.h | 186 +++ sound/soc/mediatek/mt8173/Makefile | 7 + sound/soc/mediatek/mt8173/mt8173-afe-common.h | 73 + .../{mtk-afe-pcm.c => mt8173/mt8173-afe-pcm.c} | 921 +++++------ sound/soc/mediatek/{ => mt8173}/mt8173-max98090.c | 2 +- .../mediatek/{ => mt8173}/mt8173-rt5650-rt5514.c | 2 +- .../mediatek/{ => mt8173}/mt8173-rt5650-rt5676.c | 4 +- sound/soc/mediatek/{ => mt8173}/mt8173-rt5650.c | 2 +- sound/soc/mediatek/mtk-afe-common.h | 101 -- 27 files changed, 4390 insertions(+), 634 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/mt2701-afe-pcm.txt create mode 100644 Documentation/devicetree/bindings/sound/mt2701-cs42448.txt create mode 100644 sound/soc/mediatek/common/Makefile create mode 100644 sound/soc/mediatek/common/mtk-afe-fe-dai.c create mode 100644 sound/soc/mediatek/common/mtk-afe-fe-dai.h create mode 100644 sound/soc/mediatek/common/mtk-afe-platform-driver.c create mode 100644 sound/soc/mediatek/common/mtk-afe-platform-driver.h create mode 100644 sound/soc/mediatek/common/mtk-base-afe.h create mode 100644 sound/soc/mediatek/mt2701/Makefile create mode 100644 sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.c create mode 100644 sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.h create mode 100644 sound/soc/mediatek/mt2701/mt2701-afe-common.h create mode 100644 sound/soc/mediatek/mt2701/mt2701-afe-pcm.c create mode 100644 sound/soc/mediatek/mt2701/mt2701-cs42448.c create mode 100644 sound/soc/mediatek/mt2701/mt2701-reg.h create mode 100644 sound/soc/mediatek/mt8173/Makefile create mode 100644 sound/soc/mediatek/mt8173/mt8173-afe-common.h rename sound/soc/mediatek/{mtk-afe-pcm.c => mt8173/mt8173-afe-pcm.c} (51%) rename sound/soc/mediatek/{ => mt8173}/mt8173-max98090.c (99%) rename sound/soc/mediatek/{ => mt8173}/mt8173-rt5650-rt5514.c (99%) rename sound/soc/mediatek/{ => mt8173}/mt8173-rt5650-rt5676.c (99%) rename sound/soc/mediatek/{ => mt8173}/mt8173-rt5650.c (99%) delete mode 100644 sound/soc/mediatek/mtk-afe-common.h -- 1.9.1

3 19

[alsa-devel] [asoc:for-next 9/16] cygnus-pcm.c:undefined reference to `bad_dma_ops'
by kbuild test robot 03 Jul '16

03 Jul '16

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next head: 5664c75bd47efe7c701d1d46ee90c795ff8bc150 commit: ebe0ee8d716bcb3cb890e4feb6c6e07e0de11208 [9/16] Merge remote-tracking branches 'asoc/topic/cygnus', 'asoc/topic/da7219', 'asoc/topic/davinci' and 'asoc/topic/dpcm' into asoc-next config: m32r-allyesconfig (attached as .config) compiler: m32r-linux-gcc (GCC) 4.9.0 reproduce: wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/m… -O ~/bin/make.cross chmod +x ~/bin/make.cross git checkout ebe0ee8d716bcb3cb890e4feb6c6e07e0de11208 # save the attached .config to linux build tree make.cross ARCH=m32r All errors (new ones prefixed by >>): drivers/built-in.o: In function `zynq_fpga_ops_write': zynq-fpga.c:(.text+0xeff96c): undefined reference to `bad_dma_ops' zynq-fpga.c:(.text+0xeff974): undefined reference to `bad_dma_ops' zynq-fpga.c:(.text+0xeffa94): undefined reference to `bad_dma_ops' sound/built-in.o: In function `snd_pcm_lib_default_mmap': (.text+0xfcb4): undefined reference to `bad_dma_ops' sound/built-in.o: In function `snd_pcm_lib_default_mmap': (.text+0xfcbc): undefined reference to `bad_dma_ops' sound/built-in.o: In function `snd_pcm_lib_default_mmap': (.text+0xfcd4): undefined reference to `dma_common_mmap' sound/built-in.o: In function `snd_pcm_lib_default_mmap': (.text+0xfcd4): relocation truncated to fit: R_M32R_26_PCREL_RELA against undefined symbol `dma_common_mmap' sound/built-in.o: In function `cygnus_pcm_preallocate_dma_buffer': >> cygnus-pcm.c:(.text+0x10efa0): undefined reference to `bad_dma_ops' cygnus-pcm.c:(.text+0x10efa4): undefined reference to `bad_dma_ops' sound/built-in.o: In function `cygnus_dma_free_dma_buffers': cygnus-pcm.c:(.text+0x10f15c): undefined reference to `bad_dma_ops' cygnus-pcm.c:(.text+0x10f160): undefined reference to `bad_dma_ops' cygnus-pcm.c:(.text+0x10f16c): undefined reference to `bad_dma_ops' sound/built-in.o:cygnus-pcm.c:(.text+0x10f170): more undefined references to `bad_dma_ops' follow --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [GIT PULL] ASoC fixes for v4.7
by Mark Brown 03 Jul '16

03 Jul '16

The following changes since commit 4c2e07c6a29e0129e975727b9f57eede813eea85: Linux 4.7-rc5 (2016-06-26 17:52:03 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v4.7-rc5 for you to fetch changes up to 7c5eec4edf4693aa61f3ee78bf28621dfe33d9f0: Merge remote-tracking branches 'asoc/fix/rcar', 'asoc/fix/rt5670' and 'asoc/fix/wm8940' into asoc-linus (2016-07-01 18:05:34 +0200) ---------------------------------------------------------------- ASoC: Fixes for v4.7 A small clutch of hardware specific fixes for various ASoC devices, all small individually and important if you have that device but not otherwise. ---------------------------------------------------------------- Ajit Pandey (1): ASoC: wm5110: Add missing route from OUT3R to SYSCLK Alan Cox (1): ASoC: Intel: atom: fix missing breaks that would cause the wrong operation to execute Alexander Shiyan (1): ASoC: fsl_ssi: Fix number of words per frame for I2S-slave mode Arnd Bergmann (1): ASoC: hdmi-codec: select CONFIG_HDMI Bard Liao (2): ASoC: rt5670: fix HP Playback Volume control ASoC: rt5645: fix reg-2f default value. Charles Keepax (1): ASoC: wm5102: Correct supported channels on trace compressed DAI Fabio Estevam (1): ASoC: ak4613: Remove owner assignment from platform_driver Geert Uytterhoeven (2): ASoC: wm8940: Enable cache usage to fix crashes on resume ASoC: ak4613: Enable cache usage to fix crashes on resume Janusz Krzysztofik (1): ASoC: cx20442: set tty->receiver_room in v253_open Kuninori Morimoto (1): ASoC: rsnd: open 31bit of SSICKR mask Mark Brown (4): Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-linus Merge remote-tracking branches 'asoc/fix/ak4613', 'asoc/fix/arizona', 'asoc/fix/cx20442', 'asoc/fix/davinci', 'asoc/fix/fsl-ssi' and 'asoc/fix/hdmi' into asoc-linus Merge remote-tracking branches 'asoc/fix/rcar', 'asoc/fix/rt5670' and 'asoc/fix/wm8940' into asoc-linus Peter Ujfalusi (1): ASoC: davinci-mcasp: Fix dra7 DMA offset when using CFG port Vinod Koul (2): ASoC: hdac_hdmi: Fix potential NULL dereference ASoC: Intel: Skylake: Initialize module list for Broxton sound/soc/codecs/Kconfig | 7 +-- sound/soc/codecs/ak4613.c | 2 +- sound/soc/codecs/cx20442.c | 1 + sound/soc/codecs/hdac_hdmi.c | 20 ++++++++ sound/soc/codecs/rt5645.c | 2 +- sound/soc/codecs/rt5670.c | 2 +- sound/soc/codecs/wm5102.c | 2 +- sound/soc/codecs/wm5110.c | 1 + sound/soc/codecs/wm8940.c | 1 + sound/soc/davinci/davinci-mcasp.c | 56 +++++++++++++++++++++-- sound/soc/davinci/davinci-mcasp.h | 4 +- sound/soc/fsl/fsl_ssi.c | 12 ++--- sound/soc/intel/atom/sst-mfld-platform-compress.c | 9 +++- sound/soc/intel/skylake/bxt-sst.c | 1 + sound/soc/sh/rcar/adg.c | 2 +- 15 files changed, 100 insertions(+), 22 deletions(-)

2 1

[alsa-devel] [PATCH] drm: mediatek: fix prototypes after API change
by Arnd Bergmann 02 Jul '16

02 Jul '16

The newly added mediatek HDMI driver clashes with an API change for struct hdmi_codec_ops, causing an 'allmodconfig' build to fail: drivers/gpu/drm/mediatek/mtk_hdmi.c:1653:15: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] drivers/gpu/drm/mediatek/mtk_hdmi.c:1654:19: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] drivers/gpu/drm/mediatek/mtk_hdmi.c:1655:20: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] drivers/gpu/drm/mediatek/mtk_hdmi.c:1656:18: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] drivers/gpu/drm/mediatek/mtk_hdmi.c:1657:13: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] This changes the API accordingly for the mediatek driver. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> Fixes: 8f83f26891e1 ("drm/mediatek: Add HDMI support") Fixes: efc9194bcff8 ("ASoC: hdmi-codec: callback function will be called with private data") --- The new driver is currently part of Dave Airlie's drm-next tree, while the API change is in Mark Brown's asoc-next tree, so my fix has to be done on top of both. I can see two ways out of this: a) Stephen Rothwell could add my fixup on top of linux-next as a merge fix, and the fix gets sent to Linus Torvalds along with the second of the two branches b) efc9194bcff8 gets merged into drm-next along with my change in the merge commit. It is currently a standalone patch in its own branch in the ASoC tree. --- drivers/gpu/drm/mediatek/mtk_hdmi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c index ba812ef2c9d1..334562d06731 100644 --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c @@ -1535,7 +1535,7 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi, * HDMI audio codec callbacks */ -static int mtk_hdmi_audio_hw_params(struct device *dev, +static int mtk_hdmi_audio_hw_params(struct device *dev, void *data, struct hdmi_codec_daifmt *daifmt, struct hdmi_codec_params *params) { @@ -1604,7 +1604,7 @@ static int mtk_hdmi_audio_hw_params(struct device *dev, return 0; } -static int mtk_hdmi_audio_startup(struct device *dev) +static int mtk_hdmi_audio_startup(struct device *dev, void *data) { struct mtk_hdmi *hdmi = dev_get_drvdata(dev); @@ -1615,7 +1615,7 @@ static int mtk_hdmi_audio_startup(struct device *dev) return 0; } -static void mtk_hdmi_audio_shutdown(struct device *dev) +static void mtk_hdmi_audio_shutdown(struct device *dev, void *data) { struct mtk_hdmi *hdmi = dev_get_drvdata(dev); @@ -1624,7 +1624,7 @@ static void mtk_hdmi_audio_shutdown(struct device *dev) mtk_hdmi_audio_disable(hdmi); } -int mtk_hdmi_audio_digital_mute(struct device *dev, bool enable) +int mtk_hdmi_audio_digital_mute(struct device *dev, void *data, bool enable) { struct mtk_hdmi *hdmi = dev_get_drvdata(dev); @@ -1638,7 +1638,7 @@ int mtk_hdmi_audio_digital_mute(struct device *dev, bool enable) return 0; } -static int mtk_hdmi_audio_get_eld(struct device *dev, uint8_t *buf, size_t len) +static int mtk_hdmi_audio_get_eld(struct device *dev, void *data, uint8_t *buf, size_t len) { struct mtk_hdmi *hdmi = dev_get_drvdata(dev); -- 2.9.0

4 3