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

[alsa-devel] [PATCH 0/3] Add master mode, tmd and right-j mode support
by Zidan Wang 23 Jan '15

23 Jan '15

Add sai master mode support. Add tdm slots support. Add Right-J mode support. Zidan Wang (3): SoC: fsl_sai: add sai master mode support ASoC: fsl_sai: Add support for tdm slots operation ASoC: fsl_sai: Add support for Right-J mode sound/soc/fsl/fsl_sai.c | 164 ++++++++++++++++++++++++++++++++++++++++++++---- sound/soc/fsl/fsl_sai.h | 13 +++- 2 files changed, 164 insertions(+), 13 deletions(-) -- 1.9.1

4 18

[alsa-devel] [PATCH v3 0/4] Sound support for Exynos4412 Trats2 board
by Inha Song 23 Jan '15

23 Jan '15

This patch-set adds basic sound support for the Trats2 boards. It just support primary I2s and external speaker playback. Changes in v3: - Set clock out parent to XUSBXTI in pmu_system_controller DT node. Changes in v2: - Remove unnecessary lines in Trats2 machine driver - move clock enable/disable to .startup / .shutdown - Fix code style issues - Remove mclk DT property in Trats2 sound and add MCLK1 property in WM1811 node. (MCLK1 is optional property in WM8994 node - refer: Document/devicetree/bindings/sound/wm8994.txt) - Use mclk that defined in WM1811 DT node. - Add "samsung,audio-codec" property to required properties. Inha Song (4): ASoC: samsung: Add machine driver for Trats2 ASoC: samsung: Document Trats2 audio subsystem bindings ARM: dts: set clock out parent to XUSBXTI ARM: dts: Add sound nodes for exynos4412-trats2 .../bindings/sound/samsung,trats2-wm1811.txt | 25 +++ arch/arm/boot/dts/exynos4.dtsi | 2 + arch/arm/boot/dts/exynos4412-trats2.dts | 37 ++++ sound/soc/samsung/Kconfig | 8 + sound/soc/samsung/Makefile | 2 + sound/soc/samsung/trats2_wm1811.c | 218 +++++++++++++++++++++ 6 files changed, 292 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/samsung,trats2-wm1811.txt create mode 100644 sound/soc/samsung/trats2_wm1811.c -- 2.0.0.390.gcb682f8

3 10

[alsa-devel] alsa-lib support for compress offload
by Qais Yousef 23 Jan '15

23 Jan '15

Hi, As far as I understand I need to use something similar to tinycompress to use alsa devices that supports compress offload. When I asked on gstreamer list [1] about alsasink support for compress offload they said yes. But I can see that gstalsasink.c [2] only uses the standard alsa-lib api which AFAICT doesn't support compress offload. Did I misread the code and alsa-lib actually works with compress offload? Gstreamer refers to the feature "passthrough" and associate it with SPDIF[3], are they taking advantage of some other alsa feature that looks like compress offload? Thanks, Qais [1] http://gstreamer-devel.966125.n4.nabble.com/ALSA-Compress-Offload-support-t… [2] http://cgit.freedesktop.org/gstreamer/gst-plugins-base/tree/ext/alsa/gstals… [3] http://cgit.freedesktop.org/gstreamer/gst-plugins-base/tree/ext/alsa/gstals…

6 16

[alsa-devel] [PATCH 1/1] ASoC: tas5086: Reinit register values in probe function
by pascal.huerst＠gmail.com 22 Jan '15

22 Jan '15

From: Pascal Huerst <pascal.huerst(a)gmail.com> If the machine driver has been un/reloaded, the register values of the tas5086 codec have to be reinitialized, in order to work properly. Signed-off-by: Pascal Huerst <pascal.huerst(a)gmail.com> diff --git a/sound/soc/codecs/tas5086.c b/sound/soc/codecs/tas5086.c index 249ef5c..cd19171 100644 --- a/sound/soc/codecs/tas5086.c +++ b/sound/soc/codecs/tas5086.c @@ -851,10 +851,16 @@ static int tas5086_probe(struct snd_soc_codec *codec) } tas5086_reset(priv); + regcache_mark_dirty(priv->regmap); + ret = tas5086_init(codec->dev, priv); if (ret < 0) goto exit_disable_regulators; + ret = regcache_sync(priv->regmap); + if (ret < 0) + goto exit_disable_regulators; + /* set master volume to 0 dB */ ret = regmap_write(priv->regmap, TAS5086_MASTER_VOL, 0x30); if (ret < 0) -- 1.9.3

