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

[alsa-devel] [RESEND PATCH V3 13/15] ARM: dts: Exynos4 and Odroid X2/U3 sound device nodes update
by Sylwester Nawrocki 09 Feb '15

09 Feb '15

Clock related properties are added to the Exynos4 I2S device nodes so they can be referred to as clock providers. Missing i2s_opclk1 clock is added to the I2S0 node and clock properties are added to the MAX98090 codec node to allow it to control/read frequency of the MCLK clock directly. Signed-off-by: Sylwester Nawrocki <s.nawrocki(a)samsung.com> --- arch/arm/boot/dts/exynos4.dtsi | 6 ++++++ arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi index b8168f1..38d8f68 100644 --- a/arch/arm/boot/dts/exynos4.dtsi +++ b/arch/arm/boot/dts/exynos4.dtsi @@ -61,6 +61,8 @@ reg = <0x03830000 0x100>; clocks = <&clock_audss EXYNOS_I2S_BUS>; clock-names = "iis"; + #clock-cells = <1>; + clock-output-names = "i2s_cdclk0"; dmas = <&pdma0 12>, <&pdma0 11>, <&pdma0 10>; dma-names = "tx", "rx", "tx-sec"; samsung,idma-addr = <0x03000000>; @@ -372,6 +374,8 @@ reg = <0x13960000 0x100>; clocks = <&clock CLK_I2S1>; clock-names = "iis"; + #clock-cells = <1>; + clock-output-names = "i2s_cdclk1"; dmas = <&pdma1 12>, <&pdma1 11>; dma-names = "tx", "rx"; status = "disabled"; @@ -382,6 +386,8 @@ reg = <0x13970000 0x100>; clocks = <&clock CLK_I2S2>; clock-names = "iis"; + #clock-cells = <1>; + clock-output-names = "i2s_cdclk2"; dmas = <&pdma0 14>, <&pdma0 13>; dma-names = "tx", "rx"; status = "disabled"; diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi index 3fbf588..c26b9fb 100644 --- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi +++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi @@ -7,6 +7,7 @@ * published by the Free Software Foundation. */ +#include <dt-bindings/sound/samsung-i2s.h> #include <dt-bindings/input/input.h> #include "exynos4412.dtsi" @@ -37,8 +38,9 @@ pinctrl-names = "default"; status = "okay"; clocks = <&clock_audss EXYNOS_I2S_BUS>, - <&clock_audss EXYNOS_DOUT_AUD_BUS>; - clock-names = "iis", "i2s_opclk0"; + <&clock_audss EXYNOS_DOUT_AUD_BUS>, + <&clock_audss EXYNOS_SCLK_I2S>; + clock-names = "iis", "i2s_opclk0", "i2s_opclk1"; }; sound: sound { @@ -373,6 +375,8 @@ reg = <0x10>; interrupt-parent = <&gpx0>; interrupts = <0 0>; + clocks = <&i2s0 CLK_I2S_CDCLK>; + clock-names = "mclk"; }; }; -- 1.7.9.5

2 7

[alsa-devel] [PATCH 0/3] ASoC: atmel_ssc_dai: fix and refactor
by Bo Shen 09 Feb '15

09 Feb '15

This patch set do following things: - Fix the DSP mode A setting. - Refactor the startup and shutdown function. - Only clean PDC when use PDC. Bo Shen (3): ASoC: atmel_ssc_dai: fix the setting for DSP mode ASoC: atmel_ssc_dai: refactor the startup and shutdown ASoC: atmel_ssc_dai: only clean PDC when using PDC sound/soc/atmel/atmel_ssc_dai.c | 54 +++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 29 deletions(-) -- 2.3.0.rc0

2 5

[alsa-devel] [PATCH] ALSA: control: obsolete 'already present' messaging because it's caller's fault
by Takashi Sakamoto 08 Feb '15

08 Feb '15

When drivers or userspace applications add a duplicated control, snd module outputs error message and return -EBUSY. This state is a bug in driver or application, therefore the messaging should be done by them, not by snd module. Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/core/control.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/sound/core/control.c b/sound/core/control.c index d482997..8906b66 100644 --- a/sound/core/control.c +++ b/sound/core/control.c @@ -357,18 +357,10 @@ int snd_ctl_add(struct snd_card *card, struct snd_kcontrol *kcontrol) down_write(&card->controls_rwsem); if (snd_ctl_find_id(card, &id)) { - up_write(&card->controls_rwsem); - dev_err(card->dev, "control %i:%i:%i:%s:%i is already present\n", - id.iface, - id.device, - id.subdevice, - id.name, - id.index); err = -EBUSY; goto error; } if (snd_ctl_find_hole(card, kcontrol->count) < 0) { - up_write(&card->controls_rwsem); err = -ENOMEM; goto error; } @@ -388,6 +380,7 @@ int snd_ctl_add(struct snd_card *card, struct snd_kcontrol *kcontrol) return 0; error: + up_write(&card->controls_rwsem); snd_ctl_free_one(kcontrol); return err; } -- 2.1.0

2 2

[alsa-devel] [PATCH v2] ALSA: control: fix failure to return numerical ID in 'add' event
by Takashi Sakamoto 08 Feb '15

08 Feb '15

Currently when adding a new control, the assigned numerical ID is not set for event data, thus userspace applications cannot realize it just by event data. Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/core/control.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/core/control.c b/sound/core/control.c index 60caba1..8aae6ea 100644 --- a/sound/core/control.c +++ b/sound/core/control.c @@ -373,6 +373,7 @@ int snd_ctl_add(struct snd_card *card, struct snd_kcontrol *kcontrol) card->controls_count += kcontrol->count; kcontrol->id.numid = card->last_numid + 1; card->last_numid += kcontrol->count; + id = kcontrol->id; count = kcontrol->count; up_write(&card->controls_rwsem); for (idx = 0; idx < count; idx++, id.index++, id.numid++) -- 2.1.0

2 1

[alsa-devel] [PATCH] ALSA: control: fix failure to return numerical ID in event data
by Takashi Sakamoto 08 Feb '15

08 Feb '15

Currently an instance of control has zero as its member for numerical ID even if any IDs are assigned to. According to this bug, any userspace applications cannot identify controls by the ID when handling any events. On the other hand, the other members such as name are still valid, therefore applications can identify controls without fixing this. This is not preferable because the ID has an advantage to allow userspace applications to distinguish each controls by itself, without any combinations. Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/core/control.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/sound/core/control.c b/sound/core/control.c index 60caba1..d482997 100644 --- a/sound/core/control.c +++ b/sound/core/control.c @@ -352,6 +352,9 @@ int snd_ctl_add(struct snd_card *card, struct snd_kcontrol *kcontrol) if (id.index > UINT_MAX - kcontrol->count) goto error; + /* Any ID numbers are not assigned to this control yet. */ + id.numid = 0; + down_write(&card->controls_rwsem); if (snd_ctl_find_id(card, &id)) { up_write(&card->controls_rwsem); @@ -369,12 +372,17 @@ int snd_ctl_add(struct snd_card *card, struct snd_kcontrol *kcontrol) err = -ENOMEM; goto error; } - list_add_tail(&kcontrol->list, &card->controls); - card->controls_count += kcontrol->count; + + /* Now this control is allowed to have ID number. */ kcontrol->id.numid = card->last_numid + 1; card->last_numid += kcontrol->count; - count = kcontrol->count; + card->controls_count += kcontrol->count; + list_add_tail(&kcontrol->list, &card->controls); + up_write(&card->controls_rwsem); + + id = kcontrol->id; + count = kcontrol->count; for (idx = 0; idx < count; idx++, id.index++, id.numid++) snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_ADD, &id); return 0; -- 2.1.0

2 2

[alsa-devel] Some questions about userspace control elements
by Takashi Sakamoto 08 Feb '15

08 Feb '15

Dear all, I have some questions about ALSA control interface. Currently I'm working for writing control applications in userspace. The application adds some control elements to a certain control device, then execute interprocess communication via the device by ALSA control interface. To help this work, I'm preparing for alsa-gir, with partly implementation of ALSA Control/Timer/Sequencer interface. (Currently I have no plan to support the other interfaces, such as PCM.) https://github.com/takaswie/alsa-gir Then I have six questions. 1.The 'numid' is unique number for each element or not. 2.The 'numid' is always zero in SND_CTL_EVENT_MASK_ADD event. 3.The way to change permissions of each control element. 4.Added elements are not removed when closing fd. 5.Processes can delete elements which the other processes added. 6.The operation to replace element generates separate events. In detail: 1.The 'numid' is unique number for each element or not? I want to use it to indicate each element, if possible. But there're more members in snd_ctl_elem_id structure. 2.The 'numid' can be notified in SND_CTL_EVENT_MASK_ADD event? As long as I test, it's always zero when userspace applications add any elements. Is it an expected behaviour? Or a bug? 3.The way to change permissions of each control element. Is it possible after adding the elements? If possible, how to notify it in the other processes? 4.Any elements added by a process are not removed at closing snd_ctl_t. They're remained after closing the process' snd_ctl_t. Is it an expected behaviour? Or a bug? 5.Processes can delete elements which the other processes added. Is it an expected behaviour? Or a bug? 6.The operation to replace elements generates separate events. ADD/REMOVE events occurs sequencially. Userspace application cannot distinguish replacement from adding/removing, therefore cannot process appropriate action. Is it an expected behaviour? Or a bug? Regards Takashi Sakamoto

2 8

[alsa-devel] [PATCH v2 0/3] More Line 6 cleanup
by Chris Rorvick 08 Feb '15

08 Feb '15

Changes in v2: * return true/false instead of 1/0 * do not include spaces in driver name * drop patch altering struct names (unnecessary) Chris Rorvick (3): ALSA: line6: Add toneport_has_source_select() ALSA: line6: Pass toneport pointer to toneport_has_led() ALSA: line6: Pass driver name to line6_probe() sound/usb/line6/driver.c | 3 ++- sound/usb/line6/driver.h | 3 +-- sound/usb/line6/pod.c | 2 +- sound/usb/line6/podhd.c | 2 +- sound/usb/line6/toneport.c | 53 +++++++++++++++++++++++++--------------------- sound/usb/line6/variax.c | 2 +- 6 files changed, 35 insertions(+), 30 deletions(-) -- 2.1.0