1 0

[alsa-devel] [PATCH - UCM 1/1] ucm: add binary configure file parse
by han.lu＠intel.com 22 Jan '15

22 Jan '15

From: "Lu, Han" <han.lu(a)intel.com> with cset command, UCM set kcontrol parameters directly: cset "name='<KCONTROL_NAME>' 1<,2,3,...>" This patch enables UCM to set kcontrol with parameters from configure file: cset-bin-file "name='<KCONTROL_NAME>' <path/to/file>" where "cset-bin-file" is a newly added keyword alongside of "cset", to indicate cset with binary data in file. The binary data in file is parameter for audio DSPs, and it's just passed by UCM/ALSA as raw data. The data type of parameter elements must be byte, and the count must matches driver definition. Signed-off-by: Lu, Han <han.lu(a)intel.com> diff --git a/src/ucm/main.c b/src/ucm/main.c index 37ae4c8..4c1e4b2 100644 --- a/src/ucm/main.c +++ b/src/ucm/main.c @@ -160,11 +160,62 @@ static int open_ctl(snd_use_case_mgr_t *uc_mgr, return 0; } +static int binary_file_parse(snd_ctl_elem_value_t *dst, + snd_ctl_elem_info_t *info, + const char *filepath) +{ + int err, fd; + struct stat st; + size_t sz; + char *res; + snd_ctl_elem_type_t type; + unsigned int idx, count; + + type = snd_ctl_elem_info_get_type(info); + if (type != SND_CTL_ELEM_TYPE_BYTES) { + uc_error("only support byte type!"); + err = -EINVAL; + return err; + } + fd = open(filepath, O_RDONLY); + if (fd < 0) { + err = -errno; + return err; + } + if (stat(filepath, &st) == -1) { + err = -errno; + goto __fail; + } + sz = st.st_size; + count = snd_ctl_elem_info_get_count(info); + if (sz != count || sz > sizeof(dst->value.bytes)) { + uc_error("invalid parameter size %d!", sz); + err = -EINVAL; + goto __fail; + } + res = malloc(sz); + if (res == NULL) { + err = -ENOMEM; + goto __fail; + } + if (read(fd, res, sz) != sz) { + err = -errno; + goto __fail_read; + } + for (idx = 0; idx < sz; idx++) + snd_ctl_elem_value_set_byte(dst, idx, *(res + idx)); + __fail_read: + free(res); + __fail: + close(fd); + return err; +} + extern int __snd_ctl_ascii_elem_id_parse(snd_ctl_elem_id_t *dst, const char *str, const char **ret_ptr); -static int execute_cset(snd_ctl_t *ctl, const char *cset) +static int execute_cset(snd_ctl_t *ctl, const char *cset, unsigned int type) { const char *pos; int err; @@ -194,7 +245,10 @@ static int execute_cset(snd_ctl_t *ctl, const char *cset) err = snd_ctl_elem_info(ctl, info); if (err < 0) goto __fail; - err = snd_ctl_ascii_value_parse(ctl, value, info, pos); + if (type == SEQUENCE_ELEMENT_TYPE_CSET_BIN_FILE) + err = binary_file_parse(value, info, pos); + else + err = snd_ctl_ascii_value_parse(ctl, value, info, pos); if (err < 0) goto __fail; err = snd_ctl_elem_write(ctl, value); @@ -239,6 +293,7 @@ static int execute_sequence(snd_use_case_mgr_t *uc_mgr, goto __fail_nomem; break; case SEQUENCE_ELEMENT_TYPE_CSET: + case SEQUENCE_ELEMENT_TYPE_CSET_BIN_FILE: if (cdev == NULL) { const char *cdev1 = NULL, *cdev2 = NULL; err = get_value3(&cdev1, "PlaybackCTL", @@ -274,7 +329,7 @@ static int execute_sequence(snd_use_case_mgr_t *uc_mgr, goto __fail; } } - err = execute_cset(ctl, s->data.cset); + err = execute_cset(ctl, s->data.cset, s->type); if (err < 0) { uc_error("unable to execute cset '%s'\n", s->data.cset); goto __fail; diff --git a/src/ucm/parser.c b/src/ucm/parser.c index d7517f6..9e1cb41 100644 --- a/src/ucm/parser.c +++ b/src/ucm/parser.c @@ -306,6 +306,16 @@ static int parse_sequence(snd_use_case_mgr_t *uc_mgr ATTRIBUTE_UNUSED, continue; } + if (strcmp(cmd, "cset-bin-file") == 0) { + curr->type = SEQUENCE_ELEMENT_TYPE_CSET_BIN_FILE; + err = parse_string(n, &curr->data.cset); + if (err < 0) { + uc_error("error: cset-bin-file requires a string!"); + return err; + } + continue; + } + if (strcmp(cmd, "usleep") == 0) { curr->type = SEQUENCE_ELEMENT_TYPE_SLEEP; err = snd_config_get_integer(n, &curr->data.sleep); diff --git a/src/ucm/ucm_local.h b/src/ucm/ucm_local.h index 87f14a2..c1655c7 100644 --- a/src/ucm/ucm_local.h +++ b/src/ucm/ucm_local.h @@ -47,6 +47,7 @@ #define SEQUENCE_ELEMENT_TYPE_CSET 2 #define SEQUENCE_ELEMENT_TYPE_SLEEP 3 #define SEQUENCE_ELEMENT_TYPE_EXEC 4 +#define SEQUENCE_ELEMENT_TYPE_CSET_BIN_FILE 5 struct ucm_value { struct list_head list; -- 2.1.0

3 2

[alsa-devel] [PATCH v2 0/3] Sound support for Exynos4412 Trats2 board
by Inha Song 22 Jan '15

22 Jan '15

This patch-set adds basic sound support for the Trats2 boards. It just support primary I2s and external speaker playback. Changes in v2: - Remove unnecessary lines in Trats2 machine driver - move clock enable/disable to .startup / .shutdown - Fix code style issues - Remove mclk DT property in Trats2 sound and add MCLK1 property in WM1811 node. (MCLK1 is optional property in WM8994 node - refer: Document/devicetree/bindings/sound/wm8994.txt) - Use mclk that defined in WM1811 DT node. - Add "samsung,audio-codec" property to required properties. Inha Song (3): ASoC: samsung: Add machine driver for Trats2 ASoC: samsung: Document Trats2 audio subsystem bindings ARM: dts: Add sound nodes for exynos4412-trats2 .../bindings/sound/samsung,trats2-wm1811.txt | 25 +++ arch/arm/boot/dts/exynos4412-trats2.dts | 39 ++++ sound/soc/samsung/Kconfig | 8 + sound/soc/samsung/Makefile | 2 + sound/soc/samsung/trats2_wm1811.c | 218 +++++++++++++++++++++ 5 files changed, 292 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/samsung,trats2-wm1811.txt create mode 100644 sound/soc/samsung/trats2_wm1811.c -- 2.0.0.390.gcb682f8

2 5

[alsa-devel] Question about codec which is supporting TDM / 5.1ch
by Kuninori Morimoto 22 Jan '15

22 Jan '15