2 4

[alsa-devel] [PATCH] ASoC: Intel: sst: Fix firmware name size handling
by Christian Engelmayer 08 Feb '15

08 Feb '15

Function sst_acpi_probe() uses plain strcpy for setting member firmware_name of a struct intel_sst_drv from member firmware of a struct sst_machines. Thereby the destination array has got a length of 20 byte while the source may hold 32 byte. Since eg. commit 64b9c90b8600 ("ASoC: Intel: Fix BYTCR firmware name") increased strings from "fw_sst_0f28.bin" to "intel/fw_sst_0f28.bin" there is an actual possibility that the 20 byte array at the end of struct intel_sst_drv is overrun. Thus increase the size of the destination and use the same define for both structs. Detected by Coverity CID 1260087. Signed-off-by: Christian Engelmayer <cengelma(a)gmx.at> --- Compile tested only. Applies against linux-next. --- sound/soc/intel/sst/sst.h | 3 ++- sound/soc/intel/sst/sst_acpi.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/intel/sst/sst.h b/sound/soc/intel/sst/sst.h index 7f4bbfc..562bc48 100644 --- a/sound/soc/intel/sst/sst.h +++ b/sound/soc/intel/sst/sst.h @@ -58,6 +58,7 @@ enum sst_algo_ops { #define SST_BLOCK_TIMEOUT 1000 #define FW_SIGNATURE_SIZE 4 +#define FW_NAME_SIZE 32 /* stream states */ enum sst_stream_states { @@ -426,7 +427,7 @@ struct intel_sst_drv { * Holder for firmware name. Due to async call it needs to be * persistent till worker thread gets called */ - char firmware_name[20]; + char firmware_name[FW_NAME_SIZE]; }; /* misc definitions */ diff --git a/sound/soc/intel/sst/sst_acpi.c b/sound/soc/intel/sst/sst_acpi.c index 43bc1c4..0542442 100644 --- a/sound/soc/intel/sst/sst_acpi.c +++ b/sound/soc/intel/sst/sst_acpi.c @@ -47,7 +47,7 @@ struct sst_machines { char board[32]; char machine[32]; void (*machine_quirk)(void); - char firmware[32]; + char firmware[FW_NAME_SIZE]; struct sst_platform_info *pdata; }; -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: sirf: atlas7: fix platform_no_drv_owner.cocci warnings
by kbuild test robot 08 Feb '15

08 Feb '15

sound/soc/sirf/atlas7-iacc.c:625:3-8: No need to set .owner here. The core will do it. Remove .owner field if calls are used which set it automatically Generated by: scripts/coccinelle/api/platform_no_drv_owner.cocci CC: Rongjun Ying <rongjun.ying(a)csr.com> Signed-off-by: Fengguang Wu <fengguang.wu(a)intel.com> --- atlas7-iacc.c | 1 - 1 file changed, 1 deletion(-) --- a/sound/soc/sirf/atlas7-iacc.c +++ b/sound/soc/sirf/atlas7-iacc.c @@ -622,7 +622,6 @@ static const struct dev_pm_ops atlas7_ia static struct platform_driver atlas7_iacc_driver = { .driver = { .name = "sirf-atlas7-iacc", - .owner = THIS_MODULE, .of_match_table = atlas7_iacc_of_match, .pm = &atlas7_iacc_pm_ops, },

1 0

[alsa-devel] [PATCH 0/4] More Line 6 cleanup
by Chris Rorvick 07 Feb '15

07 Feb '15

Not much to say about these other than what's in the commit log. I was looking into what appeared to be a regression that was only reproducible outside of QEMU, but it turned out to be me pulling in the test/snd-device changes but testing against vanilla v3.19-rc7 ALSA modules. Fixing my process. :-) Regards, Chris Chris Rorvick (4): ALSA: line6: Add toneport_has_source_select() ALSA: line6: Pass toneport pointer to toneport_has_led() ALSA: line6: Pass driver name to line6_probe() ALSA: line6: Remove `usb_' prefix from structs sound/usb/line6/capture.c | 2 +- sound/usb/line6/driver.c | 45 +++++++++++----------- sound/usb/line6/driver.h | 25 ++++++------ sound/usb/line6/midi.c | 24 +++++------- sound/usb/line6/midi.h | 6 +-- sound/usb/line6/pcm.c | 5 +-- sound/usb/line6/pcm.h | 4 +- sound/usb/line6/playback.c | 2 +- sound/usb/line6/pod.c | 52 ++++++++++++------------- sound/usb/line6/podhd.c | 7 ++-- sound/usb/line6/toneport.c | 94 ++++++++++++++++++++++++---------------------- sound/usb/line6/variax.c | 41 ++++++++++---------- 12 files changed, 151 insertions(+), 156 deletions(-) -- 2.1.0

2 11