Hi ALSA / ALSA SoC Now, we want to create new board, and then, we want to use below codec if exist. Can you show it to us if it was exist ? (I researched it on upstream Linux source tree, but couldn't find....) - upstream Linux supports its driver - it supports TDM format - it supports 5.1ch sound - it supports DT bindings (if possible) Best regards --- Kuninori Morimoto

3 4

[alsa-devel] Hauppauge USB-Live2 recording fails on USB3 port
by Alistair Grant 21 Jan '15

21 Jan '15

Hi, I've been attempting to capture video through a Hauppauge USB-Live2 device using: mythffmpeg -y -loglevel debug -f alsa -i plughw:1,0 -f v4l2 -s pal -pix_fmt yuyv422 -i /dev/video1 -b:v 2048k a.nut This works fine from Ubuntu 14.04 on an older laptop that only has USB2, but fails on my Dell XPS13, which only has USB3 ports (Ubuntu 14.10, Kernel 3.16, 3.18, 3.19). I have included a larger extract from /var/log/syslog below, however three of the lines are: Jan 18 16:49:23 alistair-XPS13 pulseaudio[3296]: [alsa-sink-ALC3661 Analog] alsa-sink.c: ALSA woke us up to write new data to the device, but there was actually nothing to write! Jan 18 16:49:23 alistair-XPS13 pulseaudio[3296]: [alsa-sink-ALC3661 Analog] alsa-sink.c: Most likely this is a bug in the ALSA driver 'snd_hda_intel'. Please report this issue to the ALSA developers. Jan 18 16:49:23 alistair-XPS13 pulseaudio[3296]: [alsa-sink-ALC3661 Analog] alsa-sink.c: We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() returned 0 or another value < min_avail. I have already posted this on the linux-usb mailing list and received a confirmation from the author of the USB-Live2 USB driver that there are problems with USB3. So I expect that this is a USB3 xHCI problem and not an ALSA problem, but if there is a workaround I would be very interested. If you'd like more information or me to do more testing, please let me know. Thanks very much, Alistair Original report to Ubuntu Bugs: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1412121 linux-usb report: http://thread.gmane.org/gmane.linux.usb.general/121094 Additional discussion on linux-usb: http://www.spinics.net/lists/linux-usb/msg120276.html /var/log/syslog extract: Jan 18 16:48:16 alistair-XPS13 kernel: [ 83.790754] usb 1-1: new high-speed USB device number 5 using xhci_hcd Jan 18 16:48:16 alistair-XPS13 kernel: [ 83.921414] usb 1-1: New USB device found, idVendor=2040, idProduct=c200 Jan 18 16:48:16 alistair-XPS13 kernel: [ 83.921422] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3 Jan 18 16:48:16 alistair-XPS13 kernel: [ 83.921426] usb 1-1: Product: Hauppauge Device Jan 18 16:48:16 alistair-XPS13 kernel: [ 83.921430] usb 1-1: Manufacturer: Hauppauge Jan 18 16:48:16 alistair-XPS13 kernel: [ 83.921433] usb 1-1: SerialNumber: 0011446325 Jan 18 16:48:16 alistair-XPS13 mtp-probe: checking bus 1, device 5: "/sys/devices/pci0000:00/0000:00:14.0/usb1/1-1" Jan 18 16:48:16 alistair-XPS13 mtp-probe: bus: 1, device: 5 was not an MTP device Jan 18 16:48:16 alistair-XPS13 kernel: [ 83.985669] cx231xx 1-1:1.1: New device Hauppauge Hauppauge Device @ 480 Mbps (2040:c200) with 6 interfaces Jan 18 16:48:16 alistair-XPS13 kernel: [ 83.985716] cx231xx 1-1:1.1: can't change interface 3 alt no. to 3: Max. Pkt size = 0 Jan 18 16:48:16 alistair-XPS13 kernel: [ 83.987108] cx231xx 1-1:1.1: can't change interface 4 alt no. to 1: Max. Pkt size = 0 Jan 18 16:48:16 alistair-XPS13 kernel: [ 83.988279] cx231xx 1-1:1.1: Identified as Hauppauge USB Live 2 (card=9) Jan 18 16:48:16 alistair-XPS13 kernel: [ 83.988572] i2c i2c-10: Added multiplexed i2c bus 12 Jan 18 16:48:16 alistair-XPS13 kernel: [ 83.988633] i2c i2c-10: Added multiplexed i2c bus 13 Jan 18 16:48:16 alistair-XPS13 kernel: [ 84.088325] cx25840 9-0044: cx23102 A/V decoder found @ 0x88 (cx231xx #0-0) Jan 18 16:48:18 alistair-XPS13 kernel: [ 86.036671] cx25840 9-0044: loaded v4l-cx231xx-avcore-01.fw firmware (16382 bytes) Jan 18 16:48:18 alistair-XPS13 kernel: [ 86.067096] cx231xx 1-1:1.1: v4l2 driver version 0.0.3 Jan 18 16:48:19 alistair-XPS13 kernel: [ 86.153723] cx231xx 1-1:1.1: Registered video device video1 [v4l2] Jan 18 16:48:19 alistair-XPS13 kernel: [ 86.153864] cx231xx 1-1:1.1: Registered VBI device vbi0 Jan 18 16:48:19 alistair-XPS13 kernel: [ 86.153869] cx231xx 1-1:1.1: video EndPoint Addr 0x84, Alternate settings: 5 Jan 18 16:48:19 alistair-XPS13 kernel: [ 86.153872] cx231xx 1-1:1.1: VBI EndPoint Addr 0x85, Alternate settings: 2 Jan 18 16:48:19 alistair-XPS13 kernel: [ 86.153875] cx231xx 1-1:1.1: sliced CC EndPoint Addr 0x86, Alternate settings: 2 Jan 18 16:48:19 alistair-XPS13 kernel: [ 86.154013] usbcore: registered new interface driver cx231xx Jan 18 16:48:19 alistair-XPS13 kernel: [ 86.176396] cx231xx 1-1:1.1: audio EndPoint Addr 0x83, Alternate settings: 3 Jan 18 16:48:19 alistair-XPS13 kernel: [ 86.176402] cx231xx 1-1:1.1: Cx231xx Audio Extension initialized Jan 18 16:48:19 alistair-XPS13 pulseaudio[3296]: [pulseaudio] source.c: Default and alternate sample rates are the same. Jan 18 16:48:19 alistair-XPS13 rtkit-daemon[2205]: Successfully made thread 3819 of process 3296 (n/a) owned by '1000' RT at priority 5. Jan 18 16:48:19 alistair-XPS13 rtkit-daemon[2205]: Supervising 5 threads of 1 processes of 1 users. Jan 18 16:49:23 alistair-XPS13 pulseaudio[3296]: [alsa-sink-ALC3661 Analog] alsa-sink.c: ALSA woke us up to write new data to the device, but there was actually nothing to write! Jan 18 16:49:23 alistair-XPS13 pulseaudio[3296]: [alsa-sink-ALC3661 Analog] alsa-sink.c: Most likely this is a bug in the ALSA driver 'snd_hda_intel'. Please report this issue to the ALSA developers. Jan 18 16:49:23 alistair-XPS13 pulseaudio[3296]: [alsa-sink-ALC3661 Analog] alsa-sink.c: We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() returned 0 or another value < min_avail. Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.336417] xhci_hcd 0000:00:14.0: xHCI host not responding to stop endpoint command. Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.336428] xhci_hcd 0000:00:14.0: Assuming host is dying, halting host. Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.336542] usb 1-1: Not enough bandwidth for altsetting 0 Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.336553] cx231xx 1-1:1.1: can't change interface 2 alt no. to 0 (err=-19) Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.336554] xhci_hcd 0000:00:14.0: HC died; cleaning up Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.336563] cx231xx 1-1:1.1: failed to set alternate setting ! Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.336669] cx231xx 1-1:1.1: cx231xx_send_usb_command: failed with status --19 Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.336679] cx231xx 1-1:1.1: cx231xx_send_usb_command: failed with status --19 Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.337094] usb 1-1: USB disconnect, device number 5 Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.337451] cx231xx 1-1:1.1: device video1 is open! Deregistration and memory deallocation are deferred on close. Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.372776] usb 1-3: USB disconnect, device number 2 Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.373439] usb 1-1:1.1: V4L2 device vbi0 deregistered Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.373449] ------------[ cut here ]------------ Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.373462] WARNING: CPU: 3 PID: 3992 at /home/apw/COD/linux/fs/sysfs/group.c:219 sysfs_remove_group+0xa3/0xb0() Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.373466] sysfs group ffffffff81cb60a0 not found for kobject 'vbi0' Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.373469] Modules linked in: cx231xx_alsa cx25840 cx231xx videobuf_vmalloc tveeprom cx2341x rc_core videobuf_core i2c_mux pci_stub vboxpci(OE) vboxnetadp(OE) vboxnetflt(OE) vboxdrv(OE) xt_CHECKSUM iptable_mangle ipt_MASQUERADE nf_nat_masquerade_ipv4 iptable_nat nf_conntrack_ipv4 nf_defrag_ipv4 nf_nat_ipv4 nf_nat nf_conntrack xt_tcpudp bridge stp llc iptable_filter ip_tables x_tables ctr ccm dm_crypt rpcsec_gss_krb5 nfsv4 joydev arc4 snd_soc_rt5640 hid_rmi btusb dell_wmi snd_soc_rl6231 sparse_keymap intel_rapl iosf_mbi snd_soc_core uvcvideo videobuf2_vmalloc x86_pkg_temp_thermal videobuf2_memops snd_compress videobuf2_core v4l2_common snd_pcm_dmaengine hid_multitouch intel_powerclamp videodev snd_seq_midi snd_seq_midi_event media snd_rawmidi kvm_intel kvm snd_seq iwlmvm crct10dif_pclmul crc32_pclmul mac80211 dell_laptop dcdbas ghash_clmulni_intel aesni_intel aes_x86_64 snd_hda_codec_hdmi lrw snd_hda_codec_realtek snd_hda_codec_generic gf128mul rfcomm glue_helper iwlwifi bnep ablk_helper cryptd snd_hda_intel snd_seq_device snd_hda_controller bluetooth snd_hda_codec serio_raw snd_hwdep cfg80211 snd_pcm mei_me mei snd_timer lpc_ich shpchp snd dw_dmac snd_soc_sst_acpi nfsd soundcore i2c_hid auth_rpcgss nfs_acl i2c_designware_platform 8250_dw dw_dmac_core i2c_designware_core spi_pxa2xx_platform nfs intel_rst intel_smartconnect lockd grace sunrpc fscache mac_hid parport_pc ppdev coretemp lp parport usbhid hid i915 i2c_algo_bit drm_kms_helper psmouse ahci libahci drm wmi sdhci_acpi video sdhci Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.373655] CPU: 3 PID: 3992 Comm: mythffmpeg Tainted: G OE 3.19.0-031900rc5-generic #201501180935 Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.373659] Hardware name: Dell Inc. XPS13 9333/099TN4, BIOS A01 11/11/2013 Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.373662] 00000000000000db ffff8800ae8a3c68 ffffffff817c5098 0000000000000007 Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.373669] ffff8800ae8a3cb8 ffff8800ae8a3ca8 ffffffff81076dd7 ffff8800ae8a3c98 Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.373675] ffffffff81cb60a0 ffff8800be448898 0000000000000000 ffff8801f0f8b398 Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.373682] Call Trace: Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.373694] [<ffffffff817c5098>] dump_stack+0x45/0x57 Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.373703] [<ffffffff81076dd7>] warn_slowpath_common+0x97/0xe0 Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.373710] [<ffffffff81076ed6>] warn_slowpath_fmt+0x46/0x50 Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.373718] [<ffffffff8126ab93>] ? kernfs_find_and_get_ns+0x53/0x70 Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.373725] [<ffffffff8126ef43>] sysfs_remove_group+0xa3/0xb0 Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.373731] [<ffffffff814fe409>] dpm_sysfs_remove+0x59/0x70 Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.373740] [<ffffffff814f2166>] device_del+0x56/0x230 Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.373747] [<ffffffff814f2362>] device_unregister+0x22/0x60 Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.373765] [<ffffffffc0a2825d>] video_unregister_device+0x4d/0x60 [videodev] Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.373777] [<ffffffffc0d53f55>] cx231xx_release_analog_resources+0x125/0x170 [cx231xx] Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.373787] [<ffffffffc0d56666>] cx231xx_release_resources+0x16/0x60 [cx231xx] Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.373797] [<ffffffffc0d52b86>] cx231xx_close.isra.11+0x1d6/0x2a0 [cx231xx] Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.373805] [<ffffffffc0d52c8f>] cx231xx_v4l2_close+0x3f/0x60 [cx231xx] Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.373818] [<ffffffffc0a27491>] v4l2_release+0x41/0x90 [videodev] Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.373825] [<ffffffff811f7e30>] __fput+0xc0/0x250 Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.373832] [<ffffffff811f800e>] ____fput+0xe/0x10 Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.373838] [<ffffffff81093f3f>] task_work_run+0xaf/0xf0 Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.373847] [<ffffffff81015077>] do_notify_resume+0xc7/0xd0 Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.373853] [<ffffffff817d264f>] int_signal+0x12/0x17 Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.373858] ---[ end trace cfaf8b5d940102a2 ]--- Jan 18 16:50:14 alistair-XPS13 kernel: [ 201.374207] usb 1-1:1.1: V4L2 device video1 deregistered More errors follow.

1 0

[alsa-devel] [PATCH - UCM 1/1] ucm: add binary configure file parse
by han.lu＠intel.com 21 Jan '15

21 Jan '15

From: "Lu, Han" <han.lu(a)intel.com> with cset command, UCM set kcontrol parameters directly: cset "name='<KCONTROL_NAME>' 1<,2,3,...>" This patch enables UCM to set kcontrol with parameters from configure file: cset-bin-file "name='<KCONTROL_NAME>' <path/to/file>" where "cset-bin-file" is a newly added keyword alongside of "cset", to indicate cset with binary data in file. The binary data in file is parameter for audio DSPs, and it's just passed by UCM/ALSA as raw data. The data type of the parameter element must be byte, and the count is limited by the size of struct snd_ctl_elem_value and driver definition. Signed-off-by: Lu, Han <han.lu(a)intel.com> diff --git a/src/ucm/main.c b/src/ucm/main.c index 37ae4c8..818465a 100644 --- a/src/ucm/main.c +++ b/src/ucm/main.c @@ -160,11 +160,62 @@ static int open_ctl(snd_use_case_mgr_t *uc_mgr, return 0; } +static int binary_file_parse(snd_ctl_elem_value_t *dst, + snd_ctl_elem_info_t *info, + const char *filepath) +{ + int err, fd; + struct stat st; + size_t sz; + char *res; + snd_ctl_elem_type_t type; + unsigned int idx, count; + + type = snd_ctl_elem_info_get_type(info); + if (type != SND_CTL_ELEM_TYPE_BYTES) { + uc_error("only support byte type!"); + err = -EINVAL; + return err; + } + fd = open(filepath, O_RDONLY); + if (fd < 0) { + err = -errno; + return err; + } + if (stat(filepath, &st) == -1) { + err = -errno; + goto __fail; + } + sz = st.st_size; + count = snd_ctl_elem_info_get_count(info); + if (sz == 0 || sz > count || sz > sizeof(dst->value.bytes)) { + uc_error("invalid parameter size!"); + err = -EINVAL; + goto __fail; + } + res = calloc(sz, 1); + if (res == NULL) { + err = -ENOMEM; + goto __fail; + } + if (read(fd, res, sz) != sz) { + err = -errno; + goto __fail_read; + } + for (idx = 0; idx < sz; idx++) + snd_ctl_elem_value_set_byte(dst, idx, *(res + idx)); + __fail_read: + free(res); + __fail: + close(fd); + return err; +} + extern int __snd_ctl_ascii_elem_id_parse(snd_ctl_elem_id_t *dst, const char *str, const char **ret_ptr); -static int execute_cset(snd_ctl_t *ctl, const char *cset) +static int execute_cset(snd_ctl_t *ctl, const char *cset, unsigned int type) { const char *pos; int err; @@ -194,7 +245,10 @@ static int execute_cset(snd_ctl_t *ctl, const char *cset) err = snd_ctl_elem_info(ctl, info); if (err < 0) goto __fail; - err = snd_ctl_ascii_value_parse(ctl, value, info, pos); + if (type == SEQUENCE_ELEMENT_TYPE_CSET_BIN_FILE) + err = binary_file_parse(value, info, pos); + else + err = snd_ctl_ascii_value_parse(ctl, value, info, pos); if (err < 0) goto __fail; err = snd_ctl_elem_write(ctl, value); @@ -239,6 +293,7 @@ static int execute_sequence(snd_use_case_mgr_t *uc_mgr, goto __fail_nomem; break; case SEQUENCE_ELEMENT_TYPE_CSET: + case SEQUENCE_ELEMENT_TYPE_CSET_BIN_FILE: if (cdev == NULL) { const char *cdev1 = NULL, *cdev2 = NULL; err = get_value3(&cdev1, "PlaybackCTL", @@ -274,7 +329,7 @@ static int execute_sequence(snd_use_case_mgr_t *uc_mgr, goto __fail; } } - err = execute_cset(ctl, s->data.cset); + err = execute_cset(ctl, s->data.cset, s->type); if (err < 0) { uc_error("unable to execute cset '%s'\n", s->data.cset); goto __fail; diff --git a/src/ucm/parser.c b/src/ucm/parser.c index d7517f6..9e1cb41 100644 --- a/src/ucm/parser.c +++ b/src/ucm/parser.c @@ -306,6 +306,16 @@ static int parse_sequence(snd_use_case_mgr_t *uc_mgr ATTRIBUTE_UNUSED, continue; } + if (strcmp(cmd, "cset-bin-file") == 0) { + curr->type = SEQUENCE_ELEMENT_TYPE_CSET_BIN_FILE; + err = parse_string(n, &curr->data.cset); + if (err < 0) { + uc_error("error: cset-bin-file requires a string!"); + return err; + } + continue; + } + if (strcmp(cmd, "usleep") == 0) { curr->type = SEQUENCE_ELEMENT_TYPE_SLEEP; err = snd_config_get_integer(n, &curr->data.sleep); diff --git a/src/ucm/ucm_local.h b/src/ucm/ucm_local.h index 87f14a2..c1655c7 100644 --- a/src/ucm/ucm_local.h +++ b/src/ucm/ucm_local.h @@ -47,6 +47,7 @@ #define SEQUENCE_ELEMENT_TYPE_CSET 2 #define SEQUENCE_ELEMENT_TYPE_SLEEP 3 #define SEQUENCE_ELEMENT_TYPE_EXEC 4 +#define SEQUENCE_ELEMENT_TYPE_CSET_BIN_FILE 5 struct ucm_value { struct list_head list; -- 2.1.0

3 3

[alsa-devel] [PATCH] ALSA: fireworks/bebob: fix refering to released resources at unplugging
by Takashi Sakamoto 21 Jan '15

21 Jan '15

Unplugging devices can cause disorder by releasing streaming resources before stopping playbacking/capturing substreams. This commit forces the state of ALSA character devices into disconnect before releasing the resources. Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/firewire/bebob/bebob.c | 3 ++- sound/firewire/fireworks/fireworks.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/firewire/bebob/bebob.c b/sound/firewire/bebob/bebob.c index fc19c99..41eb1ce 100644 --- a/sound/firewire/bebob/bebob.c +++ b/sound/firewire/bebob/bebob.c @@ -306,10 +306,11 @@ static void bebob_remove(struct fw_unit *unit) if (bebob == NULL) return; + snd_card_disconnect(bebob->card); + kfree(bebob->maudio_special_quirk); snd_bebob_stream_destroy_duplex(bebob); - snd_card_disconnect(bebob->card); snd_card_free_when_closed(bebob->card); } diff --git a/sound/firewire/fireworks/fireworks.c b/sound/firewire/fireworks/fireworks.c index 3e2ed8e..21fb50f 100644 --- a/sound/firewire/fireworks/fireworks.c +++ b/sound/firewire/fireworks/fireworks.c @@ -289,10 +289,11 @@ static void efw_remove(struct fw_unit *unit) { struct snd_efw *efw = dev_get_drvdata(&unit->device); + snd_card_disconnect(efw->card); + snd_efw_stream_destroy_duplex(efw); snd_efw_transaction_remove_instance(efw); - snd_card_disconnect(efw->card); snd_card_free_when_closed(efw->card); } -- 2.1.0

2 2