April 2013 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH 0/4] snd-firewire-lib: add handling AMDTP receive stream
by Takashi Sakamoto 29 Apr '13

29 Apr '13

Current implementation of snd-firewire-lib can handle only AMDTP transmit stream with PCM. This series of patch enable it to handle both AMDTP receive and transmit stream with PCM according to IEC 61883-6. I develop with Echo Audio's Fireworks (AudioFirePre8). Unfortunately it's not fully compliant to IEC 61883-6. The last patch includes some work arounds for Fireworks. The snd-fireworks is still under development and not prepared for commit. Takashi Sakamoto (4): Rename functions, structure and member name for AMDTP Add macros for fixed value related to AMDTP Add "direction" member to amdtp_stream structure for AMDTP Add handling AMDTP receive stream sound/firewire/amdtp.c | 422 ++++++++++++++++++++++++++++++++++++--------- sound/firewire/amdtp.h | 64 +++---- sound/firewire/speakers.c | 33 ++-- 3 files changed, 393 insertions(+), 126 deletions(-) -- 1.7.10.4

2 13

[alsa-devel] [PATCH 1/1] ALSA: compress_core: Ensure device is stopped when stream closed
by Richard Fitzgerald 29 Apr '13

29 Apr '13

If the stream state is running or paused when device file is closed snd_compr_free() will send a SNDRV_PCM_TRIGGER_STOP to the stream. Signed-off-by: Richard Fitzgerald <rf(a)opensource.wolfsonmicro.com> --- sound/core/compress_offload.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index 91e6bcb..a81c5e4 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c @@ -132,6 +132,11 @@ static int snd_compr_open(struct inode *inode, struct file *f) static int snd_compr_free(struct inode *inode, struct file *f) { struct snd_compr_file *data = f->private_data; + + if ((data->stream.runtime->state == SNDRV_PCM_STATE_RUNNING) || + (data->stream.runtime->state == SNDRV_PCM_STATE_PAUSED)) + data->stream.ops->trigger(&data->stream, SNDRV_PCM_TRIGGER_STOP); + data->stream.ops->free(&data->stream); kfree(data->stream.runtime->buffer); kfree(data->stream.runtime); -- 1.7.2.5

3 5

[alsa-devel] [PATCH] ALSA: hda - Move Thinkpad X220 to use auto parser
by David Henningsson 29 Apr '13

29 Apr '13

This enables better volume controls than the current model parser. Also, because the original quirk for X220 was added to fix docking station support, add the TP410 fixup instead. Reported-by: Willian Jon McCann <william.jon.mccann(a)gmail.com> Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/patch_conexant.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 5499643..84b81c8 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -2946,7 +2946,6 @@ static const struct snd_pci_quirk cxt5066_cfg_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo T400s", CXT5066_THINKPAD), SND_PCI_QUIRK(0x17aa, 0x21c5, "Thinkpad Edge 13", CXT5066_THINKPAD), SND_PCI_QUIRK(0x17aa, 0x21c6, "Thinkpad Edge 13", CXT5066_ASUS), - SND_PCI_QUIRK(0x17aa, 0x21da, "Lenovo X220", CXT5066_THINKPAD), SND_PCI_QUIRK(0x17aa, 0x21db, "Lenovo X220-tablet", CXT5066_THINKPAD), SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo U350", CXT5066_ASUS), SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo G560", CXT5066_ASUS), @@ -3308,6 +3307,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = { SND_PCI_QUIRK(0x17aa, 0x215f, "Lenovo T510", CXT_PINCFG_LENOVO_TP410), SND_PCI_QUIRK(0x17aa, 0x21ce, "Lenovo T420", CXT_PINCFG_LENOVO_TP410), SND_PCI_QUIRK(0x17aa, 0x21cf, "Lenovo T520", CXT_PINCFG_LENOVO_TP410), + SND_PCI_QUIRK(0x17aa, 0x21da, "Lenovo X220", CXT_PINCFG_LENOVO_TP410), SND_PCI_QUIRK(0x17aa, 0x3975, "Lenovo U300s", CXT_FIXUP_STEREO_DMIC), SND_PCI_QUIRK(0x17aa, 0x3977, "Lenovo IdeaPad U310", CXT_FIXUP_STEREO_DMIC), SND_PCI_QUIRK(0x17aa, 0x397b, "Lenovo S205", CXT_FIXUP_STEREO_DMIC), -- 1.7.9.5

2 1

[alsa-devel] [PATCH] ALSA: USB: adjust for changed 3.8 USB API
by Clemens Ladisch 29 Apr '13

29 Apr '13

The recent changes in the USB API ("implement new semantics for URB_ISO_ASAP") made the former meaning of the URB_ISO_ASAP flag the default, and changed this flag to mean that URBs can be delayed. This is not the behaviour wanted by any of the audio drivers because it leads to discontinuous playback with very small period sizes. Therefore, our URBs need to be submitted without this flag. Reported-by: Joe Rayhawk <jrayhawk(a)fairlystable.org> Cc: <stable(a)vger.kernel.org> # 3.8 only Signed-off-by: Clemens Ladisch <clemens(a)ladisch.de> --- sound/usb/6fire/pcm.c | 1 - sound/usb/caiaq/audio.c | 3 --- sound/usb/endpoint.c | 5 ++--- sound/usb/misc/ua101.c | 3 +-- sound/usb/usx2y/usb_stream.c | 1 - sound/usb/usx2y/usbusx2yaudio.c | 1 - sound/usb/usx2y/usx2yhwdeppcm.c | 1 - 7 files changed, 3 insertions(+), 12 deletions(-) diff --git a/sound/usb/6fire/pcm.c b/sound/usb/6fire/pcm.c index e2ca12f..40dd50a 100644 --- a/sound/usb/6fire/pcm.c +++ b/sound/usb/6fire/pcm.c @@ -575,7 +575,6 @@ static void usb6fire_pcm_init_urb(struct pcm_urb *urb, urb->instance.pipe = in ? usb_rcvisocpipe(chip->dev, ep) : usb_sndisocpipe(chip->dev, ep); urb->instance.interval = 1; - urb->instance.transfer_flags = URB_ISO_ASAP; urb->instance.complete = handler; urb->instance.context = urb; urb->instance.number_of_packets = PCM_N_PACKETS_PER_URB; diff --git a/sound/usb/caiaq/audio.c b/sound/usb/caiaq/audio.c index fde9a7a..b45e29b 100644 --- a/sound/usb/caiaq/audio.c +++ b/sound/usb/caiaq/audio.c @@ -670,7 +670,6 @@ static void read_completed(struct urb *urb) if (send_it) { out->number_of_packets = outframe; - out->transfer_flags = URB_ISO_ASAP; usb_submit_urb(out, GFP_ATOMIC); } else { struct snd_usb_caiaq_cb_info *oinfo = out->context; @@ -686,7 +685,6 @@ requeue: } urb->number_of_packets = FRAMES_PER_URB; - urb->transfer_flags = URB_ISO_ASAP; usb_submit_urb(urb, GFP_ATOMIC); } @@ -751,7 +749,6 @@ static struct urb **alloc_urbs(struct snd_usb_caiaqdev *dev, int dir, int *ret) * BYTES_PER_FRAME; urbs[i]->context = &dev->data_cb_info[i]; urbs[i]->interval = 1; - urbs[i]->transfer_flags = URB_ISO_ASAP; urbs[i]->number_of_packets = FRAMES_PER_URB; urbs[i]->complete = (dir == SNDRV_PCM_STREAM_CAPTURE) ? read_completed : write_completed; diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c index 21049b8..63cca3a 100644 --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c @@ -677,7 +677,7 @@ static int data_ep_set_params(struct snd_usb_endpoint *ep, if (!u->urb->transfer_buffer) goto out_of_memory; u->urb->pipe = ep->pipe; - u->urb->transfer_flags = URB_ISO_ASAP | URB_NO_TRANSFER_DMA_MAP; + u->urb->transfer_flags = URB_NO_TRANSFER_DMA_MAP; u->urb->interval = 1 << ep->datainterval; u->urb->context = u; u->urb->complete = snd_complete_urb; @@ -716,8 +716,7 @@ static int sync_ep_set_params(struct snd_usb_endpoint *ep, u->urb->transfer_dma = ep->sync_dma + i * 4; u->urb->transfer_buffer_length = 4; u->urb->pipe = ep->pipe; - u->urb->transfer_flags = URB_ISO_ASAP | - URB_NO_TRANSFER_DMA_MAP; + u->urb->transfer_flags = URB_NO_TRANSFER_DMA_MAP; u->urb->number_of_packets = 1; u->urb->interval = 1 << ep->syncinterval; u->urb->context = u; diff --git a/sound/usb/misc/ua101.c b/sound/usb/misc/ua101.c index 8b81cb5..6ad617b 100644 --- a/sound/usb/misc/ua101.c +++ b/sound/usb/misc/ua101.c @@ -1120,8 +1120,7 @@ static int alloc_stream_urbs(struct ua101 *ua, struct ua101_stream *stream, usb_init_urb(&urb->urb); urb->urb.dev = ua->dev; urb->urb.pipe = stream->usb_pipe; - urb->urb.transfer_flags = URB_ISO_ASAP | - URB_NO_TRANSFER_DMA_MAP; + urb->urb.transfer_flags = URB_NO_TRANSFER_DMA_MAP; urb->urb.transfer_buffer = addr; urb->urb.transfer_dma = dma; urb->urb.transfer_buffer_length = max_packet_size; diff --git a/sound/usb/usx2y/usb_stream.c b/sound/usb/usx2y/usb_stream.c index 1e7a47a..bf618e1 100644 --- a/sound/usb/usx2y/usb_stream.c +++ b/sound/usb/usx2y/usb_stream.c @@ -69,7 +69,6 @@ static void init_pipe_urbs(struct usb_stream_kernel *sk, unsigned use_packsize, ++u, transfer += transfer_length) { struct urb *urb = urbs[u]; struct usb_iso_packet_descriptor *desc; - urb->transfer_flags = URB_ISO_ASAP; urb->transfer_buffer = transfer; urb->dev = dev; urb->pipe = pipe; diff --git a/sound/usb/usx2y/usbusx2yaudio.c b/sound/usb/usx2y/usbusx2yaudio.c index 520ef96..b376532 100644 --- a/sound/usb/usx2y/usbusx2yaudio.c +++ b/sound/usb/usx2y/usbusx2yaudio.c @@ -503,7 +503,6 @@ static int usX2Y_urbs_start(struct snd_usX2Y_substream *subs) if (0 == i) atomic_set(&subs->state, state_STARTING3); urb->dev = usX2Y->dev; - urb->transfer_flags = URB_ISO_ASAP; for (pack = 0; pack < nr_of_packs(); pack++) { urb->iso_frame_desc[pack].offset = subs->maxpacksize * pack; urb->iso_frame_desc[pack].length = subs->maxpacksize; diff --git a/sound/usb/usx2y/usx2yhwdeppcm.c b/sound/usb/usx2y/usx2yhwdeppcm.c index cc56007..f2a1acd 100644 --- a/sound/usb/usx2y/usx2yhwdeppcm.c +++ b/sound/usb/usx2y/usx2yhwdeppcm.c @@ -443,7 +443,6 @@ static int usX2Y_usbpcm_urbs_start(struct snd_usX2Y_substream *subs) if (0 == u) atomic_set(&subs->state, state_STARTING3); urb->dev = usX2Y->dev; - urb->transfer_flags = URB_ISO_ASAP; for (pack = 0; pack < nr_of_packs(); pack++) { urb->iso_frame_desc[pack].offset = subs->maxpacksize * (pack + u * nr_of_packs()); urb->iso_frame_desc[pack].length = subs->maxpacksize;

3 2

[alsa-devel] [TINYCOMPRESS][PATCH] compress: check for config first
by Vinod Koul 26 Apr '13

26 Apr '13

if invalid config is passed, then we return error for memory Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> --- compress.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/compress.c b/compress.c index e80e598..ee792c3 100644 --- a/compress.c +++ b/compress.c @@ -218,8 +218,13 @@ struct compress *compress_open(unsigned int card, unsigned int device, struct snd_compr_caps caps; char fn[256]; + if (!config) { + oops(&bad_compress, -EINVAL, "passed bad config"); + return &bad_compress; + } + compress = calloc(1, sizeof(struct compress)); - if (!compress || !config) { + if (!compress) { oops(&bad_compress, errno, "cannot allocate compress object"); return &bad_compress; } -- 1.7.0.4

1 0

[alsa-devel] [TINYCOMPRESS][PATCH 1/1] compress: Add support for capture streams
by Richard Fitzgerald 26 Apr '13

26 Apr '13

Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> Signed-off-by: Richard Fitzgerald <rf(a)opensource.wolfsonmicro.com> --- compress.c | 64 +++++++++++++++++++++++++++++++--- include/tinycompress/tinycompress.h | 2 +- 2 files changed, 59 insertions(+), 7 deletions(-) diff --git a/compress.c b/compress.c index 86cca88..e80e598 100644 --- a/compress.c +++ b/compress.c @@ -240,13 +240,12 @@ struct compress *compress_open(unsigned int card, unsigned int device, oops(&bad_compress, -EINVAL, "can't deduce device direction from given flags"); goto config_fail; } + if (flags & COMPRESS_OUT) { - /* this should be removed once we have capture tested */ - oops(&bad_compress, -EINVAL, "this version doesnt support capture"); - goto config_fail; + compress->fd = open(fn, O_RDONLY); + } else { + compress->fd = open(fn, O_WRONLY); } - - compress->fd = open(fn, O_WRONLY); if (compress->fd < 0) { oops(&bad_compress, errno, "cannot open device '%s'", fn); goto config_fail; @@ -403,7 +402,60 @@ int compress_write(struct compress *compress, const void *buf, unsigned int size int compress_read(struct compress *compress, void *buf, unsigned int size) { - return oops(compress, -ENOTTY, "Not supported yet in lib"); + struct snd_compr_avail avail; + struct pollfd fds; + int to_read = 0; + int num_read, total = 0, ret; + char* cbuf = buf; + const unsigned int frag_size = compress->config->fragment_size; + + if (!(compress->flags & COMPRESS_OUT)) + return oops(compress, -EINVAL, "Invalid flag set"); + if (!is_compress_ready(compress)) + return oops(compress, -ENODEV, "device not ready"); + fds.fd = compress->fd; + fds.events = POLLIN; + + while (size) { + if (ioctl(compress->fd, SNDRV_COMPRESS_AVAIL, &avail)) + return oops(compress, errno, "cannot get avail"); + + if ( (avail.avail < frag_size) && (avail.avail < size) ) { + /* Less than one fragment available and not at the + * end of the read, so poll + */ + ret = poll(&fds, 1, compress->max_poll_wait_ms); + /* A pause will cause -EBADFD or zero. + * This is not an error, just stop reading */ + if ((ret == 0) || (ret == -EBADFD)) + break; + if (ret < 0) + return oops(compress, errno, "poll error"); + if (fds.revents & POLLIN) { + continue; + } + if (fds.revents & POLLERR) { + return oops(compress, -EIO, "poll returned error!"); + } + } + /* read avail bytes */ + if (size > avail.avail) + to_read = avail.avail; + else + to_read = size; + num_read = read(compress->fd, cbuf, to_read); + /* If play was paused the read returns -EBADFD */ + if (num_read == -EBADFD) + break; + if (num_read < 0) + return oops(compress, errno, "read failed!"); + + size -= num_read; + cbuf += num_read; + total += num_read; + } + + return total; } int compress_start(struct compress *compress) diff --git a/include/tinycompress/tinycompress.h b/include/tinycompress/tinycompress.h index ba9f3b6..9867afc 100644 --- a/include/tinycompress/tinycompress.h +++ b/include/tinycompress/tinycompress.h @@ -76,7 +76,7 @@ struct compr_gapless_mdata { __u32 encoder_padding; }; -#define COMPRESS_OUT 0x00000000 +#define COMPRESS_OUT 0x20000000 #define COMPRESS_IN 0x10000000 struct compress; -- 1.7.2.5

2 1

[alsa-devel] [PATCH 00/21] more arm build fixes
by Arnd Bergmann 26 Apr '13

26 Apr '13

Hi subsystem maintainers, Here is another set of patches that resulted from build testing on linux-next. Please apply directly into your trees if you agree, or let me know if I made a mistake. I can take whatever remains through the arm-soc tree if you prefer that or I don't hear back. Arnd Arnd Bergmann (21): ARM: topology: export cpu_topology ARM: default machine descriptor for multiplatform ARM: shmobile: don't call irqchip_init unconditionally ARM: orion5x: include linux/cpu.h atm: he: use mdelay instead of large udelay constants ALSA: ali5451: use mdelay instead of large udelay constants oss/dmabuf: use dma_map_single drm/nouveau: use mdelay instead of large udelay constants drm: export drm_vm_open_locked [SCSI] nsp32: use mdelay instead of large udelay constants irqdomain: export irq_domain_add_simple irqchip: s3c24xx: add missing __init annotations iommu: tegra: print dma_addr_t using %lld cpufreq: pxa2xx: initialize variables thermal: cooling: avoid uninitialied used gcc warning OF: remove #ifdef from linux/of_platform.h X.509: do not emit any informational output USB: ehci-msm: USB_MSM_OTG needs USB_PHY USB: lpc32xx: ISP1301 needs USB_PHY USB: OMAP: ISP1301 needs USB_PHY USB: OHCI: avoid conflicting platform drivers arch/arm/Kconfig | 1 - arch/arm/configs/lpc32xx_defconfig | 1 + arch/arm/configs/msm_defconfig | 1 + arch/arm/configs/omap1_defconfig | 1 + arch/arm/kernel/devtree.c | 7 ++ arch/arm/kernel/setup.c | 11 +- arch/arm/kernel/topology.c | 1 + arch/arm/mach-orion5x/common.c | 1 + arch/arm/mach-shmobile/intc-r8a7740.c | 13 +- drivers/atm/he.c | 2 +- drivers/cpufreq/pxa2xx-cpufreq.c | 5 +- drivers/gpu/drm/drm_vm.c | 1 + drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c | 3 +- drivers/iommu/tegra-gart.c | 3 +- drivers/iommu/tegra-smmu.c | 2 +- drivers/irqchip/irq-s3c24xx.c | 4 +- drivers/scsi/nsp32.c | 2 +- drivers/thermal/cpu_cooling.c | 17 +-- drivers/usb/gadget/Kconfig | 2 + drivers/usb/host/Kconfig | 1 + drivers/usb/host/ohci-hcd.c | 136 ++++++++++++++++++--- drivers/usb/phy/Makefile | 2 +- include/linux/of_platform.h | 13 +- kernel/irq/irqdomain.c | 1 + lib/build_OID_registry | 2 - sound/oss/dmabuf.c | 3 +- sound/pci/ali5451/ali5451.c | 8 +- 27 files changed, 187 insertions(+), 57 deletions(-) -- 1.8.1.2 Cc: "James E.J. Bottomley" <JBottomley(a)parallels.com> Cc: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> Cc: David Airlie <airlied(a)linux.ie> Cc: Felipe Balbi <balbi(a)ti.com> Cc: Grant Likely <grant.likely(a)linaro.org> Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Cc: Inki Dae <inki.dae(a)samsung.com> Cc: Jason Cooper <jason(a)lakedaemon.net> Cc: Joerg Roedel <joro(a)8bytes.org> Cc: Nicolas Pitre <nico(a)linaro.org> Cc: Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> Cc: Rob Herring <robherring2(a)gmail.com> Cc: Russell King <rmk+kernel(a)arm.linux.org.uk> Cc: Simon Horman <horms+renesas(a)verge.net.au> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: Viresh Kumar <viresh.kumar(a)linaro.org> Cc: Will Deacon <will.deacon(a)arm.com> Cc: alsa-devel(a)alsa-project.org Cc: dri-devel(a)lists.freedesktop.org Cc: linux-atm-general(a)lists.sourceforge.net Cc: linux-scsi(a)vger.kernel.org Cc: linux-usb(a)vger.kernel.org Cc: netdev(a)vger.kernel.org

2 4

[alsa-devel] [PATCH] alsa-lib: conf - Add Scarlett 2i2 USB to S/PDIF blacklist
by David Henningsson 26 Apr '13

26 Apr '13

The Scarlett 2i2 USB interface does not have any S/PDIF connections. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- src/conf/cards/USB-Audio.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/cards/USB-Audio.conf b/src/conf/cards/USB-Audio.conf index 71c2971..0d93175 100644 --- a/src/conf/cards/USB-Audio.conf +++ b/src/conf/cards/USB-Audio.conf @@ -47,6 +47,7 @@ USB-Audio.pcm.iec958_device { "Plantronics USB Headset" 999 "Plantronics Wireless Audio" 999 "SB WoW Headset" 999 + "Scarlett 2i2 USB" 999 "Sennheiser USB headset" 999 "USB Device 0x46d:0x992" 999 } -- 1.7.9.5

2 1

[alsa-devel] [PATCH] ALSA: usb - Avoid unnecessary sample rate changes on USB 2.0 clock sources
by David Henningsson 26 Apr '13

26 Apr '13

The Scarlett 2i2 seems to take almost 500 ms to set the sample rate, even if the clock is currently set to that value. This patch speeds up prepare of the device, by avoiding setting the clock to something it already is. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/usb/clock.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/usb/clock.c b/sound/usb/clock.c index b0ec364..3a2ce39 100644 --- a/sound/usb/clock.c +++ b/sound/usb/clock.c @@ -356,6 +356,8 @@ static int set_sample_rate_v2(struct snd_usb_audio *chip, int iface, return clock; prev_rate = get_sample_rate_v2(chip, iface, fmt->altsetting, clock); + if (prev_rate == rate) + return 0; cs_desc = snd_usb_find_clock_source(chip->ctrl_intf, clock); writeable = uac2_control_is_writeable(cs_desc->bmControls, UAC2_CS_CONTROL_SAM_FREQ - 1); -- 1.7.9.5

2 1

Re: [alsa-devel] [PATCH 04/28] proc: Supply PDE attribute setting accessor functions [RFC]
by Vasant Hegde 25 Apr '13

25 Apr '13

On 04/16/2013 11:56 PM, David Howells wrote: > Supply accessor functions to set attributes in proc_dir_entry structs. > > The following are supplied: proc_set_size() and proc_set_user(). > > Signed-off-by: David Howells<dhowells(a)redhat.com> > cc: linuxppc-dev(a)lists.ozlabs.org > cc: linux-media(a)vger.kernel.org > cc: netdev(a)vger.kernel.org > cc: linux-wireless(a)vger.kernel.org > cc: linux-pci(a)vger.kernel.org > cc: netfilter-devel(a)vger.kernel.org > cc: alsa-devel(a)alsa-project.org > --- > > arch/powerpc/kernel/proc_powerpc.c | 2 +- > arch/powerpc/platforms/pseries/reconfig.c | 2 +- arch/powerpc side changes looks good. -Vasant > drivers/media/pci/ttpci/av7110_ir.c | 2 +- > drivers/net/irda/vlsi_ir.c | 2 +- > drivers/net/wireless/airo.c | 34 +++++++++-------------------- > drivers/pci/proc.c | 2 +- > fs/proc/generic.c | 13 +++++++++++ > include/linux/proc_fs.h | 5 ++++ > kernel/configs.c | 2 +- > kernel/profile.c | 2 +- > net/netfilter/xt_recent.c | 3 +-- > sound/core/info.c | 2 +- > 12 files changed, 38 insertions(+), 33 deletions(-) > > diff --git a/arch/powerpc/kernel/proc_powerpc.c b/arch/powerpc/kernel/proc_powerpc.c > index 41d8ee9..feb8580 100644 > --- a/arch/powerpc/kernel/proc_powerpc.c > +++ b/arch/powerpc/kernel/proc_powerpc.c > @@ -83,7 +83,7 @@ static int __init proc_ppc64_init(void) > &page_map_fops, vdso_data); > if (!pde) > return 1; > - pde->size = PAGE_SIZE; > + proc_set_size(pde, PAGE_SIZE); > > return 0; > } > diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c > index d6491bd..f93cdf5 100644 > --- a/arch/powerpc/platforms/pseries/reconfig.c > +++ b/arch/powerpc/platforms/pseries/reconfig.c > @@ -452,7 +452,7 @@ static int proc_ppc64_create_ofdt(void) > > ent = proc_create("powerpc/ofdt", S_IWUSR, NULL,&ofdt_fops); > if (ent) > - ent->size = 0; > + proc_set_size(ent, 0); > > return 0; > } > diff --git a/drivers/media/pci/ttpci/av7110_ir.c b/drivers/media/pci/ttpci/av7110_ir.c > index eb82286..0e763a7 100644 > --- a/drivers/media/pci/ttpci/av7110_ir.c > +++ b/drivers/media/pci/ttpci/av7110_ir.c > @@ -375,7 +375,7 @@ int av7110_ir_init(struct av7110 *av7110) > if (av_cnt == 1) { > e = proc_create("av7110_ir", S_IWUSR, NULL,&av7110_ir_proc_fops); > if (e) > - e->size = 4 + 256 * sizeof(u16); > + proc_set_size(e, 4 + 256 * sizeof(u16)); > } > > tasklet_init(&av7110->ir.ir_tasklet, av7110_emit_key, (unsigned long)&av7110->ir); > diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c > index e22cd4e..5f47584 100644 > --- a/drivers/net/irda/vlsi_ir.c > +++ b/drivers/net/irda/vlsi_ir.c > @@ -1678,7 +1678,7 @@ vlsi_irda_probe(struct pci_dev *pdev, const struct pci_device_id *id) > IRDA_WARNING("%s: failed to create proc entry\n", > __func__); > } else { > - ent->size = 0; > + proc_set_size(ent, 0); > } > idev->proc_entry = ent; > } > diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c > index 66e398d..21d0233 100644 > --- a/drivers/net/wireless/airo.c > +++ b/drivers/net/wireless/airo.c > @@ -4507,73 +4507,63 @@ static int setup_proc_entry( struct net_device *dev, > airo_entry); > if (!apriv->proc_entry) > goto fail; > - apriv->proc_entry->uid = proc_kuid; > - apriv->proc_entry->gid = proc_kgid; > + proc_set_user(apriv->proc_entry, proc_kuid, proc_kgid); > > /* Setup the StatsDelta */ > entry = proc_create_data("StatsDelta", S_IRUGO& proc_perm, > apriv->proc_entry,&proc_statsdelta_ops, dev); > if (!entry) > goto fail_stats_delta; > - entry->uid = proc_kuid; > - entry->gid = proc_kgid; > + proc_set_user(entry, proc_kuid, proc_kgid); > > /* Setup the Stats */ > entry = proc_create_data("Stats", S_IRUGO& proc_perm, > apriv->proc_entry,&proc_stats_ops, dev); > if (!entry) > goto fail_stats; > - entry->uid = proc_kuid; > - entry->gid = proc_kgid; > + proc_set_user(entry, proc_kuid, proc_kgid); > > /* Setup the Status */ > entry = proc_create_data("Status", S_IRUGO& proc_perm, > apriv->proc_entry,&proc_status_ops, dev); > if (!entry) > goto fail_status; > - entry->uid = proc_kuid; > - entry->gid = proc_kgid; > + proc_set_user(entry, proc_kuid, proc_kgid); > > /* Setup the Config */ > entry = proc_create_data("Config", proc_perm, > apriv->proc_entry,&proc_config_ops, dev); > if (!entry) > goto fail_config; > - entry->uid = proc_kuid; > - entry->gid = proc_kgid; > + proc_set_user(entry, proc_kuid, proc_kgid); > > /* Setup the SSID */ > entry = proc_create_data("SSID", proc_perm, > apriv->proc_entry,&proc_SSID_ops, dev); > if (!entry) > goto fail_ssid; > - entry->uid = proc_kuid; > - entry->gid = proc_kgid; > + proc_set_user(entry, proc_kuid, proc_kgid); > > /* Setup the APList */ > entry = proc_create_data("APList", proc_perm, > apriv->proc_entry,&proc_APList_ops, dev); > if (!entry) > goto fail_aplist; > - entry->uid = proc_kuid; > - entry->gid = proc_kgid; > + proc_set_user(entry, proc_kuid, proc_kgid); > > /* Setup the BSSList */ > entry = proc_create_data("BSSList", proc_perm, > apriv->proc_entry,&proc_BSSList_ops, dev); > if (!entry) > goto fail_bsslist; > - entry->uid = proc_kuid; > - entry->gid = proc_kgid; > + proc_set_user(entry, proc_kuid, proc_kgid); > > /* Setup the WepKey */ > entry = proc_create_data("WepKey", proc_perm, > apriv->proc_entry,&proc_wepkey_ops, dev); > if (!entry) > goto fail_wepkey; > - entry->uid = proc_kuid; > - entry->gid = proc_kgid; > - > + proc_set_user(entry, proc_kuid, proc_kgid); > return 0; > > fail_wepkey: > @@ -5695,10 +5685,8 @@ static int __init airo_init_module( void ) > > airo_entry = proc_mkdir_mode("driver/aironet", airo_perm, NULL); > > - if (airo_entry) { > - airo_entry->uid = proc_kuid; > - airo_entry->gid = proc_kgid; > - } > + if (airo_entry) > + proc_set_user(airo_entry, proc_kuid, proc_kgid); > > for (i = 0; i< 4&& io[i]&& irq[i]; i++) { > airo_print_info("", "Trying to configure ISA adapter at irq=%d " > diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c > index 12e4fb5..7cde7c1 100644 > --- a/drivers/pci/proc.c > +++ b/drivers/pci/proc.c > @@ -419,7 +419,7 @@ int pci_proc_attach_device(struct pci_dev *dev) > &proc_bus_pci_operations, dev); > if (!e) > return -ENOMEM; > - e->size = dev->cfg_size; > + proc_set_size(e, dev->cfg_size); > dev->procent = e; > > return 0; > diff --git a/fs/proc/generic.c b/fs/proc/generic.c > index 1c07cad..5f6f6c3 100644 > --- a/fs/proc/generic.c > +++ b/fs/proc/generic.c > @@ -498,6 +498,19 @@ out: > return NULL; > } > EXPORT_SYMBOL(proc_create_data); > + > +void proc_set_size(struct proc_dir_entry *de, loff_t size) > +{ > + de->size = size; > +} > +EXPORT_SYMBOL(proc_set_size); > + > +void proc_set_user(struct proc_dir_entry *de, kuid_t uid, kgid_t gid) > +{ > + de->uid = uid; > + de->gid = gid; > +} > +EXPORT_SYMBOL(proc_set_user); > > static void free_proc_entry(struct proc_dir_entry *de) > { > diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h > index 805edac..28a4d7e 100644 > --- a/include/linux/proc_fs.h > +++ b/include/linux/proc_fs.h > @@ -130,6 +130,9 @@ static inline struct proc_dir_entry *proc_create(const char *name, umode_t mode, > extern struct proc_dir_entry *proc_net_mkdir(struct net *net, const char *name, > struct proc_dir_entry *parent); > > +extern void proc_set_size(struct proc_dir_entry *, loff_t); > +extern void proc_set_user(struct proc_dir_entry *, kuid_t, kgid_t); > + > extern struct file *proc_ns_fget(int fd); > extern bool proc_ns_inode(struct inode *inode); > > @@ -158,6 +161,8 @@ static inline struct proc_dir_entry *proc_mkdir(const char *name, > struct proc_dir_entry *parent) {return NULL;} > static inline struct proc_dir_entry *proc_mkdir_mode(const char *name, > umode_t mode, struct proc_dir_entry *parent) { return NULL; } > +static inline void proc_set_size(struct proc_dir_entry *de, loff_t size) {} > +static inline void proc_set_user(struct proc_dir_entry *de, kuid_t uid, kgid_t gid) {} > > struct tty_driver; > static inline void proc_tty_register_driver(struct tty_driver *driver) {}; > diff --git a/kernel/configs.c b/kernel/configs.c > index 42e8fa0..c18b1f1 100644 > --- a/kernel/configs.c > +++ b/kernel/configs.c > @@ -79,7 +79,7 @@ static int __init ikconfig_init(void) > if (!entry) > return -ENOMEM; > > - entry->size = kernel_config_data_size; > + proc_set_size(entry, kernel_config_data_size); > > return 0; > } > diff --git a/kernel/profile.c b/kernel/profile.c > index 524ce5e..0bf4007 100644 > --- a/kernel/profile.c > +++ b/kernel/profile.c > @@ -600,7 +600,7 @@ int __ref create_proc_profile(void) /* false positive from hotcpu_notifier */ > NULL,&proc_profile_operations); > if (!entry) > return 0; > - entry->size = (1+prof_len) * sizeof(atomic_t); > + proc_set_size(entry, (1 + prof_len) * sizeof(atomic_t)); > hotcpu_notifier(profile_cpu_callback, 0); > return 0; > } > diff --git a/net/netfilter/xt_recent.c b/net/netfilter/xt_recent.c > index 3db2d38..1e657cf 100644 > --- a/net/netfilter/xt_recent.c > +++ b/net/netfilter/xt_recent.c > @@ -401,8 +401,7 @@ static int recent_mt_check(const struct xt_mtchk_param *par, > ret = -ENOMEM; > goto out; > } > - pde->uid = uid; > - pde->gid = gid; > + proc_set_user(pde, uid, gid); > #endif > spin_lock_bh(&recent_lock); > list_add_tail(&t->list,&recent_net->tables); > diff --git a/sound/core/info.c b/sound/core/info.c > index 3aa8864..c7f41c3 100644 > --- a/sound/core/info.c > +++ b/sound/core/info.c > @@ -970,7 +970,7 @@ int snd_info_register(struct snd_info_entry * entry) > mutex_unlock(&info_mutex); > return -ENOMEM; > } > - p->size = entry->size; > + proc_set_size(p, entry->size); > } > entry->p = p; > if (entry->parent) > > _______________________________________________ > Linuxppc-dev mailing list > Linuxppc-dev(a)lists.ozlabs.org > https://lists.ozlabs.org/listinfo/linuxppc-dev >

1 0

[alsa-devel] [PATCH v5 00/10] ASoC: fsl-ssi: ac97-slave support
by Markus Pargmann 25 Apr '13

25 Apr '13

Hi, This series adds DT support for phycore-ac97. It is now based on the pcm dma cleanups from Lars. Beside ac97 support, the series adds fsl-ssi imx-pcm-fiq and generic DMA binding handling. Regards, Markus Changes in v5: - Pass of_node via parent device to imx-pcm-dma. Changes in v4: - phycore-ac97 uses the iomux functions based on audmux phandle now. - fsl-ssi imx-pcm-fiq got some new comments about problems with imx-ssi and incompatible codecs Changes in v3: - Rebased onto pcm dma cleanup patches - A lot of cleanups for the fsl-ssi ac97 integration - Some small changes which are listed in the notes of the patches. Markus Pargmann (10): ASoC: phycore-ac97: Add DT support ASoC: imx-pcm-dma: DT support ASoC: imx-pcm-fiq: Introduce pcm-fiq-params ASoC: fsl-ssi: Add support for imx-pcm-fiq ASoC: fsl-ssi: Use generic DMA bindings if possible ARM: imx: Export ac97 reset functions ASoC: fsl-ssi: imx ac97 support ASoC: fsl: Kconfig: Use fsl-ssi for phycore-ac97 ASoC: fsl: Move fsl-ssi binding doc to sound/ ASoC: fsl: Update fsl-ssi binding doc .../{powerpc/fsl/ssi.txt => sound/fsl,ssi.txt} | 10 + .../bindings/sound/phytec,phycore-ac97.txt | 14 + arch/arm/mach-imx/mach-pca100.c | 7 +- arch/arm/mach-imx/mach-pcm043.c | 7 +- sound/soc/fsl/Kconfig | 2 +- sound/soc/fsl/fsl_ssi.c | 510 +++++++++++++++++---- sound/soc/fsl/imx-pcm-dma.c | 4 +- sound/soc/fsl/imx-pcm-fiq.c | 16 +- sound/soc/fsl/imx-pcm.h | 9 + sound/soc/fsl/imx-ssi.c | 7 +- sound/soc/fsl/imx-ssi.h | 1 + sound/soc/fsl/phycore-ac97.c | 166 ++++++- 12 files changed, 631 insertions(+), 122 deletions(-) rename Documentation/devicetree/bindings/{powerpc/fsl/ssi.txt => sound/fsl,ssi.txt} (88%) create mode 100644 Documentation/devicetree/bindings/sound/phytec,phycore-ac97.txt

3 15

[alsa-devel] ASoC updates for v3.10
by Mark Brown 25 Apr '13

25 Apr '13

The following changes since commit 22f38f792ec53e2a93be13ecb609bbe911ed8ff9: ASoC: ux500: Use generic dmaengine PCM (2013-04-18 15:04:44 +0100) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v3.10-3 for you to fetch changes up to 5cc50fc858a5ab37dc2744d72d7ffed96f23afd8: Merge remote-tracking branch 'asoc/topic/ux500' into asoc-next (2013-04-23 19:26:15 +0100) Diffstat and log are inflated by Linus' tree again, plus git has apparently got itself a bit confused about what to diff against and picked the wrong side of a merge. ---------------------------------------------------------------- ASoC: More updates for v3.10 A few more fixes, nothing too major though the DMA changes fix modular builds. ---------------------------------------------------------------- Aaro Koskinen (1): ARM: 7692/1: iop3xx: move IOP3XX_PERIPHERAL_VIRT_BASE Abhijeet Dharmapurikar (1): irqchip: gic: fix irq_trigger return Akinobu Mita (2): sparc/srmmu: clear trailing edge of bitmap properly sparc/iommu: fix typo s/265KB/256KB/ Alban Bedel (1): ASoC: wm8903: Add the DAC boost control Alex Elder (1): rbd: do a safe list traversal in rbd_img_request_submit() Alexander Duyck (1): igb: Revert support for build_skb in igb Alistair Popple (1): powerpc: Fix audit crash due to save/restore PPR changes Andreas Schwab (1): kbuild: generate generic headers before recursing into scripts Andrei Epure (1): drivers/video/mmp/core.c: fix use-after-free bug Andrey Smirnov (2): ASoC: si476x: Convert SI476X codec to use regmap ASoC: si476x: Cosmetic changes to SI476X codec driver Andy Lutomirski (2): userns: Check uid_map's opener's fsuid, not the current fsuid userns: Changing any namespace id mappings should require privileges Antonio Quartulli (1): batman-adv: make is_my_mac() check for the current mesh only Arend van Spriel (2): brcmfmac: remove advertising P2P device support brcmsmac: request firmware in .start() callback Ariel Elior (1): bnx2x: Fix status blocks configuration Arnd Bergmann (6): ASoC: samsung: use irq resource for idma ASoC: samsung: fix module_device_table ASoC: samsung: export idma_reg_addr_init ASoC: samsung: move plat/ headers to local directory net: ax88796: avoid 64 bit arithmetic ASoC: ux500: forward declare msp_i2s_platform_data Bastian Hecht (1): ARM: 7697/1: hw_breakpoint: do not use __cpuinitdata for dbg_cpu_pm_nb Ben Greear (1): net: rate-limit warn-bad-offload splats. Bjørn Mork (4): net: cdc_mbim: remove bogus sizeof() net: qmi_wwan: fixup missing ethernet header (firmware bug workaround) net: qmi_wwan: fixup destination address (firmware bug workaround) net: qmi_wwan: prevent duplicate mac address on link (firmware bug workaround) Charles Keepax (12): ASoC: arizona: Move selection of FLL REFCLK into init ASoC: arizona: Tidy up SYNCCLK selection and cache values ASoC: arizona: Factor out check for enabled FLL ASoC: arizona: Factor out FLL disable ASoC: arizona: Factor out FLL enable ASoC: arizona: Improve suppression of noop FLL updates ASoC: arizona: Add support for directly setting the FLL REFCLK ASoC: arizona: Add convience define for clearing SYNCCLK ASoC: arizona: Don't enable FLL on REFCLK configuration ASoC: wm5102: Correctly use SOC_VALUE_ENUM for ISRC FSL controls ASoC: wm0010: Constify usage of firmware filenames ASoC: wm0010: Report filename when we fail to load firmware Christian Ruppert (1): stmmac: prevent interrupt loop with MMC RX IPC Counter Christoph Fritz (1): can: sja1000: fix handling on dt properties on little endian systems Cong Wang (1): ipv6: statically link register_inet6addr_notifier() Dan Carpenter (2): ASoC: tas5086: signedness bug in tas5086_hw_params() irda: small read past the end of array in debug code Daniel Mack (5): ASoC: ak4104: convert to direct regmap API usage ASoC: ak4104: correct tranceiver enable handling ASoC: Add codec driver for AK5386 ALSA: ASoC: add codec driver for TI TAS5086 ASoC: davinci-mcasp: clean up davinci_hw_common_param() David S. Miller (10): Merge branch 'master' of git://git.kernel.org/.../pablo/nf into netfilter Merge branch 'fixes-for-3.9' of git://gitorious.org/linux-can/linux-can Merge branch 'fixes' of git://git.kernel.org/.../jesse/openvswitch Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge Merge branch 'qlogic' Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless Merge branch 'master' of git://git.kernel.org/.../pablo/nf sparc64: Fix race in TLB batch processing. Merge branch 'bonding' Merge branch 'qmi_wwan' David Ward (1): net/802/mrp: fix possible race condition when calling mrp_pdu_queue() Dmitry Kravkov (1): bnx2x: Prevent UNDI FW illegal host access Dmitry Popov (1): tcp: incoming connections might use wrong route under synflood Emese Revfy (1): kernel/signal.c: stop info leak via the tkill and the tgkill syscalls Eric Dumazet (3): net: drop dst before queueing fragments bonding: fix l23 and l34 load balancing in forwarding path tcp: call tcp_replace_ts_recent() from tcp_ack() Eric W. Biederman (1): userns: Don't let unprivileged users trick privileged users into setting the id_map Felix Fietkau (2): ath9k_htc: accept 1.x firmware newer than 1.3 ath9k_hw: change AR9580 initvals to fix a stability issue Florian Westphal (2): netfilter: nf_nat: fix race when unloading protocol modules netfilter: xt_rpfilter: skip locally generated broadcast/multicast, too Greg Rose (1): ixgbe: Fix a bug in setting VF VLAN via PF H. Peter Anvin (2): x86, microcode: Verify the family before dispatching microcode patching Merge remote-tracking branch 'efi/urgent' into x86/urgent Heiko Stübner (1): ASoC: samsung: fix neo1973-wm8753 compilation Himanshu Madhani (1): qlcnic: fix beaconing test for 82xx adapter Hong Zhiguo (1): openvswitch: correct an invalid BUG_ON Illia Ragozin (1): ARM: 7696/1: Fix kexec by setting outer_cache.inv_all for Feroceon Ivan Vecera (1): be2net: take care of __vlan_put_tag return value Jason Gerecke (2): Input: wacom - fix "can not retrieve extra class descriptor" for 24HDT Input: wacom - correct reported resolution for Intuos4 Wireless Jeeja KP (1): ASoC: compress - add support for metadata apis Jesse Gross (1): openvswitch: Preallocate reply skb in ovs_vport_cmd_set(). Jitendra Kalsaria (3): qlcnic: Stop traffic before performing loopback test qlge: Fix ethtool autoneg advertising. qlge: Update version to 1.00.00.32. Joe Perches (1): checkpatch: fix stringification macro defect Johannes Berg (2): mac80211: fix LED in idle handling mac80211: fix cfg80211 interaction on auth/assoc request John W. Linville (3): Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211 Merge branch 'for-john' of git://x-git.kernel.org/.../jberg/mac80211 Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem Joonsoo Kim (1): ARM: 7694/1: ARM, TCM: initialize TCM in paging_init(), instead of setup_arch() Josh Wu (1): avr32: fix build error in atstk1006_defconfig Jozsef Kadlecsik (3): netfilter: ipset: list:set: fix reference counter update netfilter: ipset: hash:*net*: nomatch flag not excluded on set resize netfilter: ipset: bitmap:ip,mac: fix listing with timeout K. Y. Srinivasan (1): x86, hyperv: Handle Xen emulation of Hyper-V more gracefully Kefeng Wang (2): sparc:remove unused declaration smp_boot_cpus() sparc:cleanup unused code in smp_32.h Kevin Hao (1): powerpc: add a missing label in resume_kernel Kuninori Morimoto (58): ASoC: fsi: remove unused irq ASoC: add snd_soc_register_component() ASoC: add .name for snd_soc_component_driver ASoC: fsi: use snd_soc_register_component() instead of snd_soc_register_dais() ASoC: pxa2xx-ac97: move EXPORT_SYMBOL_GPL() next to definition ASoC: snd_soc_register_component() uses properly snd_soc_register_dai[s]() ASoC: switch over to use snd_soc_register_component() on davinci i2s ASoC: switch over to use snd_soc_register_component() on davinci vcif ASoC: switch over to use snd_soc_register_component() on davinci mcasp ASoC: switch over to use snd_soc_register_component() on dw i2s ASoC: switch over to use snd_soc_register_component() on mpc5200 ac97 ASoC: switch over to use snd_soc_register_component() on atmel ssc ASoC: switch over to use snd_soc_register_component() on au1x i2sc ASoC: switch over to use snd_soc_register_component() on au1x psc-ac97 ASoC: switch over to use snd_soc_register_component() on au1x psc-i2s ASoC: switch over to use snd_soc_register_component() on au1x ac97c ASoC: switch over to use snd_soc_register_component() on bf6xx i2s ASoC: switch over to use snd_soc_register_component() on bf5xx ac97 ASoC: switch over to use snd_soc_register_component() on bf5xx i2s ASoC: switch over to use snd_soc_register_component() on bf5xx tdm ASoC: switch over to use snd_soc_register_component() on ep93xx ac97 ASoC: switch over to use snd_soc_register_component() on ep93xx i2s ASoC: switch over to use snd_soc_register_component() on mpc5200 i2s ASoC: switch over to use snd_soc_register_component() on fsl ssi ASoC: switch over to use snd_soc_register_component() on imx ssi ASoC: switch over to use snd_soc_register_component() on jz4740 i2s ASoC: switch over to use snd_soc_register_component() on kirkwood i2s ASoC: switch over to use snd_soc_register_component() on sst ASoC: switch over to use snd_soc_register_component() on mxs saif ASoC: switch over to use snd_soc_register_component() on nuc900 ac97 ASoC: switch over to use snd_soc_register_component() on omap mcbsp ASoC: switch over to use snd_soc_register_component() on omap mcpdm ASoC: switch over to use snd_soc_register_component() on omap dmic ASoC: switch over to use snd_soc_register_component() on omap hdmi ASoC: switch over to use snd_soc_register_component() on pxa ssp ASoC: switch over to use snd_soc_register_component() on pxa2xx ac97 ASoC: switch over to use snd_soc_register_component() on pxa2xx i2s ASoC: switch over to use snd_soc_register_component() on mmp sspa ASoC: switch over to use snd_soc_register_component() on s6000 i2s ASoC: switch over to use snd_soc_register_component() on s3c24xx i2s ASoC: switch over to use snd_soc_register_component() on s3c i2s ASoC: switch over to use snd_soc_register_component() on s3c ac97 ASoC: switch over to use snd_soc_register_component() on samsung spdif ASoC: switch over to use snd_soc_register_component() on samsung i2s ASoC: switch over to use snd_soc_register_component() on samsung pcm ASoC: switch over to use snd_soc_register_component() on goni_wm8994 ASoC: switch over to use snd_soc_register_component() on sh4 ssi ASoC: switch over to use snd_soc_register_component() on sh4 hac ASoC: switch over to use snd_soc_register_component() on spear spdif out ASoC: switch over to use snd_soc_register_component() on spear spdif in ASoC: switch over to use snd_soc_register_component() on tegra30 i2s ASoC: switch over to use snd_soc_register_component() on tegra20 spdif ASoC: switch over to use snd_soc_register_component() on tegra20 ac97 ASoC: switch over to use snd_soc_register_component() on tegra20 i2s ASoC: switch over to use snd_soc_register_component() on txx9aclc ac97 ASoC: switch over to use snd_soc_register_component() on ux500 msp ASoC: snd_soc_[un]register_dai[s]() become non global function ASoC: switch over to use snd_soc_register_component() on sh4 siu Lars-Peter Clausen (5): ASoC: spear_pcm: Staticize non-exported structs ASoC: generic-dmaengine-pcm: Add support for half-duplex ASoC: mxs-pcm: Set SNDRV_PCM_INFO_HALF_DUPLEX ASoC: mxs: Setup dma data in DAI probe ASoC: mxs: Use generic dmaengine PCM Len Brown (2): intel_idle: additional Haswell CPU-id tools/power turbostat: additional Haswell CPU-id Linus Torvalds (32): Merge branches 'timers-urgent-for-linus', 'irq-urgent-for-linus' and 'core-urgent-for-linus' of git://git.kernel.org/.../tip/tip vm: add vm_iomap_memory() helper function Merge branch 'for-linus' of git://git.kernel.org/.../dtor/input Merge branch 'rc-fixes' of git://git.kernel.org/.../mmarek/kbuild Merge tag 'for-linus' of git://git.kernel.org/.../sfr/next-fixes Merge git://git.kernel.org/pub/scm/virt/kvm/kvm Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm s390: move dummy io_remap_pfn_range() to asm/pgtable.h Merge git://git.kernel.org/.../davem/net Merge branch 'for-linus' of git://git.kernel.org/.../sage/ceph-client Merge branch 'akpm' (fixes from Andrew) Merge branch 'release' of git://git.kernel.org/.../lenb/linux Revert "block: add missing block_bio_complete() tracepoint" Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86 Merge branch 'userns-fixes' of git://git.kernel.org/.../luto/linux Merge branch 'for-linus' of git://git.kernel.org/.../mszeredi/fuse Merge branch 'for-linus' of git://git.kernel.org/.../dtor/input vm: convert HPET mmap to vm_iomap_memory() helper vm: convert mtdchar mmap to vm_iomap_memory() helper vm: convert fb_mmap to vm_iomap_memory() helper vm: convert snd_pcm_lib_mmap_iomem() to vm_iomap_memory() helper mtdchar: remove no-longer-used vma helpers Merge tag 'fixes-for-linus' of git://git.kernel.org/.../arm/arm-soc net: fix incorrect credentials passing Merge git://git.kernel.org/.../davem/net Merge git://git.kernel.org/.../davem/sparc Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'x86-kdump-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'vm_ioremap_memory-examples' Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/.../tip/tip Linux 3.9-rc8 Lucas Stach (1): net: fec: fix regression in link change accounting Ludovic Desroches (1): dmaengine: at_hdmac: fix race condition in atc_advance_work() Marc Kleine-Budde (1): can: mcp251x: add missing IRQF_ONESHOT to request_threaded_irq Marc Zyngier (3): ARM: KVM: fix KVM_CAP_ARM_SET_DEVICE_ADDR reporting ARM: KVM: fix L_PTE_S2_RDWR to actually be Read/Write ARM: KVM: fix unbalanced get_cpu() in access_dcsw Marcelo Tosatti (1): Merge branch 'kvm-arm-fixes-3.9' of git://github.com/columbia/linux-kvm-arm Mark Brown (76): ASoC: arizona: Only allow input volume updates when inputs are enabled ASoC: wm8960: Add input boost volume control ASoC: arizona: If we only have a clock to synchronise with make it REFCLK mfd: arizona: Define additional FLL control registers mfd: wm5102: Map in additional FLL control registers ASoC: arizona: Increase FLL synchroniser bandwidth for high frequencies ASoC: arizona: Optimise FLL loop gains ASoC: arizona: Ensure synchroniser is disabled when not needed ASoC: arizona: Suppress reference calculations when setting REFCLK to 0 ASoC: arizona: Provide defines for the clock rates ASoC: wm_adsp: Handle old .bin files ASoC: arizona: Ensure we clock two channels for I2S mode ASoC: wm8994: Support constraining the maximum number of channels clocked mfd: wm5102: Add additional speaker control registers ASoC: arizona: Factor out speaker widgets from CODEC drivers ASoC: arizona: Log thermal events ASoC: arizona: Suppress speaker enable if thermal shutdown is flagged ASoC: arizona: Basic support for ISRC rate selection ASoC: wm8994: Restore AIFnCLK after reducing it for low clock rates extcon: arizona: Factor out magic application ASoC: arizona: Fix interaction between headphone outputs and identification extcon: arizona: Fix interaction between headphone outputs and identification Merge tag 'arizona-extcon-asoc' of git://git.kernel.org/.../broonie/misc into asoc-arizona ASoC: arizona: Add delay after powering up line level outputs Merge branch 'topic/pxa' of git://git.kernel.org/.../broonie/sound into asoc-component ASoC: wm5102: Implement OSR support ASoC: wm2000: Expose some more registers for diagnostics ASoC: wm_adsp: Provide defines for firmwares ASoC: wm_adsp: Split ADSP1 and ADSP2 firmware controls Merge branch 'fix/samsung' of git://git.kernel.org/.../broonie/sound into asoc-samsung ASoC: core: Merge Samsung fixes to avoid trivial context conflict ASoC: wm8994: Remove duplicate revision cache ASoC: wm_adsp: Add support for firmware wide coefficient blocks Merge remote-tracking branch 'asoc/fix/compress' into asoc-next Merge remote-tracking branch 'asoc/fix/core' into asoc-next Merge remote-tracking branch 'asoc/fix/samsung' into asoc-next Merge remote-tracking branch 'asoc/fix/tegra' into asoc-next Merge remote-tracking branch 'asoc/fix/wm8903' into asoc-next Merge remote-tracking branch 'asoc/topic/adau1373' into asoc-next Merge remote-tracking branch 'asoc/topic/adsp' into asoc-next Merge remote-tracking branch 'asoc/topic/ak4104' into asoc-next Merge remote-tracking branch 'asoc/topic/ak5386' into asoc-next Merge remote-tracking branch 'asoc/topic/arizona' into asoc-next Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next Merge remote-tracking branch 'asoc/topic/component' into asoc-next Merge remote-tracking branch 'asoc/topic/compress' into asoc-next Merge remote-tracking branch 'asoc/topic/core' into asoc-next Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-next Merge remote-tracking branch 'asoc/topic/cs42l73' into asoc-next Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next Merge remote-tracking branch 'asoc/topic/dma' into asoc-next Merge remote-tracking branch 'asoc/topic/fsi' into asoc-next Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next Merge remote-tracking branch 'asoc/topic/maintainers' into asoc-next Merge remote-tracking branch 'asoc/topic/max98088' into asoc-next Merge remote-tracking branch 'asoc/topic/max98090' into asoc-next Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next Merge remote-tracking branch 'asoc/topic/si476x' into asoc-next Merge remote-tracking branch 'asoc/topic/spear' into asoc-next Merge remote-tracking branch 'asoc/topic/tas5086' into asoc-next Merge remote-tracking branch 'asoc/topic/tegra' into asoc-next Merge remote-tracking branch 'asoc/topic/ux500' into asoc-next Merge remote-tracking branch 'asoc/topic/wm-hubs' into asoc-next Merge remote-tracking branch 'asoc/topic/wm0010' into asoc-next Merge remote-tracking branch 'asoc/topic/wm2000' into asoc-next Merge remote-tracking branch 'asoc/topic/wm8903' into asoc-next Merge remote-tracking branch 'asoc/topic/wm8960' into asoc-next Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-next Merge remote-tracking branch 'asoc/topic/core' into asoc-next Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-next Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next Merge remote-tracking branch 'asoc/topic/dma' into asoc-next Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next Merge remote-tracking branch 'asoc/topic/max98088' into asoc-next Merge remote-tracking branch 'asoc/topic/ux500' into asoc-next Masami Hiramatsu (1): kprobes: Fix a double lock bug of kprobe_mutex Matt Fleming (1): x86, efivars: firmware bug workarounds should be in platform code Matthew Garrett (4): Move utf16 functions to kernel core and rename efi: Pass boot services variable info to runtime code efi: Distinguish between "remaining space" and actually used space Revert "hp-wmi: Add support for SMBus hotkeys" Michael Bohan (1): hrtimer: Don't reinitialize a cpu_base lock on CPU_UP Michael Neuling (1): powerpc: fix compiling CONFIG_PPC_TRANSACTIONAL_MEM when CONFIG_ALTIVEC=n Michal Bachraty (3): ASoC: davinci-mcasp: Add support for multichannel playback ASoC: davinci-pcm, davinci-mcasp: Clean up active_serializers ASoC: davinci-mcasp: Add Support BCLK-to-LRCLK ratio for TDM modes Miklos Szeredi (1): fuse: fix type definitions in uapi header Mugunthan V N (1): drivers: net: ethernet: cpsw: get slave VLAN id from slave node instead of cpsw node Naoya Horiguchi (3): hugetlbfs: stop setting VM_DONTDUMP in initializing vma(VM_HUGETLB) fs/binfmt_elf.c: fix hugetlb memory check in vma_dump_size() hugetlbfs: add swap entry check in follow_hugetlb_page() Oleg Nesterov (1): thinkpad-acpi: kill hotkey_thread_mutex Patrick McHardy (1): netfilter: nf_ct_sip: don't drop packets with offsets pointing outside the packet Paul Bolle (2): ASoC: samsung: remove last traces of neo1973-gta01 ASoC: Ux500: remove test for undefined Kconfig macro Paul Handrigan (1): ASoC: cs42l73: If Internal MCLK is >= 6.4MHz, then set SCLK to 64*Fs. Ping Cheng (2): Input: wacom - DTH2242 Grip Pen id was off by one bit Input: wacom - fix "can not retrieve extra class descriptor" for DTH2242 Rafał Miłecki (1): ssb: implement spurious tone avoidance Richard Weinberger (2): x86,efi: Check max_size only if it is non-zero. x86,efi: Implement efi_no_storage_paranoia parameter Rob Herring (1): ARM: highbank: fix cache flush ordering for cpu hotplug Russell King (2): ARM: Do 15e0d9e37c (ARM: pm: let platforms select cpu_suspend support) properly Merge branch 'for-rmk/740t' of git://git.kernel.org/.../will/linux into fixes Ryo Tsutsui (2): ASoC: dapm: Remove redundant clear_walk() for supply widgets ASoC: dapm: Only clear paths we've walked Sachin Kamat (5): ASoC: max98090: Remove unneeded version.h header include ASoC: max98090: Convert to devm_regmap_init_i2c() ASoC: max98090: Make struct dev_pm_ops const ASoC: max98090: Fix checkpatch errors related to spacing ASoC: max98090: Remove unnecessary braces Sam Ravnborg (3): sparc: use generic headers bbc_i2c: fix section mismatch warning sparc: use asm-generic version of types.h Scott Wood (4): kvm/powerpc/e500mc: fix tlb invalidation on cpu migration kvm/ppc/e500: h2g_tlb1_rmap: esel 0 is valid kvm/ppc/e500: g2h_tlb1_map: clear old bit before setting new bit kvm/ppc/e500: eliminate tlb_refs Sergey Vlasov (2): x86/Kconfig: Make EFI select UCS2_STRING efi: Export efi_query_variable_store() for efivars.ko Shahed Shaikh (1): qlcnic: Fix typo in logs Shawn Guo (2): ASoC: generic-dmaengine-pcm: use a more common dma name ASoC: generic-dmaengine-pcm: call dma_request_slave_channel() Sritej Velaga (2): qlcnic: fix TSO race condition qlge: Fix receive path to drop error frames Stephane Eranian (1): perf/x86: Fix offcore_rsp valid mask for SNB/IVB Stephen Boyd (1): ARM: 7699/1: sched_clock: Add more notrace to prevent recursion Stephen Warren (10): ASoC: tegra: assume CONFIG_OF in tegra_asoc_utils_init ASoC: tegra_wm8753: minor cleanup ASoC: tegra_wm9712: assume CONFIG_OF ASoC: tegra_alc5632: assume CONFIG_OF, and other cleanup ASoC: tegra trimslice: assume CONFIG_OF, and other cleanup ASoC: tegra_wm8903: assume CONFIG_OF, remove platform data ASoC: tegra: add Tegra114 support to the AHUB driver ASoC: tegra: add Tegra114 support to tegra_asoc_utils.c ASoC: export snd_soc_register_component ASoC: dapm: Implement mixer control sharing Thomas Gleixner (1): kthread: Prevent unpark race which puts threads on the wrong cpu Thomas Graf (1): tcp: Reallocate headroom if it would overflow csum_start Thomas Petazzoni (1): net: mvmdio: add select PHYLIB Tim Gardner (2): ASoC: adau1373: adau1373_hw_params: Silence overflow warning ASoC: wm_hubs: Silence reg_r and reg_l 'may be used uninitialized' warnings Tommi Rantala (1): perf: Treat attr.config as u64 in perf_swevent_init() Vinod Koul (1): ASoC: mid-x86 - add support for meaadata apis Vyacheslav Dubeyko (1): hfsplus: fix potential overflow in hfsplus_file_truncate() Wei Yongjun (5): ASoC: tas5086: use module_i2c_driver to simplify the code ASoC: arizona: remove duplicated include from arizona.c tuntap: fix error return code in tun_set_iff() esp4: fix error return code in esp_output() pkt_sched: fix error return code in fw_change_attrs() Will Deacon (6): ARM: tlbflush: remove ARMv3 support ARM: cache: remove ARMv3 support code ARM: mm: fix numerous hideous errors in proc-arm740.S ARM: mm: remove broken condition check for v4 flushing ARM: modules: don't export cpu_set_pte_ext when !MMU ARM: 7698/1: perf: fix group validation when using enable_on_exec Willy Tarreau (1): net: mvneta: fix improper tx queue usage in mvneta_tx() Xishi Qiu (1): mm/vmscan: fix error return in kswapd_run() Yegor Yefremov (2): ASoC: davinci-mcasp: don't configure AFSX direction in DIT mode ASoC: davinci-mcasp: don't overwrite DIT settings Yinghai Lu (4): x86, kdump: Set crashkernel_low automatically x86, kdump: Retore crashkernel= to allocate under 896M x86, kdump: Change crashkernel_high/low= to crashkernel=,high/low kexec: use Crash kernel for Crash kernel low Zefir Kurtisi (1): ath9k: fix DFS detector called in softirq context Zoltan Puskas (1): ASoC: atmel: Add slave mode support to SSC in DSP Mode A nikolay(a)redhat.com (7): bonding: fix netdev event NULL pointer dereference bonding: IFF_BONDING is not stripped on enslave failure bonding: mc addresses don't get deleted on enslave failure bonding: vlans don't get deleted on enslave failure bonding: primary_slave & curr_active_slave are not cleaned on enslave failure bonding: disable netpoll on enslave failure bonding: in bond_mc_swap() bond's mc addr list is walked without lock stephen hemminger (1): bridge: make user modified path cost sticky Documentation/devicetree/bindings/sound/ak5386.txt | 19 + .../bindings/sound/nvidia,tegra30-ahub.txt | 26 +- .../devicetree/bindings/sound/ti,tas5086.txt | 32 ++ Documentation/kernel-parameters.txt | 29 +- Makefile | 5 +- arch/arm/include/asm/glue-cache.h | 8 - arch/arm/include/asm/hardware/iop3xx.h | 2 +- arch/arm/include/asm/pgtable-3level.h | 2 +- arch/arm/include/asm/tlbflush.h | 11 +- arch/arm/kernel/hw_breakpoint.c | 2 +- arch/arm/kernel/perf_event.c | 5 +- arch/arm/kernel/sched_clock.c | 4 +- arch/arm/kernel/setup.c | 3 - arch/arm/kernel/tcm.c | 1 - arch/arm/kvm/arm.c | 1 + arch/arm/kvm/coproc.c | 4 +- arch/arm/mach-highbank/hotplug.c | 10 +- arch/arm/mach-s3c24xx/dma-s3c2410.c | 2 - arch/arm/mach-s3c24xx/dma-s3c2412.c | 2 - arch/arm/mach-s3c24xx/dma-s3c2440.c | 2 - arch/arm/mach-s3c24xx/dma-s3c2443.c | 2 - arch/arm/mm/Kconfig | 5 +- arch/arm/mm/Makefile | 1 - arch/arm/mm/cache-feroceon-l2.c | 1 + arch/arm/mm/cache-v3.S | 137 ----- arch/arm/mm/cache-v4.S | 2 +- arch/arm/mm/mmu.c | 2 + arch/arm/mm/proc-arm740.S | 30 +- arch/arm/mm/proc-arm920.S | 2 +- arch/arm/mm/proc-arm926.S | 2 +- arch/arm/mm/proc-mohawk.S | 2 +- arch/arm/mm/proc-sa1100.S | 2 +- arch/arm/mm/proc-syms.c | 2 + arch/arm/mm/proc-v6.S | 2 +- arch/arm/mm/proc-xsc3.S | 2 +- arch/arm/mm/proc-xscale.S | 2 +- arch/arm/{kernel => mm}/tcm.h | 0 arch/arm/plat-samsung/devs.c | 6 + arch/avr32/include/asm/io.h | 4 + arch/powerpc/kernel/entry_64.S | 4 +- arch/powerpc/kernel/process.c | 2 + arch/powerpc/kernel/signal_32.c | 2 + arch/powerpc/kernel/signal_64.c | 2 + arch/powerpc/kernel/tm.S | 2 + arch/powerpc/kvm/e500.h | 24 +- arch/powerpc/kvm/e500_mmu_host.c | 84 +-- arch/powerpc/kvm/e500mc.c | 7 +- arch/s390/include/asm/io.h | 4 - arch/s390/include/asm/pgtable.h | 4 + arch/sparc/include/asm/Kbuild | 5 + arch/sparc/include/asm/cputime.h | 6 - arch/sparc/include/asm/emergency-restart.h | 6 - arch/sparc/include/asm/mutex.h | 9 - arch/sparc/include/asm/pgtable_64.h | 1 + arch/sparc/include/asm/serial.h | 6 - arch/sparc/include/asm/smp_32.h | 5 - arch/sparc/include/asm/switch_to_64.h | 3 +- arch/sparc/include/asm/tlbflush_64.h | 37 +- arch/sparc/include/uapi/asm/Kbuild | 1 - arch/sparc/include/uapi/asm/types.h | 17 - arch/sparc/kernel/smp_64.c | 41 +- arch/sparc/lib/bitext.c | 6 +- arch/sparc/mm/iommu.c | 2 +- arch/sparc/mm/srmmu.c | 4 +- arch/sparc/mm/tlb.c | 38 +- arch/sparc/mm/tsb.c | 57 +- arch/sparc/mm/ultra.S | 119 +++- arch/x86/Kconfig | 1 + arch/x86/boot/compressed/eboot.c | 47 ++ arch/x86/include/asm/efi.h | 7 + arch/x86/include/uapi/asm/bootparam.h | 1 + arch/x86/kernel/cpu/mshyperv.c | 18 +- arch/x86/kernel/cpu/perf_event_intel.c | 20 +- arch/x86/kernel/microcode_core_early.c | 38 +- arch/x86/kernel/setup.c | 45 +- arch/x86/platform/efi/efi.c | 168 +++++- block/blk-core.c | 1 + drivers/block/rbd.c | 3 +- drivers/char/hpet.c | 14 +- drivers/dma/at_hdmac.c | 9 +- drivers/extcon/extcon-arizona.c | 107 ++-- drivers/firmware/Kconfig | 1 + drivers/firmware/efivars.c | 98 +--- drivers/idle/intel_idle.c | 1 + drivers/input/tablet/wacom_wac.c | 8 +- drivers/irqchip/irq-gic.c | 3 +- drivers/md/dm.c | 1 + drivers/md/raid5.c | 11 +- drivers/mfd/wm5102-tables.c | 10 + drivers/mtd/mtdchar.c | 59 +- drivers/net/bonding/bond_main.c | 90 ++- drivers/net/can/mcp251x.c | 10 +- drivers/net/can/sja1000/sja1000_of_platform.c | 31 +- drivers/net/ethernet/8390/ax88796.c | 2 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 7 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 4 + drivers/net/ethernet/emulex/benet/be_main.c | 5 +- drivers/net/ethernet/freescale/fec.c | 1 + drivers/net/ethernet/intel/igb/igb.h | 8 - drivers/net/ethernet/intel/igb/igb_main.c | 110 +--- drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 6 + drivers/net/ethernet/marvell/Kconfig | 2 +- drivers/net/ethernet/marvell/mvneta.c | 9 +- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 15 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 3 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 4 +- drivers/net/ethernet/qlogic/qlge/qlge.h | 2 +- drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c | 2 +- drivers/net/ethernet/qlogic/qlge/qlge_main.c | 36 +- drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 1 + drivers/net/ethernet/ti/cpsw.c | 2 +- drivers/net/tun.c | 2 +- drivers/net/usb/cdc_mbim.c | 2 +- drivers/net/usb/qmi_wwan.c | 104 ++++ .../net/wireless/ath/ath9k/ar9580_1p0_initvals.h | 2 +- .../net/wireless/ath/ath9k/dfs_pattern_detector.c | 4 +- drivers/net/wireless/ath/ath9k/dfs_pri_detector.c | 4 +- drivers/net/wireless/ath/ath9k/htc_drv_init.c | 2 +- drivers/net/wireless/b43/phy_n.c | 3 +- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 7 +- .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 264 ++++----- drivers/platform/x86/hp-wmi.c | 4 - drivers/platform/x86/thinkpad_acpi.c | 10 - drivers/sbus/char/bbc_i2c.c | 4 +- drivers/ssb/driver_chipcommon_pmu.c | 29 + drivers/video/fbmem.c | 39 +- drivers/video/mmp/core.c | 2 - fs/binfmt_elf.c | 1 + fs/bio.c | 2 - fs/hfsplus/extents.c | 2 +- fs/hugetlbfs/inode.c | 2 +- fs/proc/array.c | 1 + include/linux/blktrace_api.h | 1 - include/linux/efi.h | 9 +- include/linux/kexec.h | 2 + include/linux/mfd/arizona/core.h | 3 + include/linux/mfd/arizona/registers.h | 42 ++ include/linux/mfd/wm8994/pdata.h | 8 + include/linux/mm.h | 2 + include/linux/netfilter/ipset/ip_set_ahash.h | 30 +- include/linux/sched.h | 5 +- include/linux/ssb/ssb_driver_chipcommon.h | 2 + include/linux/swiotlb.h | 1 + include/linux/ucs2_string.h | 14 + include/net/addrconf.h | 1 + include/net/irda/irlmp.h | 3 +- include/net/scm.h | 4 +- include/sound/dmaengine_pcm.h | 5 + include/sound/soc-dai.h | 8 - include/sound/soc.h | 20 + include/sound/tas5086.h | 7 + include/sound/tegra_wm8903.h | 26 - include/trace/events/block.h | 8 +- include/trace/events/sched.h | 2 +- include/uapi/linux/fuse.h | 436 +++++++-------- kernel/events/core.c | 2 +- kernel/hrtimer.c | 3 +- kernel/kexec.c | 118 +++- kernel/kprobes.c | 19 +- kernel/kthread.c | 52 +- kernel/signal.c | 2 +- kernel/smpboot.c | 14 +- kernel/trace/blktrace.c | 26 +- kernel/user_namespace.c | 22 +- lib/Kconfig | 3 + lib/Makefile | 2 + lib/swiotlb.c | 19 +- lib/ucs2_string.c | 51 ++ mm/hugetlb.c | 12 +- mm/memory.c | 47 ++ mm/vmscan.c | 2 +- net/802/mrp.c | 4 + net/batman-adv/main.c | 5 +- net/batman-adv/main.h | 2 +- net/batman-adv/routing.c | 38 +- net/batman-adv/translation-table.c | 2 +- net/batman-adv/vis.c | 4 +- net/bridge/br_if.c | 3 +- net/bridge/br_private.h | 1 + net/bridge/br_stp_if.c | 1 + net/core/dev.c | 3 + net/ipv4/esp4.c | 6 +- net/ipv4/ip_fragment.c | 14 +- net/ipv4/netfilter/ipt_rpfilter.c | 8 +- net/ipv4/syncookies.c | 4 +- net/ipv4/tcp_input.c | 64 +-- net/ipv4/tcp_output.c | 8 +- net/ipv6/addrconf.c | 24 +- net/ipv6/addrconf_core.c | 19 + net/ipv6/netfilter/ip6t_rpfilter.c | 8 +- net/ipv6/reassembly.c | 12 +- net/irda/iriap.c | 3 +- net/irda/irlmp.c | 10 +- net/mac80211/iface.c | 27 +- net/mac80211/mlme.c | 24 +- net/netfilter/ipset/ip_set_bitmap_ipmac.c | 6 +- net/netfilter/ipset/ip_set_hash_ipportnet.c | 18 + net/netfilter/ipset/ip_set_hash_net.c | 22 +- net/netfilter/ipset/ip_set_hash_netiface.c | 22 +- net/netfilter/ipset/ip_set_hash_netport.c | 18 + net/netfilter/ipset/ip_set_list_set.c | 10 +- net/netfilter/nf_conntrack_sip.c | 6 +- net/netfilter/nf_nat_core.c | 40 +- net/openvswitch/datapath.c | 30 +- net/openvswitch/flow.c | 2 +- net/sched/cls_fw.c | 2 +- scripts/checkpatch.pl | 1 + sound/core/pcm_native.c | 12 +- sound/soc/atmel/atmel_ssc_dai.c | 54 +- sound/soc/au1x/ac97c.c | 9 +- sound/soc/au1x/i2sc.c | 9 +- sound/soc/au1x/psc-ac97.c | 9 +- sound/soc/au1x/psc-i2s.c | 9 +- sound/soc/blackfin/bf5xx-ac97.c | 9 +- sound/soc/blackfin/bf5xx-i2s.c | 9 +- sound/soc/blackfin/bf5xx-tdm.c | 9 +- sound/soc/blackfin/bf6xx-i2s.c | 9 +- sound/soc/cirrus/ep93xx-ac97.c | 9 +- sound/soc/cirrus/ep93xx-i2s.c | 9 +- sound/soc/codecs/Kconfig | 8 + sound/soc/codecs/Makefile | 4 + sound/soc/codecs/adau1373.c | 5 +- sound/soc/codecs/ak4104.c | 55 +- sound/soc/codecs/ak5386.c | 152 +++++ sound/soc/codecs/arizona.c | 530 +++++++++++++++--- sound/soc/codecs/arizona.h | 34 +- sound/soc/codecs/cs4271.c | 166 +++--- sound/soc/codecs/cs42l73.c | 6 +- sound/soc/codecs/max98088.c | 32 +- sound/soc/codecs/max98090.c | 45 +- sound/soc/codecs/si476x.c | 47 +- sound/soc/codecs/tas5086.c | 591 ++++++++++++++++++++ sound/soc/codecs/wm0010.c | 6 +- sound/soc/codecs/wm2000.c | 4 +- sound/soc/codecs/wm2000.h | 2 + sound/soc/codecs/wm2200.c | 2 +- sound/soc/codecs/wm5102.c | 129 ++--- sound/soc/codecs/wm5102.h | 6 +- sound/soc/codecs/wm5110.c | 54 +- sound/soc/codecs/wm5110.h | 6 +- sound/soc/codecs/wm8903.c | 4 + sound/soc/codecs/wm8960.c | 10 + sound/soc/codecs/wm8994.c | 68 ++- sound/soc/codecs/wm8994.h | 3 +- sound/soc/codecs/wm_adsp.c | 124 +++- sound/soc/codecs/wm_adsp.h | 5 +- sound/soc/codecs/wm_hubs.c | 9 +- sound/soc/davinci/davinci-i2s.c | 15 +- sound/soc/davinci/davinci-mcasp.c | 110 ++-- sound/soc/davinci/davinci-mcasp.h | 2 +- sound/soc/davinci/davinci-pcm.c | 9 +- sound/soc/davinci/davinci-vcif.c | 11 +- sound/soc/dwc/designware_i2s.c | 9 +- sound/soc/fsl/fsl_ssi.c | 11 +- sound/soc/fsl/fsl_ssi.h | 8 + sound/soc/fsl/imx-audmux.c | 3 +- sound/soc/fsl/imx-pcm-fiq.c | 2 +- sound/soc/fsl/imx-sgtl5000.c | 2 +- sound/soc/fsl/imx-ssi.c | 13 +- sound/soc/fsl/mpc5200_psc_ac97.c | 8 +- sound/soc/fsl/mpc5200_psc_i2s.c | 9 +- sound/soc/jz4740/jz4740-i2s.c | 9 +- sound/soc/kirkwood/kirkwood-i2s.c | 11 +- sound/soc/mid-x86/sst_platform.c | 20 +- sound/soc/mid-x86/sst_platform.h | 2 + sound/soc/mxs/Kconfig | 2 +- sound/soc/mxs/mxs-pcm.c | 139 +---- sound/soc/mxs/mxs-saif.c | 14 +- sound/soc/nuc900/nuc900-ac97.c | 9 +- sound/soc/omap/omap-dmic.c | 9 +- sound/soc/omap/omap-hdmi.c | 9 +- sound/soc/omap/omap-mcbsp.c | 9 +- sound/soc/omap/omap-mcpdm.c | 9 +- sound/soc/pxa/mmp-sspa.c | 9 +- sound/soc/pxa/pxa-ssp.c | 9 +- sound/soc/pxa/pxa2xx-ac97.c | 11 +- sound/soc/pxa/pxa2xx-i2s.c | 9 +- sound/soc/s6000/s6000-i2s.c | 9 +- sound/soc/samsung/Kconfig | 5 +- sound/soc/samsung/ac97.c | 14 +- sound/soc/samsung/goni_wm8994.c | 11 +- sound/soc/samsung/h1940_uda1380.c | 2 +- sound/soc/samsung/i2s.c | 16 +- sound/soc/samsung/idma.c | 11 +- sound/soc/samsung/neo1973_wm8753.c | 3 +- sound/soc/samsung/pcm.c | 11 +- .../include/plat => sound/soc/samsung}/regs-ac97.h | 0 .../include/plat => sound/soc/samsung}/regs-iis.h | 0 sound/soc/samsung/rx1950_uda1380.c | 2 +- sound/soc/samsung/s3c-i2s-v2.c | 9 +- sound/soc/samsung/s3c-i2s-v2.h | 7 +- sound/soc/samsung/s3c2412-i2s.c | 12 +- sound/soc/samsung/s3c24xx-i2s.c | 13 +- sound/soc/samsung/s3c24xx_uda134x.c | 2 +- sound/soc/samsung/spdif.c | 11 +- sound/soc/sh/fsi.c | 14 +- sound/soc/sh/hac.c | 10 +- sound/soc/sh/migor.c | 2 +- sound/soc/sh/siu_dai.c | 11 +- sound/soc/sh/ssi.c | 10 +- sound/soc/soc-compress.c | 27 + sound/soc/soc-core.c | 99 +++- sound/soc/soc-dapm.c | 319 ++++++----- sound/soc/soc-generic-dmaengine-pcm.c | 44 +- sound/soc/soc-utils.c | 25 + sound/soc/spear/spdif_in.c | 9 +- sound/soc/spear/spdif_out.c | 9 +- sound/soc/spear/spear_pcm.c | 4 +- sound/soc/tegra/tegra20_ac97.c | 15 +- sound/soc/tegra/tegra20_i2s.c | 15 +- sound/soc/tegra/tegra20_spdif.c | 15 +- sound/soc/tegra/tegra30_ahub.c | 64 ++- sound/soc/tegra/tegra30_ahub.h | 16 + sound/soc/tegra/tegra30_i2s.c | 15 +- sound/soc/tegra/tegra_alc5632.c | 15 +- sound/soc/tegra/tegra_asoc_utils.c | 34 +- sound/soc/tegra/tegra_asoc_utils.h | 1 + sound/soc/tegra/tegra_wm8753.c | 15 +- sound/soc/tegra/tegra_wm8903.c | 179 +++--- sound/soc/tegra/tegra_wm9712.c | 7 +- sound/soc/tegra/trimslice.c | 56 +- sound/soc/txx9/txx9aclc-ac97.c | 9 +- sound/soc/ux500/ux500_msp_dai.c | 13 +- sound/soc/ux500/ux500_msp_dai.h | 5 - sound/soc/ux500/ux500_msp_i2s.h | 1 + tools/power/x86/turbostat/turbostat.c | 5 +- 326 files changed, 5225 insertions(+), 2620 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/ak5386.txt create mode 100644 Documentation/devicetree/bindings/sound/ti,tas5086.txt delete mode 100644 arch/arm/mm/cache-v3.S rename arch/arm/{kernel => mm}/tcm.h (100%) delete mode 100644 arch/sparc/include/asm/cputime.h delete mode 100644 arch/sparc/include/asm/emergency-restart.h delete mode 100644 arch/sparc/include/asm/mutex.h delete mode 100644 arch/sparc/include/asm/serial.h delete mode 100644 arch/sparc/include/uapi/asm/types.h create mode 100644 include/linux/ucs2_string.h create mode 100644 include/sound/tas5086.h delete mode 100644 include/sound/tegra_wm8903.h create mode 100644 lib/ucs2_string.c create mode 100644 sound/soc/codecs/ak5386.c create mode 100644 sound/soc/codecs/tas5086.c rename {arch/arm/plat-samsung/include/plat => sound/soc/samsung}/regs-ac97.h (100%) rename {arch/arm/plat-samsung/include/plat => sound/soc/samsung}/regs-iis.h (100%)

2 1

Re: [alsa-devel] [PATCH] drm/i915: Add private api for power well usage
by Wang, Xingchao 25 Apr '13

25 Apr '13

Hi Daniel/Paulo, Any comments on this? Add Jesse and Rafael in loop. thanks --xingchao > -----Original Message----- > From: Wang, Xingchao > Sent: Wednesday, April 24, 2013 3:29 PM > To: daniel.vetter(a)ffwll.ch; Zanoni, Paulo R; 'Takashi Iwai' > Cc: ville.syrjala(a)linux.intel.com; Lin, Mengdong; Girdwood, Liam R; Li, Jocelyn; > intel-gfx(a)lists.freedesktop.org; alsa-devel(a)alsa-project.org; 'Wang Xingchao' > Subject: RE: [PATCH] drm/i915: Add private api for power well usage > > Hi Guys, > > Sorry I should Add Takashi and alsa maillist in loop. > > I tested this patch against Daniel's "drm-intel-next-queued" Branch, on > Haswell Mobile C3 stepping machines. > > Test steps: > 1. only connect one monitor through HDMI cable 2. echo 1 > > /sys/module/i915/parameters/disable_power_well ==> I think this could be set > as 1 by default if applied my patch. > 3. plug out HDMI cable > 4. cat /proc/asound/card0/codec#0 > > At step 3, i915 will try to disable power well but rejected as display audio is > using power well. > Without the patch, display audio would crash at step 4. > > I did not list suspend/resume test here, as during suspend sequence, i915 will > _ENABLE_ power well, that's a BUG? > > For me above test case is the only one to reproduce the issue, if you have more > ideas and need more test, please let me know. > > I'm afraid there's some risk because the dependency between alsa driver and > drm driver. For example, if i915 module was not loaded, display audio Will call > request_power_well() and meet symbol error. Even if i915 module loaded after > snd-hda-intel module, there's such risk too. Any comment on this? > > Another risk is the pointer "power_well_device", it should be set NULL when > i915 module unloaded, I added the caller but have no idea where to call it, if > anyone has suggestion, that would be fine. > > thanks > --xingchao > > > > -----Original Message----- > > From: Wang Xingchao [mailto:xingchao.wang@linux.intel.com] > > Sent: Thursday, April 24, 2014 10:20 PM > > To: daniel.vetter(a)ffwll.ch; Zanoni, Paulo R > > Cc: ville.syrjala(a)linux.intel.com; Lin, Mengdong; Girdwood, Liam R; > > Li, Jocelyn; intel-gfx(a)lists.freedesktop.org; Wang, Xingchao; Wang > > Xingchao > > Subject: [PATCH] drm/i915: Add private api for power well usage > > > > Display audio depends on power well in graphic side, it should request > > power well before use it and release power well after use. > > I915 will not shutdown power well if it detects audio is using. > > This patch protects display audio crash for Intel Haswell mobile > > C3 stepping board. > > > > Signed-off-by: Wang Xingchao <xingchao.wang(a)linux.intel.com> > > --- > > drivers/gpu/drm/i915/intel_pm.c | 73 > > +++++++++++++++++++++++++++++++++++---- > > include/drm/audio_drm.h | 39 +++++++++++++++++++++ > > sound/pci/hda/hda_intel.c | 8 +++++ > > 3 files changed, 113 insertions(+), 7 deletions(-) create mode > > 100644 include/drm/audio_drm.h > > > > diff --git a/drivers/gpu/drm/i915/intel_pm.c > > b/drivers/gpu/drm/i915/intel_pm.c index 2557926..9983f56 100644 > > --- a/drivers/gpu/drm/i915/intel_pm.c > > +++ b/drivers/gpu/drm/i915/intel_pm.c > > @@ -4298,18 +4298,12 @@ bool intel_using_power_well(struct drm_device > > *dev) > > return true; > > } > > > > -void intel_set_power_well(struct drm_device *dev, bool enable) > > +void set_power_well(struct drm_device *dev, bool enable) > > { > > struct drm_i915_private *dev_priv = dev->dev_private; > > bool is_enabled, enable_requested; > > uint32_t tmp; > > > > - if (!HAS_POWER_WELL(dev)) > > - return; > > - > > - if (!i915_disable_power_well && !enable) > > - return; > > - > > tmp = I915_READ(HSW_PWR_WELL_DRIVER); > > is_enabled = tmp & HSW_PWR_WELL_STATE; > > enable_requested = tmp & HSW_PWR_WELL_ENABLE; @@ -4332,6 > > +4326,71 @@ void intel_set_power_well(struct drm_device *dev, bool > > +enable) > > } > > } > > > > +/* Global drm_device for display audio drvier usage */ static struct > > +drm_device *power_well_device; static bool audio_power_well_using, > > +i915_power_well_using; > > +/* Lock protecting power well setting */ > > +DEFINE_SPINLOCK(powerwell_lock); > > + > > +void request_power_well(void) > > +{ > > + DRM_DEBUG_KMS("Display audio requesting power well\n"); > > + spin_lock_irq(&powerwell_lock); > > + if (!power_well_device) > > + goto out; > > + if (i915_power_well_using == false) > > + set_power_well(power_well_device, true); > > + audio_power_well_using = true; > > +out: > > + spin_unlock_irq(&powerwell_lock); > > + return; > > +} > > +EXPORT_SYMBOL_GPL(request_power_well); > > + > > +void release_power_well(void) > > +{ > > + DRM_DEBUG_KMS("Display audio releasing power well\n"); > > + spin_lock_irq(&powerwell_lock); > > + if (!power_well_device) > > + goto out; > > + if (i915_power_well_using == false) > > + set_power_well(power_well_device, false); > > + audio_power_well_using = false; > > +out: > > + spin_unlock_irq(&powerwell_lock); > > + return; > > +} > > +EXPORT_SYMBOL_GPL(release_power_well); > > + > > +/* TODO: Call this when i915 module unload */ void > > +remove_power_well(void) { > > + spin_lock_irq(&powerwell_lock); > > + audio_power_well_using = false; > > + i915_power_well_using = false; > > + power_well_device = NULL; > > + spin_unlock_irq(&powerwell_lock); > > +} > > + > > +void intel_set_power_well(struct drm_device *dev, bool enable) { > > + if (!HAS_POWER_WELL(dev)) > > + return; > > + > > + spin_lock_irq(&powerwell_lock); > > + power_well_device = dev; > > + i915_power_well_using = enable; > > + if (!enable && audio_power_well_using) > > + goto out; > > + > > + if (!i915_disable_power_well && !enable) > > + goto out; > > + set_power_well(dev, enable); > > +out: > > + spin_unlock_irq(&powerwell_lock); > > + return; > > +} > > + > > /* > > * Starting with Haswell, we have a "Power Down Well" that can be turned > off > > * when not needed anymore. We have 4 registers that can request the > > power well diff --git a/include/drm/audio_drm.h > > b/include/drm/audio_drm.h new file mode 100644 index 0000000..4412b36 > > --- /dev/null > > +++ b/include/drm/audio_drm.h > > @@ -0,0 +1,39 @@ > > > +/************************************************************** > > ******** > > +**** > > + * > > + * Copyright 2013 Intel Inc. > > + * All Rights Reserved. > > + * > > + * Permission is hereby granted, free of charge, to any person > > +obtaining a > > + * copy of this software and associated documentation files (the > > + * "Software"), to deal in the Software without restriction, > > +including > > + * without limitation the rights to use, copy, modify, merge, > > +publish, > > + * distribute, sub license, and/or sell copies of the Software, and > > +to > > + * permit persons to whom the Software is furnished to do so, subject > > +to > > + * the following conditions: > > + * > > + * The above copyright notice and this permission notice (including > > +the > > + * next paragraph) shall be included in all copies or substantial > > +portions > > + * of the Software. > > + * > > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY > KIND, > > +EXPRESS OR > > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF > > +MERCHANTABILITY, > > + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO > > EVENT > > +SHALL > > + * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE > > FOR > > +ANY CLAIM, > > + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, > > TORT > > +OR > > + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE > > SOFTWARE > > +OR THE > > + * USE OR OTHER DEALINGS IN THE SOFTWARE. > > + * > > + * > > + > > > +*************************************************************** > > ******** > > +***/ > > +/* > > + * Authors: > > + * Wang Xingchao <xingchao.wang(a)intel.com> */ > > + > > +#ifndef _AUDIO_DRM_H_ > > +#define _AUDIO_DRM_H_ > > + > > +extern void request_power_well(void); extern void > > +release_power_well(void); > > + > > +#endif /* _AUDIO_DRM_H_ */ > > diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c > > index 418bfc0..59a85de 100644 > > --- a/sound/pci/hda/hda_intel.c > > +++ b/sound/pci/hda/hda_intel.c > > @@ -50,6 +50,7 @@ > > #include <linux/clocksource.h> > > #include <linux/time.h> > > #include <linux/completion.h> > > +#include <drm/audio_drm.h> > > > > #ifdef CONFIG_X86 > > /* for snoop control */ > > @@ -2869,6 +2870,7 @@ static int azx_suspend(struct device *dev) > > pci_disable_device(pci); > > pci_save_state(pci); > > pci_set_power_state(pci, PCI_D3hot); > > + release_power_well(); > > return 0; > > } > > > > @@ -2881,6 +2883,7 @@ static int azx_resume(struct device *dev) > > if (chip->disabled) > > return 0; > > > > + request_power_well(); > > pci_set_power_state(pci, PCI_D0); > > pci_restore_state(pci); > > if (pci_enable_device(pci) < 0) { > > @@ -2913,6 +2916,7 @@ static int azx_runtime_suspend(struct device > > *dev) > > > > azx_stop_chip(chip); > > azx_clear_irq_pending(chip); > > + release_power_well(); > > return 0; > > } > > > > @@ -2921,6 +2925,7 @@ static int azx_runtime_resume(struct device *dev) > > struct snd_card *card = dev_get_drvdata(dev); > > struct azx *chip = card->private_data; > > > > + request_power_well(); > > azx_init_pci(chip); > > azx_init_chip(chip, 1); > > return 0; > > @@ -3671,6 +3676,8 @@ static int azx_probe(struct pci_dev *pci, > > return -ENOENT; > > } > > > > + request_power_well(); > > + > > err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); > > if (err < 0) { > > snd_printk(KERN_ERR "hda-intel: Error creating card!\n"); @@ > > -3806,6 +3813,7 @@ static void azx_remove(struct pci_dev *pci) > > if (card) > > snd_card_free(card); > > pci_set_drvdata(pci, NULL); > > + release_power_well(); > > } > > > > /* PCI IDs */ > > -- > > 1.7.9.5

2 2

[alsa-devel] code improvements in /sound/usb/mixer.c
by Daniel Schürmann 25 Apr '13

25 Apr '13

Hi Takashi, Hi alsa-devel. in my last mail I had supposed scaling issues with mixer.c, but finally it turns out that was just a debugging problem of myself. I was struggled how types are handled in the code. I have some ideas for improvement but I am not sure if it its worth the work since nothing is broken. 1. get rid of convert_bytes_value(cval, value_set): This function return any type in a integer container, which is confusing. 2. use type casts in convert_signed_value(): gcc knows perfecly how to convert types. 3. merge convert_signed_value() and snd_usb_combine_bytes() to get rid of the intermediate integer variant. --- I am currently working on a patch that introduces a get_ctl_value_range_v2. I want to get rid of the three single queries for min max and rate. Also here, nothing broken. Is it worth to do the work? Kind regards Daniel

1 0

[alsa-devel] [PATCH v2] ALSA: snd-usb-audio: fixed mixer range reading during probing, when compiled with CONFIG_PM defined
by Daniel Schürmann 25 Apr '13

25 Apr '13

During probing, snd_usb_autoresume() fails with -ENODEV. This brakes get_ctl_value() in mixer.c when reading the range values. In the new version snd_usb_autoresume() returns 0 in this case which brakes not the following query. The following snd_usb_suspend() fails silently during probing anyway. The patch also makes the error messages more significant. The original error messages where identified as misleading during debug. Signed-off-by: Daniel Schürmann <daschuer(a)mixxx.org> --- sound/usb/card.c | 7 +++++-- sound/usb/mixer.c | 11 +++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/sound/usb/card.c b/sound/usb/card.c index 5254b18..2f55d00 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -629,9 +629,12 @@ static void usb_audio_disconnect(struct usb_interface *intf) int snd_usb_autoresume(struct snd_usb_audio *chip) { int err = -ENODEV; - + + if (chip->probing) { + return 0; + } down_read(&chip->shutdown_rwsem); - if (!chip->shutdown && !chip->probing) + if (!chip->shutdown) err = usb_autopm_get_interface(chip->pm_intf); up_read(&chip->shutdown_rwsem); diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index ca4739c..5d4f3c6 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -333,9 +333,12 @@ static int get_ctl_value_v2(struct usb_mixer_elem_info *cval, int request, int v memset(buf, 0, sizeof(buf)); - ret = snd_usb_autoresume(chip) ? -EIO : 0; - if (ret) + ret = snd_usb_autoresume(chip); + if (ret) { + snd_printk(KERN_ERR "snd_usb_autoresume() failed with %d\n", ret); + ret = -EIO; goto error; + } down_read(&chip->shutdown_rwsem); if (chip->shutdown) @@ -351,8 +354,8 @@ static int get_ctl_value_v2(struct usb_mixer_elem_info *cval, int request, int v if (ret < 0) { error: - snd_printk(KERN_ERR "cannot get ctl value: req = %#x, wValue = %#x, wIndex = %#x, type = %d\n", - request, validx, idx, cval->val_type); + snd_printk(KERN_ERR "cannot get ctl value: req = %#x, wValue = %#x, wIndex = %#x, type = %d, ret = %d\n", + bRequest, validx, idx, cval->val_type, ret); return ret; } -- 1.7.9.5

2 2

Re: [alsa-devel] [PATCH v2 0/3] USB quirks for Yamaha THR series amps
by Takashi Iwai 25 Apr '13

25 Apr '13

At Wed, 24 Apr 2013 21:19:18 -0400, Trulan Martin wrote: > > The following USB quirks enable MIDI control of the Yamaha THR10, THR5A, and THR10C amps. Each device has its own USB ID. Thanks, applied now. Takashi > > Please cc me as I am not subscribed to the list. > > Thanks, > Trulan >

1 0

[alsa-devel] Asynchronous audio USB chips: choppy playback since 3.8-rc7
by David Henningsson 24 Apr '13

24 Apr '13

Hi ALSA developers, Just to get your attention here on what seems to be an USB audio regression. The bug is described in detail here: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1136110?comments=all Quoting the bug: " This bug seems to affect only a certain kind of hardware, which is called "Asynchronous USB Digital Audio Codec (DAC)". It's said that such a DAC hosts the clock itself (USB Device Host). An ordinary DAC, so called "Synchronous USB DAC", uses the clock hosted by the mother board, which is not affected by this bug. When this bug affects an asynchronous USB DAC, the audio played by the DAC is constantly interrupted. The playback itself does not stop, but the output becomes discontinous, filling with constant crackling noises, destroying everything the DAC plays. " According to the bug reporter, which seems to have done quite a bit of research, this started between 3.8-rc6 and 3.8-rc7 as well as stable kernels and the bug also lists a few commits which could be the cause, none under sound/usb though. -- David Henningsson, Canonical Ltd. https://launchpad.net/~diwic

5 11

[alsa-devel] [PATCH] ARM: allmodconfig regressions in linux-next
by Arnd Bergmann 24 Apr '13

24 Apr '13

Hi everyone, These are a couple of simple patches to fix bugs that break allyesconfig and that are only present in linux-next at the moment. Please apply to the appropriate trees or provide feedback! Arnd Bergmann (5): mfd: ab8500: remove broken ab8500_debug_register_interrupt logic usb: phy: phy core cannot yet be a module ASoC: don't call of_dma_request_slave_channel directly hwrng: bcm2835: fix MODULE_LICENSE tag clocksource: kona: adapt to CLOCKSOURCE_OF_DECLARE change drivers/char/hw_random/bcm2835-rng.c | 2 +- drivers/clocksource/bcm_kona_timer.c | 15 ++++----------- drivers/mfd/ab8500-debugfs.c | 10 ---------- drivers/usb/phy/Kconfig | 2 +- sound/soc/soc-generic-dmaengine-pcm.c | 9 +++++---- 5 files changed, 11 insertions(+), 27 deletions(-) Cc: Christian Daudt <csd(a)broadcom.com> Cc: Dom Cobley <popcornmix(a)gmail.com> Cc: Felipe Balbi <balbi(a)ti.com> Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Cc: Herbert Xu <herbert(a)gondor.apana.org.au> Cc: John Stultz <john.stultz(a)linaro.org> Cc: Jonas ABERG <jonas.aberg(a)stericsson.com> Cc: Lars-Peter Clausen <lars(a)metafoo.de> Cc: Lee Jones <lee.jones(a)linaro.org> Cc: Linus Walleij <linus.walleij(a)stericsson.com> Cc: Lubomir Rintel <lkundrak(a)v3.sk> Cc: Mark Brown <broonie(a)opensource.wolfsonmicro.com> Cc: Matt Mackall <mpm(a)selenic.com> Cc: Mattias WALLIN <mattias.wallin(a)stericsson.com> Cc: Per FORLIN <per.forlin(a)stericsson.com> Cc: Samuel Ortiz <sameo(a)linux.intel.com> Cc: Shawn Guo <shawn.guo(a)linaro.org> Cc: Stephen Warren <swarren(a)wwwdotorg.org> Cc: alsa-devel(a)alsa-project.org Cc: linux-rpi-kernel(a)lists.infradead.org Cc: linux-usb(a)vger.kernel.org Cc: srinidhi kasagar <srinidhi.kasagar(a)stericsson.com> -- 1.8.1.2

3 4

[alsa-devel] [PATCH] fixed mixer range reading during probing when compiled with CONFIG_PM defined
by Daniel Schürmann 24 Apr '13

24 Apr '13

During probing, snd_usb_autoresume() failes with -ENODEV. This brakes get_ctl_value() in mixer.c when rading the range values. The new code does not try to call snd_usb_autoresume() in this case. The following snd_usb_suspend() fails silently during probing anyway. The patch also makes the error messages more significant. The original error messages where identified as missleading during debug. Signed-off-by: Daniel Schürmann <daschuer(a)mixxx.org> --- sound/usb/mixer.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index ca4739c..c2daa58 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -289,9 +289,11 @@ static int get_ctl_value_v1(struct usb_mixer_elem_info *cval, int request, int v int timeout = 10; int idx = 0, err; - err = snd_usb_autoresume(cval->mixer->chip); - if (err < 0) - return -EIO; + if (!chip->probing) { + err = snd_usb_autoresume(cval->mixer->chip); + if (err < 0) + return -EIO; + } down_read(&chip->shutdown_rwsem); while (timeout-- > 0) { if (chip->shutdown) @@ -333,9 +335,14 @@ static int get_ctl_value_v2(struct usb_mixer_elem_info *cval, int request, int v memset(buf, 0, sizeof(buf)); - ret = snd_usb_autoresume(chip) ? -EIO : 0; - if (ret) - goto error; + if (!chip->probing) { + ret = snd_usb_autoresume(chip); + if (ret) { + snd_printk(KERN_ERR "snd_usb_autoresume() failed with %d\n", ret); + ret = -EIO; + goto error; + } + } down_read(&chip->shutdown_rwsem); if (chip->shutdown) @@ -351,8 +358,8 @@ static int get_ctl_value_v2(struct usb_mixer_elem_info *cval, int request, int v if (ret < 0) { error: - snd_printk(KERN_ERR "cannot get ctl value: req = %#x, wValue = %#x, wIndex = %#x, type = %d\n", - request, validx, idx, cval->val_type); + snd_printk(KERN_ERR "cannot get ctl value: req = %#x, wValue = %#x, wIndex = %#x, type = %d, ret = %d\n", + bRequest, validx, idx, cval->val_type, ret); return ret; } -- 1.7.9.5

2 3

Re: [alsa-devel] [PATCH] drm/i915: Add private api for power well usage
by Wang, Xingchao 24 Apr '13

24 Apr '13

Hi Guys, Sorry I should Add Takashi and alsa maillist in loop. I tested this patch against Daniel's "drm-intel-next-queued" Branch, on Haswell Mobile C3 stepping machines. Test steps: 1. only connect one monitor through HDMI cable 2. echo 1 > /sys/module/i915/parameters/disable_power_well ==> I think this could be set as 1 by default if applied my patch. 3. plug out HDMI cable 4. cat /proc/asound/card0/codec#0 At step 3, i915 will try to disable power well but rejected as display audio is using power well. Without the patch, display audio would crash at step 4. I did not list suspend/resume test here, as during suspend sequence, i915 will _ENABLE_ power well, that's a BUG? For me above test case is the only one to reproduce the issue, if you have more ideas and need more test, please let me know. I'm afraid there's some risk because the dependency between alsa driver and drm driver. For example, if i915 module was not loaded, display audio Will call request_power_well() and meet symbol error. Even if i915 module loaded after snd-hda-intel module, there's such risk too. Any comment on this? Another risk is the pointer "power_well_device", it should be set NULL when i915 module unloaded, I added the caller but have no idea where to call it, if anyone has suggestion, that would be fine. thanks --xingchao > -----Original Message----- > From: Wang Xingchao [mailto:xingchao.wang@linux.intel.com] > Sent: Thursday, April 24, 2014 10:20 PM > To: daniel.vetter(a)ffwll.ch; Zanoni, Paulo R > Cc: ville.syrjala(a)linux.intel.com; Lin, Mengdong; Girdwood, Liam R; Li, Jocelyn; > intel-gfx(a)lists.freedesktop.org; Wang, Xingchao; Wang Xingchao > Subject: [PATCH] drm/i915: Add private api for power well usage > > Display audio depends on power well in graphic side, it should request power > well before use it and release power well after use. > I915 will not shutdown power well if it detects audio is using. > This patch protects display audio crash for Intel Haswell mobile > C3 stepping board. > > Signed-off-by: Wang Xingchao <xingchao.wang(a)linux.intel.com> > --- > drivers/gpu/drm/i915/intel_pm.c | 73 > +++++++++++++++++++++++++++++++++++---- > include/drm/audio_drm.h | 39 +++++++++++++++++++++ > sound/pci/hda/hda_intel.c | 8 +++++ > 3 files changed, 113 insertions(+), 7 deletions(-) create mode 100644 > include/drm/audio_drm.h > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index 2557926..9983f56 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -4298,18 +4298,12 @@ bool intel_using_power_well(struct drm_device > *dev) > return true; > } > > -void intel_set_power_well(struct drm_device *dev, bool enable) > +void set_power_well(struct drm_device *dev, bool enable) > { > struct drm_i915_private *dev_priv = dev->dev_private; > bool is_enabled, enable_requested; > uint32_t tmp; > > - if (!HAS_POWER_WELL(dev)) > - return; > - > - if (!i915_disable_power_well && !enable) > - return; > - > tmp = I915_READ(HSW_PWR_WELL_DRIVER); > is_enabled = tmp & HSW_PWR_WELL_STATE; > enable_requested = tmp & HSW_PWR_WELL_ENABLE; @@ -4332,6 > +4326,71 @@ void intel_set_power_well(struct drm_device *dev, bool enable) > } > } > > +/* Global drm_device for display audio drvier usage */ static struct > +drm_device *power_well_device; static bool audio_power_well_using, > +i915_power_well_using; > +/* Lock protecting power well setting */ > +DEFINE_SPINLOCK(powerwell_lock); > + > +void request_power_well(void) > +{ > + DRM_DEBUG_KMS("Display audio requesting power well\n"); > + spin_lock_irq(&powerwell_lock); > + if (!power_well_device) > + goto out; > + if (i915_power_well_using == false) > + set_power_well(power_well_device, true); > + audio_power_well_using = true; > +out: > + spin_unlock_irq(&powerwell_lock); > + return; > +} > +EXPORT_SYMBOL_GPL(request_power_well); > + > +void release_power_well(void) > +{ > + DRM_DEBUG_KMS("Display audio releasing power well\n"); > + spin_lock_irq(&powerwell_lock); > + if (!power_well_device) > + goto out; > + if (i915_power_well_using == false) > + set_power_well(power_well_device, false); > + audio_power_well_using = false; > +out: > + spin_unlock_irq(&powerwell_lock); > + return; > +} > +EXPORT_SYMBOL_GPL(release_power_well); > + > +/* TODO: Call this when i915 module unload */ void > +remove_power_well(void) { > + spin_lock_irq(&powerwell_lock); > + audio_power_well_using = false; > + i915_power_well_using = false; > + power_well_device = NULL; > + spin_unlock_irq(&powerwell_lock); > +} > + > +void intel_set_power_well(struct drm_device *dev, bool enable) { > + if (!HAS_POWER_WELL(dev)) > + return; > + > + spin_lock_irq(&powerwell_lock); > + power_well_device = dev; > + i915_power_well_using = enable; > + if (!enable && audio_power_well_using) > + goto out; > + > + if (!i915_disable_power_well && !enable) > + goto out; > + set_power_well(dev, enable); > +out: > + spin_unlock_irq(&powerwell_lock); > + return; > +} > + > /* > * Starting with Haswell, we have a "Power Down Well" that can be turned off > * when not needed anymore. We have 4 registers that can request the > power well diff --git a/include/drm/audio_drm.h b/include/drm/audio_drm.h > new file mode 100644 index 0000000..4412b36 > --- /dev/null > +++ b/include/drm/audio_drm.h > @@ -0,0 +1,39 @@ > +/************************************************************** > ******** > +**** > + * > + * Copyright 2013 Intel Inc. > + * All Rights Reserved. > + * > + * Permission is hereby granted, free of charge, to any person > +obtaining a > + * copy of this software and associated documentation files (the > + * "Software"), to deal in the Software without restriction, including > + * without limitation the rights to use, copy, modify, merge, publish, > + * distribute, sub license, and/or sell copies of the Software, and to > + * permit persons to whom the Software is furnished to do so, subject > +to > + * the following conditions: > + * > + * The above copyright notice and this permission notice (including the > + * next paragraph) shall be included in all copies or substantial > +portions > + * of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, > +EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF > +MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO > EVENT > +SHALL > + * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE > FOR > +ANY CLAIM, > + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, > TORT > +OR > + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE > SOFTWARE > +OR THE > + * USE OR OTHER DEALINGS IN THE SOFTWARE. > + * > + * > + > +*************************************************************** > ******** > +***/ > +/* > + * Authors: > + * Wang Xingchao <xingchao.wang(a)intel.com> */ > + > +#ifndef _AUDIO_DRM_H_ > +#define _AUDIO_DRM_H_ > + > +extern void request_power_well(void); > +extern void release_power_well(void); > + > +#endif /* _AUDIO_DRM_H_ */ > diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index > 418bfc0..59a85de 100644 > --- a/sound/pci/hda/hda_intel.c > +++ b/sound/pci/hda/hda_intel.c > @@ -50,6 +50,7 @@ > #include <linux/clocksource.h> > #include <linux/time.h> > #include <linux/completion.h> > +#include <drm/audio_drm.h> > > #ifdef CONFIG_X86 > /* for snoop control */ > @@ -2869,6 +2870,7 @@ static int azx_suspend(struct device *dev) > pci_disable_device(pci); > pci_save_state(pci); > pci_set_power_state(pci, PCI_D3hot); > + release_power_well(); > return 0; > } > > @@ -2881,6 +2883,7 @@ static int azx_resume(struct device *dev) > if (chip->disabled) > return 0; > > + request_power_well(); > pci_set_power_state(pci, PCI_D0); > pci_restore_state(pci); > if (pci_enable_device(pci) < 0) { > @@ -2913,6 +2916,7 @@ static int azx_runtime_suspend(struct device *dev) > > azx_stop_chip(chip); > azx_clear_irq_pending(chip); > + release_power_well(); > return 0; > } > > @@ -2921,6 +2925,7 @@ static int azx_runtime_resume(struct device *dev) > struct snd_card *card = dev_get_drvdata(dev); > struct azx *chip = card->private_data; > > + request_power_well(); > azx_init_pci(chip); > azx_init_chip(chip, 1); > return 0; > @@ -3671,6 +3676,8 @@ static int azx_probe(struct pci_dev *pci, > return -ENOENT; > } > > + request_power_well(); > + > err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); > if (err < 0) { > snd_printk(KERN_ERR "hda-intel: Error creating card!\n"); @@ > -3806,6 +3813,7 @@ static void azx_remove(struct pci_dev *pci) > if (card) > snd_card_free(card); > pci_set_drvdata(pci, NULL); > + release_power_well(); > } > > /* PCI IDs */ > -- > 1.7.9.5

1 0

[alsa-devel] [PATCH 0/3] Yamaha THR10 and related USB quirks
by Trulan Martin 24 Apr '13

24 Apr '13

The following patches add USB quirks for several Yamaha amps. Please CC me as I am not subscribed to the mailing list.

2 4

[alsa-devel] Per-host .asoundrc on shared $HOME
by Mark Hills 23 Apr '13

23 Apr '13

There is a very old thread [1] on alsa-user on this topic which seems to go through some yucky solutions. I have the same use case, and post some findings here. Since pre-2003 alsa-lib calls wordexp(3) on the filenames. I am using the patch below in /usr/share/alsa/alsa.conf It follows a precedent set by other files such as .Xdefaults-hostname. I'd submit a patch, except there seems to be no guarantee that HOSTNAME is in the environment (on Slackware it is explicitly set in /etc/profile.) Without it I can only see a bash local variable. >From the old thread I imagine this function (or at least this mail) would be useful to others. Would it be better to patch the C code to provide a token (eg. '\h') that is substituted by the hostname? Or is it enough to assume that HOSTNAME would be set? I didn't consider short vs. long hostnames, I suppose $HOSTNAME gives the user/admin some control over this. This: ~/.asoundrc-$(hostname -s) may work, but I don't see that forking a process is an option. [1] http://thread.gmane.org/gmane.linux.alsa.user/27532/focus=27542 -- Mark --- alsa.conf.orig 2013-04-23 21:22:45.105454493 +0100 +++ alsa.conf 2013-04-23 21:16:41.707053308 +0100 @@ -17,6 +17,7 @@ } "/etc/asound.conf" "~/.asoundrc" + "~/.asoundrc-$HOSTNAME" ] errors false }

1 0

[alsa-devel] [PATCH 00/21] ARM build fixes for 3.10
by Arnd Bergmann 23 Apr '13

23 Apr '13

Hi everyone, This is a set of bug fixes for build errors and warnings I am seeing in the various defconfigs and/or allmodconfig builds on linux-next. The majority of these showed up because we now include a lot more platforms in allmodconfig than we used to. Please apply to appropriate maintainer trees or provide feedback, I can take care of the rest sending those through arm-soc that I get no feedback on. Arnd Arnd Bergmann (21): Turn off -Wmaybe-uninitialized when building with -Os ARM: compressed/head.S: work around new binutils warning ARM: use optimized do_div only for EABI ARM: kvm: define KVM_ARM_MAX_VCPUS unconditionally ARM: OMAP2+: add dependencies on ARCH_MULTI_V6/V7 ARM: tegra: call cpu_do_idle from C code ARM: tegra: unify tegra_idle_device definitions ASoC: ux500: forward declare msp_i2s_platform_data spi/sirf: fix MODULE_DEVICE_TABLE ssb: fix alignment of struct bcma_device_id drm/tilcdc: use only a single module device table mmc: sdhci-tegra: fix MODULE_DEVICE_TABLE misc: mark spear13xx-pcie-gadget as broken staging: nvec: allow modular build staging: comedi/dawboard2000: use mdelay for large delays staging/zsmalloc: don't use pgtable-mapping from modules tty/serial/sirf: fix MODULE_DEVICE_TABLE usb: phy: tegra: don't call into tegra-ehci directly usb: phy: don't mark usb_bind_phy as __init MFD: ab8500: export ab8500_gpadc_sw_hw_convert properly mtd: omap2: allow bulding as a module Makefile | 2 +- arch/arm/boot/compressed/Makefile | 2 +- arch/arm/boot/compressed/head.S | 12 ++++++++++++ arch/arm/include/asm/div64.h | 2 +- arch/arm/kvm/Kconfig | 6 +++--- arch/arm/mach-omap2/Kconfig | 5 +++++ arch/arm/mach-tegra/cpuidle-tegra114.c | 5 ++--- arch/arm/mach-tegra/cpuidle-tegra20.c | 4 +--- arch/arm/mach-tegra/cpuidle-tegra30.c | 4 +--- arch/arm/mach-tegra/cpuidle.c | 2 ++ arch/arm/mach-tegra/cpuidle.h | 4 ++++ arch/arm/mach-tegra/pm.c | 5 +++++ arch/arm/mach-tegra/sleep-tegra20.S | 2 +- drivers/gpu/drm/tilcdc/tilcdc_panel.c | 1 - drivers/gpu/drm/tilcdc/tilcdc_slave.c | 1 - drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 1 - drivers/mfd/ab8500-gpadc.c | 2 +- drivers/misc/Kconfig | 2 +- drivers/mmc/host/sdhci-tegra.c | 2 +- drivers/mtd/nand/Kconfig | 2 +- drivers/spi/spi-sirf.c | 2 +- drivers/staging/comedi/drivers/daqboard2000.c | 14 +++++++------- drivers/staging/nvec/Kconfig | 10 +++++----- drivers/staging/zsmalloc/zsmalloc-main.c | 2 +- drivers/tty/serial/sirfsoc_uart.c | 2 +- drivers/usb/host/ehci-tegra.c | 10 +++++----- drivers/usb/otg/otg.c | 2 +- drivers/usb/phy/tegra_usb_phy.c | 13 +++++++++---- include/linux/mod_devicetable.h | 5 +++-- include/linux/usb/tegra_usb_phy.h | 10 +++++----- sound/soc/ux500/ux500_msp_i2s.h | 1 + 31 files changed, 82 insertions(+), 55 deletions(-) -- 1.8.1.2 Cc: Alan Stern <stern(a)rowland.harvard.edu> Cc: Artem Bityutskiy <artem.bityutskiy(a)linux.intel.com> Cc: Chris Ball <cjb(a)laptop.org> Cc: Dave Airlie <airlied(a)linux.ie> Cc: David Woodhouse <dwmw2(a)infradead.org> Cc: Felipe Balbi <balbi(a)ti.com> Cc: Grant Likely <grant.likely(a)secretlab.ca> Cc: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Cc: Mark Brown <broonie(a)kernel.org> Cc: Russell King <linux(a)arm.linux.org.uk> Cc: Samuel Ortiz <sameo(a)linux.intel.com> Cc: Stephen Warren <swarren(a)nvidia.com> Cc: Tony Lindgren <tony(a)atomide.com> Cc: Viresh Kumar <viresh.kumar(a)st.com> Cc: alsa-devel(a)alsa-project.org Cc: dri-devel(a)lists.freedesktop.org Cc: linux-mtd(a)lists.infradead.org Cc: linux-usb(a)vger.kernel.org Cc: spi-devel-general(a)lists.sourceforge.net

2 2

Re: [alsa-devel] BUG: USB audio discontinuities with 'UHCI: implement new semantics for URB_ISO_ASAP'
by Alan Stern 23 Apr '13

23 Apr '13

On Wed, 17 Apr 2013, Joe Rayhawk wrote: > Small buffer/period sizes on usb audio playback though UHCI works fine on v3.7 but causes audio discontinuities/delays on v3.8 and v3.9-rc7. > > I've bisected the behavior down to > > c44b225077bb1fb25ed5cd5c4f226897b91bedd4 > 'UHCI: implement new semantics for URB_ISO_ASAP' > > Tested on two UHCI hosts and three usb-audio devices, all from different vendors. Can you provide a usbmon trace showing the problems? And maybe also a similar trace made under a 3.7 kernel, where the problem doesn't occur? Alan Stern -- To unsubscribe from this list: send the line "unsubscribe alsa-devel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

3 10

[alsa-devel] [PATCH 2/2] ALSA: ASoc: davinci-mcasp: Add Support BCLK-to-LRCLK ratio for TDM modes
by Michal Bachraty 23 Apr '13

23 Apr '13

For TDM mode, BCLK-to-LCLK ratio is computed as (tdm_slots) x (word_length). I2S mode is only subset of TDM mode with specific tdm_slots = 2 channels. Also bclk_lrclk_ratio can be greater than 255, therefore u16 need to be used. Signed-off-by: Michal Bachraty <michal.bachraty(a)streamunlimited.com> --- sound/soc/davinci/davinci-mcasp.c | 7 ++++--- sound/soc/davinci/davinci-mcasp.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 63633e9..d54e0d9 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -636,11 +636,12 @@ static int davinci_config_channel_size(struct davinci_audio_dev *dev, * callback, take it into account here. That allows us to for example * send 32 bits per channel to the codec, while only 16 of them carry * audio payload. - * The clock ratio is given for a full period of data (both left and - * right channels), so it has to be divided by 2. + * The clock ratio is given for a full period of data (for I2S format + * both left and right channels), so it has to be divided by number of + * tdm-slots (for I2S - divided by 2). */ if (dev->bclk_lrclk_ratio) - word_length = dev->bclk_lrclk_ratio / 2; + word_length = dev->bclk_lrclk_ratio / dev->tdm_slots; /* mapping of the XSSZ bit-field as described in the datasheet */ fmt = (word_length >> 1) - 1; diff --git a/sound/soc/davinci/davinci-mcasp.h b/sound/soc/davinci/davinci-mcasp.h index 0edd3b5..a9ac0c1 100644 --- a/sound/soc/davinci/davinci-mcasp.h +++ b/sound/soc/davinci/davinci-mcasp.h @@ -38,7 +38,7 @@ struct davinci_audio_dev { u8 num_serializer; u8 *serial_dir; u8 version; - u8 bclk_lrclk_ratio; + u16 bclk_lrclk_ratio; /* McASP FIFO related */ u8 txnumevt; -- 1.7.9.5

3 2

[alsa-devel] [PATCH 1/2] ALSA: ASoC davinci-pcm, davinci-mcasp Clean up active_serializers
by Michal Bachraty 23 Apr '13

23 Apr '13

As pointed of by Vaibhav, commit message: "ASoC: davinci-mcasp: Add support for multichannel playback" number of active serializers can be hidden into fifo_level variable, which is set in davimci-mcasp. Signed-off-by: Michal Bachraty <michal.bachraty(a)streamunlimited.com> --- sound/soc/davinci/davinci-mcasp.c | 8 +++++--- sound/soc/davinci/davinci-pcm.c | 11 +++++------ sound/soc/davinci/davinci-pcm.h | 1 - 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 8a9c0ee..63633e9 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c @@ -834,17 +834,20 @@ static int davinci_mcasp_hw_params(struct snd_pcm_substream *substream, int word_length; u8 fifo_level; u8 slots = dev->tdm_slots; + u8 active_serializers; int channels; struct snd_interval *pcm_channels = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS); channels = pcm_channels->min; + active_serializers = (channels + slots - 1) / slots; + if (davinci_hw_common_param(dev, substream->stream, channels) == -EINVAL) return -EINVAL; if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) - fifo_level = dev->txnumevt; + fifo_level = dev->txnumevt * active_serializers; else - fifo_level = dev->rxnumevt; + fifo_level = dev->rxnumevt * active_serializers; if (dev->op_mode == DAVINCI_MCASP_DIT_MODE) davinci_hw_dit_param(dev); @@ -889,7 +892,6 @@ static int davinci_mcasp_hw_params(struct snd_pcm_substream *substream, dma_params->acnt = dma_params->data_type; dma_params->fifo_level = fifo_level; - dma_params->active_serializers = (channels + slots - 1) / slots; davinci_config_channel_size(dev, word_length); return 0; diff --git a/sound/soc/davinci/davinci-pcm.c b/sound/soc/davinci/davinci-pcm.c index 0161579..8460edc 100644 --- a/sound/soc/davinci/davinci-pcm.c +++ b/sound/soc/davinci/davinci-pcm.c @@ -182,7 +182,6 @@ static void davinci_pcm_enqueue_dma(struct snd_pcm_substream *substream) unsigned short acnt; unsigned int count; unsigned int fifo_level; - unsigned char serializers = prtd->params->active_serializers; period_size = snd_pcm_lib_period_bytes(substream); dma_offset = prtd->period * period_size; @@ -196,14 +195,14 @@ static void davinci_pcm_enqueue_dma(struct snd_pcm_substream *substream) data_type = prtd->params->data_type; count = period_size / data_type; if (fifo_level) - count /= fifo_level * serializers; + count /= fifo_level; if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { src = dma_pos; dst = prtd->params->dma_addr; src_bidx = data_type; dst_bidx = 4; - src_cidx = data_type * fifo_level * serializers; + src_cidx = data_type * fifo_level; dst_cidx = 0; } else { src = prtd->params->dma_addr; @@ -211,7 +210,7 @@ static void davinci_pcm_enqueue_dma(struct snd_pcm_substream *substream) src_bidx = 0; dst_bidx = data_type; src_cidx = 0; - dst_cidx = data_type * fifo_level * serializers; + dst_cidx = data_type * fifo_level; } acnt = prtd->params->acnt; @@ -226,8 +225,8 @@ static void davinci_pcm_enqueue_dma(struct snd_pcm_substream *substream) ASYNC); else edma_set_transfer_params(prtd->asp_link[0], acnt, - fifo_level * serializers, - count, fifo_level * serializers, + fifo_level, + count, fifo_level, ABSYNC); } diff --git a/sound/soc/davinci/davinci-pcm.h b/sound/soc/davinci/davinci-pcm.h index 0d84d32..fbb710c 100644 --- a/sound/soc/davinci/davinci-pcm.h +++ b/sound/soc/davinci/davinci-pcm.h @@ -27,7 +27,6 @@ struct davinci_pcm_dma_params { unsigned char data_type; /* xfer data type */ unsigned char convert_mono_stereo; unsigned int fifo_level; - unsigned char active_serializers; /* num. of active audio serializers */ }; int davinci_soc_platform_register(struct device *dev); -- 1.7.9.5

3 2

[alsa-devel] [PATCH 1/2] ALSA: ASoc: spdif_transciever: Add DT support
by Michal Bachraty 23 Apr '13

23 Apr '13

Add devicetree support for this dummy audio soc driver. Signed-off-by: Michal Bachraty <michal.bachraty(a)streamunlimited.com> --- sound/soc/codecs/spdif_transciever.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sound/soc/codecs/spdif_transciever.c b/sound/soc/codecs/spdif_transciever.c index 112a49d..4c8c295 100644 --- a/sound/soc/codecs/spdif_transciever.c +++ b/sound/soc/codecs/spdif_transciever.c @@ -20,6 +20,7 @@ #include <sound/soc.h> #include <sound/pcm.h> #include <sound/initval.h> +#include <linux/of.h> #define DRV_NAME "spdif-dit" @@ -52,12 +53,21 @@ static int spdif_dit_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_OF +static const struct of_device_id spdif_dit_dt_ids[] = { + { .compatible = DRV_NAME, }, + { } +}; +MODULE_DEVICE_TABLE(of, spdif_dits_dt_ids); +#endif + static struct platform_driver spdif_dit_driver = { .probe = spdif_dit_probe, .remove = spdif_dit_remove, .driver = { .name = DRV_NAME, .owner = THIS_MODULE, + .of_match_table = of_match_ptr(spdif_dit_dt_ids), }, }; -- 1.7.9.5

3 2

[alsa-devel] [PATCH] ASoC: generic-dmaengine-pcm: call dma_request_slave_channel()
by Shawn Guo 23 Apr '13

23 Apr '13

dma_request_slave_channel() is a more appropriate API for dmaengine clients that adopt generic DMA bindings to call. Let's use it instead of of_dma_request_slave_channel() to save <linux/of_dma.h> include. Signed-off-by: Shawn Guo <shawn.guo(a)linaro.org> --- sound/soc/soc-generic-dmaengine-pcm.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c index 98e1310..e29ec3c 100644 --- a/sound/soc/soc-generic-dmaengine-pcm.c +++ b/sound/soc/soc-generic-dmaengine-pcm.c @@ -21,7 +21,6 @@ #include <sound/soc.h> #include <linux/dma-mapping.h> #include <linux/of.h> -#include <linux/of_dma.h> #include <sound/dmaengine_pcm.h> @@ -219,19 +218,19 @@ static const char * const dmaengine_pcm_dma_channel_names[] = { }; static void dmaengine_pcm_request_chan_of(struct dmaengine_pcm *pcm, - struct device_node *of_node) + struct device *dev) { unsigned int i; - if ((pcm->flags & SND_DMAENGINE_PCM_FLAG_NO_DT) || !of_node) + if ((pcm->flags & SND_DMAENGINE_PCM_FLAG_NO_DT) || !dev->of_node) return; if (pcm->flags & SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX) { - pcm->chan[0] = of_dma_request_slave_channel(of_node, "rx-tx"); + pcm->chan[0] = dma_request_slave_channel(dev, "rx-tx"); pcm->chan[1] = pcm->chan[0]; } else { for (i = SNDRV_PCM_STREAM_PLAYBACK; i <= SNDRV_PCM_STREAM_CAPTURE; i++) { - pcm->chan[i] = of_dma_request_slave_channel(of_node, + pcm->chan[i] = dma_request_slave_channel(dev, dmaengine_pcm_dma_channel_names[i]); } } @@ -255,7 +254,7 @@ int snd_dmaengine_pcm_register(struct device *dev, pcm->config = config; pcm->flags = flags; - dmaengine_pcm_request_chan_of(pcm, dev->of_node); + dmaengine_pcm_request_chan_of(pcm, dev); if (flags & SND_DMAENGINE_PCM_FLAG_NO_RESIDUE) return snd_soc_add_platform(dev, &pcm->platform, -- 1.7.9.5

3 2

[alsa-devel] [PATCH] ASoC: generic-dmaengine-pcm: use a more common dma name
by Shawn Guo 23 Apr '13

23 Apr '13

The examples in Documentation/devicetree/bindings/dma/dma.txt recommends the name for dma channel doing both RX and TX to be "rx-tx". This becomes a common pattern that has been adopted by platforms that converts to generic DMA bindings. Let's follow this common pattern in generic-dmaengine-pcm. Signed-off-by: Shawn Guo <shawn.guo(a)linaro.org> --- sound/soc/soc-generic-dmaengine-pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c index 5fd5ed4..98e1310 100644 --- a/sound/soc/soc-generic-dmaengine-pcm.c +++ b/sound/soc/soc-generic-dmaengine-pcm.c @@ -227,7 +227,7 @@ static void dmaengine_pcm_request_chan_of(struct dmaengine_pcm *pcm, return; if (pcm->flags & SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX) { - pcm->chan[0] = of_dma_request_slave_channel(of_node, "tx_rx"); + pcm->chan[0] = of_dma_request_slave_channel(of_node, "rx-tx"); pcm->chan[1] = pcm->chan[0]; } else { for (i = SNDRV_PCM_STREAM_PLAYBACK; i <= SNDRV_PCM_STREAM_CAPTURE; i++) { -- 1.7.9.5

3 2

[alsa-devel] [PATCH, for-next] ALSA: usb-audio: use FMTBITs in parse_audio_format_i
by Eldad Zack 23 Apr '13

23 Apr '13

Replace the usage of SNDRV_PCM_FORMAT_* macros with the equivalent SNDRV_PCM_FMTBIT_* macros, and the result be can assigned directly to the formats field. Modify the variable name to reflect the change. The following sparse messages are silenced: sound/usb/format.c:377:44: warning: incorrect type in assignment (different base types) sound/usb/format.c:377:44: expected int [signed] pcm_format sound/usb/format.c:377:44: got restricted snd_pcm_format_t [usertype] <noident> sound/usb/format.c:379:44: warning: incorrect type in assignment (different base types) sound/usb/format.c:379:44: expected int [signed] pcm_format sound/usb/format.c:379:44: got restricted snd_pcm_format_t [usertype] <noident> sound/usb/format.c:382:36: warning: incorrect type in assignment (different base types) sound/usb/format.c:382:36: expected int [signed] pcm_format sound/usb/format.c:382:36: got restricted snd_pcm_format_t [usertype] <noident> Signed-off-by: Eldad Zack <eldad(a)fogrefinery.com> --- sound/usb/format.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/usb/format.c b/sound/usb/format.c index 020ede0..e025e28 100644 --- a/sound/usb/format.c +++ b/sound/usb/format.c @@ -365,7 +365,7 @@ static int parse_audio_format_i(struct snd_usb_audio *chip, { struct usb_interface_descriptor *altsd = get_iface_desc(iface); int protocol = altsd->bInterfaceProtocol; - int pcm_format, ret; + int pcm_formats, ret; if (fmt->bFormatType == UAC_FORMAT_TYPE_III) { /* FIXME: the format type is really IECxxx @@ -377,14 +377,14 @@ static int parse_audio_format_i(struct snd_usb_audio *chip, case USB_ID(0x0763, 0x2003): /* M-Audio Audiophile USB */ if (chip->setup == 0x00 && fp->altsetting == 6) - pcm_format = SNDRV_PCM_FORMAT_S16_BE; + pcm_formats = SNDRV_PCM_FMTBIT_S16_BE; else - pcm_format = SNDRV_PCM_FORMAT_S16_LE; + pcm_formats = SNDRV_PCM_FMTBIT_S16_LE; break; default: - pcm_format = SNDRV_PCM_FORMAT_S16_LE; + pcm_formats = SNDRV_PCM_FMTBIT_S16_LE; } - fp->formats = 1uLL << pcm_format; + fp->formats = pcm_formats; } else { fp->formats = parse_audio_format_i_type(chip, fp, format, fmt, protocol); -- 1.8.1.5

2 7

[alsa-devel] [RFC] ASoC: Current state of Dynamic PCM API
by Sebastian Hesselbarth 22 Apr '13

22 Apr '13

Hi, I am rewriting Marvell Kirkwood ASoC driver to also support Dove and reflect the audio controller's capabilities. The audio controller can have one DMA stream for playback and capture respectively. While capture source can be either I2S or SPDIF, playback can be on both interfaces simultaneously. The setup I have in mind for a generic Kirkwood/Dove soundcard is: (DMA)-->(CPU_DAI)--+<-->(I2S Codec) | +--->(SPDIF TX Codec) | +<---(SPDIF RX Codec) I sent a mail on how to handle multiple codecs on a single cpu_dai earlier, and Mark pointed me to Dynamic PCM API. Unfortunately, current mainline ASoC has no driver using DPCM as an example and integration of DPCM patches look kind-of incomplete to me. Can any of you point me to patches, repositories, or documentation about DPCM where I can start with? Regards, Sebastian

2 1

Re: [alsa-devel] [PATCH] ASoC: add RT5640 CODEC driver
by Bard 22 Apr '13

22 Apr '13

Dear Mark, Please see my reply below. Thanks. -----Original Message----- From: Mark Brown [mailto:broonie@opensource.wolfsonmicro.com] Sent: Tuesday, April 16, 2013 10:38 PM To: Bard Cc: Flove; Oder Chiou; swarren(a)nvidia.com; bard Subject: Re: [PATCH] ASoC: add RT5640 CODEC driver On Tue, Apr 16, 2013 at 10:10:37PM +0800, bardliao(a)realtek.com wrote: Please remember to post things to the list... just a quick scan through here: > +static int rt5640_reg_init(struct snd_soc_codec *codec) { > + int i; > + for (i = 0; i < RT5640_INIT_REG_LEN; i++) > + snd_soc_write(codec, init_list[i].reg, init_list[i].val); > + return 0; > +} This should be converted over to regmap. There's support for paging in the core, look at regmap_range. Bard: I will use regmap_register_patch to do that. > +/* IN1/IN2 Input Type */ > +static const char * const rt5640_input_mode[] = { > + "Single ended", "Differential"}; > + > +static const SOC_ENUM_SINGLE_DECL( > + rt5640_in1_mode_enum, RT5640_IN1_IN2, > + RT5640_IN_SFT1, rt5640_input_mode); > + > +static const SOC_ENUM_SINGLE_DECL( > + rt5640_in2_mode_enum, RT5640_IN3_IN4, > + RT5640_IN_SFT2, rt5640_input_mode); Platform data... Bard: Can I export a function that machine can configure it by this function? > +static int rt5640_vol_rescale_put(struct snd_kcontrol *kcontrol, > + struct snd_ctl_elem_value *ucontrol) { > + struct soc_mixer_control *mc = > + (struct soc_mixer_control *)kcontrol->private_value; > + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); > + unsigned int val, val2; > + > + val = VOL_RESCALE_MAX_VOL - ucontrol->value.integer.value[0]; > + val2 = VOL_RESCALE_MAX_VOL - ucontrol->value.integer.value[1]; > + return snd_soc_update_bits_locked(codec, mc->reg, RT5640_L_VOL_MASK | > + RT5640_R_VOL_MASK, val << mc->shift | val2); } This looks like a variant on the _RANGE controls? Bard: Yes, we want to limit the max value of volume. If it is not good, I will change it. > +static int hp_event(struct snd_soc_dapm_widget *w, > + struct snd_kcontrol *kcontrol, int event) { > + switch (event) { > + case SND_SOC_DAPM_POST_PMU: > + break; > + > + case SND_SOC_DAPM_PRE_PMD: > + break; > + > + default: > + return 0; > + } > + return 0; > +} Remove this, it doesn't actually do anything any more. Bard: I will remove it. ------Please consider the environment before printing this e-mail.

2 1

[alsa-devel] I connected my digital piano and it just worked :-)
by David Henningsson 22 Apr '13

22 Apr '13

On a slightly different note; I needed to connect my digital piano to my laptop the other day, but the laptop had no MIDI interface. So I tried connecting it through USB, because the piano had a USB port too. I knew it required a 3rd party driver on Windows, so I didn't expect much. It just worked. :-) From someone who knows that fixing hardware often takes a lot of effort and hard work, I just wanted to shout a "thank you" and a "keep up the good work" to all contributors! :-) -- David Henningsson, Canonical Ltd. https://launchpad.net/~diwic

1 0

[alsa-devel] [PATCH] ALSA: hda - Limit internal mic boost for a few Asus machines
by David Henningsson 22 Apr '13

22 Apr '13

These are being reported as being so noisy at high mic boost levels, so they are unusable in practice. Therefore artificially limit the boosts. BugLink: https://bugs.launchpad.net/bugs/1089795 Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 42 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 28b3f5a..6e5d383 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -3156,6 +3156,38 @@ static void alc271_hp_gate_mic_jack(struct hda_codec *codec, } } +static void alc269_fixup_limit_int_mic_boost(struct hda_codec *codec, + const struct hda_fixup *fix, + int action) +{ + struct alc_spec *spec = codec->spec; + struct auto_pin_cfg *cfg = &spec->gen.autocfg; + int i; + + /* The mic boosts on level 2 and 3 are too noisy + on the internal mic input. + Therefore limit the boost to 0 or 1. */ + + if (action != HDA_FIXUP_ACT_PROBE) + return; + + for (i = 0; i < cfg->num_inputs; i++) { + hda_nid_t nid = cfg->inputs[i].pin; + unsigned int defcfg; + if (cfg->inputs[i].type != AUTO_PIN_MIC) + continue; + defcfg = snd_hda_codec_get_pincfg(codec, nid); + if (snd_hda_get_input_pin_attr(defcfg) != INPUT_PIN_ATTR_INT) + continue; + + snd_hda_override_amp_caps(codec, nid, HDA_INPUT, + (0x00 << AC_AMPCAP_OFFSET_SHIFT) | + (0x01 << AC_AMPCAP_NUM_STEPS_SHIFT) | + (0x2f << AC_AMPCAP_STEP_SIZE_SHIFT) | + (0 << AC_AMPCAP_MUTE_SHIFT)); + } +} + enum { ALC269_FIXUP_SONY_VAIO, ALC275_FIXUP_SONY_VAIO_GPIO2, @@ -3190,6 +3222,7 @@ enum { ALC271_FIXUP_AMIC_MIC2, ALC271_FIXUP_HP_GATE_MIC_JACK, ALC269_FIXUP_ACER_AC700, + ALC269_FIXUP_LIMIT_INT_MIC_BOOST, }; static const struct hda_fixup alc269_fixups[] = { @@ -3428,6 +3461,10 @@ static const struct hda_fixup alc269_fixups[] = { .chained = true, .chain_id = ALC271_FIXUP_DMIC, }, + [ALC269_FIXUP_LIMIT_INT_MIC_BOOST] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc269_fixup_limit_int_mic_boost, + }, }; static const struct snd_pci_quirk alc269_fixup_tbl[] = { @@ -3458,11 +3495,14 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x103c, 0x1973, "HP Pavilion", ALC269_FIXUP_HP_MUTE_LED_MIC1), SND_PCI_QUIRK(0x103c, 0x1983, "HP Pavilion", ALC269_FIXUP_HP_MUTE_LED_MIC1), SND_PCI_QUIRK_VENDOR(0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED), + SND_PCI_QUIRK(0x1043, 0x106d, "Asus K53BE", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), + SND_PCI_QUIRK(0x1043, 0x115d, "Asus 1015E", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), SND_PCI_QUIRK(0x1043, 0x1427, "Asus Zenbook UX31E", ALC269VB_FIXUP_DMIC), SND_PCI_QUIRK(0x1043, 0x1517, "Asus Zenbook UX31A", ALC269VB_FIXUP_DMIC), + SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_FIXUP_STEREO_DMIC), SND_PCI_QUIRK(0x1043, 0x1a13, "Asus G73Jw", ALC269_FIXUP_ASUS_G73JW), SND_PCI_QUIRK(0x1043, 0x1b13, "Asus U41SV", ALC269_FIXUP_INV_DMIC), - SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_FIXUP_STEREO_DMIC), + SND_PCI_QUIRK(0x1043, 0x1c23, "Asus X55U", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), SND_PCI_QUIRK(0x1043, 0x831a, "ASUS P901", ALC269_FIXUP_STEREO_DMIC), SND_PCI_QUIRK(0x1043, 0x834a, "ASUS S101", ALC269_FIXUP_STEREO_DMIC), SND_PCI_QUIRK(0x1043, 0x8398, "ASUS P1005", ALC269_FIXUP_STEREO_DMIC), -- 1.7.9.5

2 1

[alsa-devel] [PATCH 0/7] Add capture support to compress API
by Richard Fitzgerald 22 Apr '13

22 Apr '13

This chain of patches does some clearing up and add capture support to the compressed API. Missing is support for capture streams that don't use the copy callback. Also I have included two patches at the end of the chain that remove the buffer pointers and just use the cumulative values however as our setup uses the copy callback these are untested past build so should be taken with caution. Thanks, Charles Thess patches apply to: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git branch "for-next" based on top of commit 126825e ALSA: snd-usb: add quirks handler for DSD streams - RichF Charles Keepax (7): ALSA: compress_core: Update calc_avail to use cumulative values ALSA: compress_core: Calculate avail correctly for capture streams ALSA: compress_core: Deconstify copy callback buffer ALSA: compress_core: Add support for capture streams ASoC: soc-compress: Deduce stream direction ALSA: compress_core: Remove unused hw_pointer ALSA: compress_core: Rework writes to use cumulative values include/sound/compress_driver.h | 4 +- sound/core/compress_offload.c | 117 +++++++++++++++++++++++++------------- sound/soc/soc-compress.c | 11 +++- 3 files changed, 87 insertions(+), 45 deletions(-) -- 1.7.2.5

6 15

[alsa-devel] [PATCH v3] ALSA: snd-usb-audio: set the timeout for usb control set messages to 5000 ms
by Daniel Schürmann 22 Apr '13

22 Apr '13

This is an other version of the patch send via git send-email. I still distinguish between set and get but as long both are 5000 ms GCC will remove it anyway. IMHO this is more easy read and there is no need to explain why we use a get timeout for set messages. Commit message: Set the timeout for USB control set messages according to the USB 2 spec, using the macros from include/linux/usb.h. The get timout becomes 5000 ms even though it is 500 ms in the spec. This patch is required to run the Hercules RMX2 which needs a timeout of 1240 ms. Signed-off-by: Daniel Schürmann <daschuer(a)mixxx.org> --- sound/usb/helper.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sound/usb/helper.c b/sound/usb/helper.c index c1db28f..6209024 100644 --- a/sound/usb/helper.c +++ b/sound/usb/helper.c @@ -86,14 +86,22 @@ int snd_usb_ctl_msg(struct usb_device *dev, unsigned int pipe, __u8 request, { int err; void *buf = NULL; + int timeout; if (size > 0) { buf = kmemdup(data, size, GFP_KERNEL); if (!buf) return -ENOMEM; } + + if (requesttype & USB_DIR_IN) + timeout = USB_CTRL_GET_TIMEOUT; + else + timeout = USB_CTRL_SET_TIMEOUT; + err = usb_control_msg(dev, pipe, request, requesttype, - value, index, buf, size, 1000); + value, index, buf, size, timeout); + if (size > 0) { memcpy(data, buf, size); kfree(buf); -- 1.7.9.5

3 2

[alsa-devel] [patch] ALSA: compress: info leak in snd_compr_get_caps()
by Dan Carpenter 22 Apr '13

22 Apr '13

If the ->get_caps() function doesn't clear the buffer then there would stack information leaked to userspace. For example, soc_compr_get_caps() can return success without clearing the buffer. Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> --- Perhaps the soc_compr_get_caps() function should return an error code if the platform->driver->compr_ops is NULL. I'm not sure about that, and it's a separate issue anyway. diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index c84abc8..8d3190a 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c @@ -375,6 +375,7 @@ snd_compr_get_caps(struct snd_compr_stream *stream, unsigned long arg) if (!stream->ops->get_caps) return -ENXIO; + memset(&caps, 0, sizeof(caps)); retval = stream->ops->get_caps(stream, &caps); if (retval) goto out;

4 4

Re: [alsa-devel] [PATCH v2] Add M2Tech hiFace USB-SPDIF driver
by Pavel Hofman 22 Apr '13

22 Apr '13

On 22.4.2013 10:31, Pietro Cipriano wrote: > Il 22/04/2013 09:40, Pavel Hofman ha scritto: >> >> >> On 20.4.2013 22:15, Daniel Mack wrote: >>> On 13.02.2013 18:11, Antonio Ospite wrote: >>>> Add driver for M2Tech hiFace USB-SPDIF interface and compatible >>>> devices. >>>> >>>> M2Tech hiFace and compatible devices offer a Hi-End S/PDIF Output >>>> Interface, see http://www.m2tech.biz/hiface.html >>> >>> Just curious: is there a new version of this patch set coming? >> >> I have read users report large latencies (unable to watch movies) of >> hiFace1 in OSX while reportedly they have not identified any major >> latency in windows. Perhaps the fixed PCM_PACKET_SIZE > The issue is related to a no controllable buffer dimension, which > depends by Audio Core thus present only on OSx. A easy workaround is of > to set up a higher output sampling frequency, for instance at 192KHz the > delay is no more perceptible, obviously the DAC must be compliant with > this setting. > > Pietro Thanks for very fast reponse. So is it possible to reduce the period size in the linux driver? Right now if I calculate correctly it is 4096 bytes / 32bits / 2 channels / 48000 Hz = 10 ms. Thanks, Pavel.

1 0

Re: [alsa-devel] [PATCH 26/28] proc: Supply a function to remove a proc entry by PDE [RFC]
by Rafael J. Wysocki 22 Apr '13

22 Apr '13

On Tuesday, April 16, 2013 07:27:34 PM David Howells wrote: > Supply a function (proc_remove()) to remove a proc entry (and any subtree > rooted there) by proc_dir_entry pointer rather than by name and (optionally) > root dir entry pointer. This allows us to eliminate all remaining pde->name > accesses outside of procfs. > > Signed-off-by: David Howells <dhowells(a)redhat.com> > cc: linux-acpi(a)vger.kernel.org > cc: openipmi-developer(a)lists.sourceforge.net > cc: devicetree-discuss(a)lists.ozlabs.org > cc: linux-pci(a)vger.kernel.org > cc: netdev(a)vger.kernel.org > cc: netfilter-devel(a)vger.kernel.org > cc: alsa-devel(a)alsa-project.org The ACPI changes look good to me. Acked-by: Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> > --- > > drivers/acpi/sbs.c | 21 ++++----------------- > drivers/char/ipmi/ipmi_msghandler.c | 2 +- > drivers/misc/sgi-gru/gruprocfs.c | 2 +- > drivers/of/base.c | 11 +---------- > drivers/pci/proc.c | 12 +++--------- > fs/proc/generic.c | 7 +++++++ > fs/proc/vmcore.c | 2 +- > include/linux/proc_fs.h | 2 ++ > kernel/irq/proc.c | 6 +----- > net/8021q/vlanproc.c | 9 ++------- > net/core/pktgen.c | 6 ++---- > net/ipv4/netfilter/ipt_CLUSTERIP.c | 4 ++-- > net/ipv6/proc.c | 3 +-- > net/netfilter/xt_hashlimit.c | 4 ++-- > sound/core/info.c | 19 +++++-------------- > 15 files changed, 35 insertions(+), 75 deletions(-) > > diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c > index a296e08..b6241ee 100644 > --- a/drivers/acpi/sbs.c > +++ b/drivers/acpi/sbs.c > @@ -521,19 +521,6 @@ acpi_sbs_add_fs(struct proc_dir_entry **dir, > return 0; > } > > -static void > -acpi_sbs_remove_fs(struct proc_dir_entry **dir, > - struct proc_dir_entry *parent_dir) > -{ > - if (*dir) { > - remove_proc_entry(ACPI_SBS_FILE_INFO, *dir); > - remove_proc_entry(ACPI_SBS_FILE_STATE, *dir); > - remove_proc_entry(ACPI_SBS_FILE_ALARM, *dir); > - remove_proc_entry((*dir)->name, parent_dir); > - *dir = NULL; > - } > -} > - > /* Smart Battery Interface */ > static struct proc_dir_entry *acpi_battery_dir = NULL; > > @@ -836,8 +823,8 @@ static void acpi_battery_remove(struct acpi_sbs *sbs, int id) > power_supply_unregister(&battery->bat); > } > #ifdef CONFIG_ACPI_PROCFS_POWER > - if (battery->proc_entry) > - acpi_sbs_remove_fs(&battery->proc_entry, acpi_battery_dir); > + proc_remove(battery->proc_entry); > + battery->proc_entry = NULL; > #endif > } > > @@ -873,8 +860,8 @@ static void acpi_charger_remove(struct acpi_sbs *sbs) > if (sbs->charger.dev) > power_supply_unregister(&sbs->charger); > #ifdef CONFIG_ACPI_PROCFS_POWER > - if (sbs->charger_entry) > - acpi_sbs_remove_fs(&sbs->charger_entry, acpi_ac_dir); > + proc_remove(sbs->charger_entry); > + sbs->charger_entry = NULL; > #endif > } > -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.

1 0

[alsa-devel] [PATCH v2] ALSA: snd-usb-audio: set the timeout for usb control set messages to 5000 ms
by Daniel Schürmann 20 Apr '13

20 Apr '13

Thank you Daniel for review. Here is an updated version of the patch against https://git.kernel.org/cgit/linux/kernel/git/tiwai/sound.git/ 581cbef46ae60073252208fc1f26dd1044f6e215 Set the timeout for USB control set messages according to the USB 2 spec §9.2.6.4 to 5000 ms. To avoid new issues, the get timeout is unchanged at 1000 ms, though it is 500 ms in the spec. This patch is required to run the Hercules RMX2 which needs a timeout > 1240 ms Signed-off-by: Daniel Schürmann <daschuer(a)mixxx.org> --- diff --git a/sound/usb/helper.c b/sound/usb/helper.c index c1db28f..c1caae4 100644 --- a/sound/usb/helper.c +++ b/sound/usb/helper.c @@ -23,6 +23,11 @@ #include "helper.h" #include "quirks.h" +/* Value from 9.2.6.4 USB 2 spec */ +#define USB_MSG_SET_TIMEOUT 5000 +/* Value from spec is 500 but we pick 1000 for legacy reasons */ +#define USB_MSG_GET_TIMEOUT 1000 + /* * combine bytes and get an integer value */ @@ -86,14 +91,19 @@ int snd_usb_ctl_msg(struct usb_device *dev, unsigned int pipe, __u8 request, { int err; void *buf = NULL; + int timeout; if (size > 0) { buf = kmemdup(data, size, GFP_KERNEL); if (!buf) return -ENOMEM; } + if (requesttype & USB_DIR_IN) + timeout = USB_MSG_GET_TIMEOUT; + else + timeout = USB_MSG_SET_TIMEOUT; err = usb_control_msg(dev, pipe, request, requesttype, - value, index, buf, size, 1000); + value, index, buf, size, timeout); if (size > 0) { memcpy(data, buf, size); kfree(buf);

3 4

[alsa-devel] DAPM widget power off
by yuvaraj r 20 Apr '13

20 Apr '13

Hi All, I have two different dais 1. Hifi Multimedia 2. Voice call dai Before opening voice call dai. I closed Hifi stream. After 5 sec Voice call stream dapm widget got powered off automatically. I am assuming that stream close event of Multimedia causing problem. What will issue in my cause. Thanks Yuvaraj

2 1

[alsa-devel] snd_pcm_avail() and snd_pcm_avail_update() always returns buffer_size
by Nate Case 20 Apr '13

20 Apr '13

Hello, I'm debugging an issue where both snd_pcm_avail_update() and snd_pcm_avail() are always returning buffer_size, even after successfully calling snd_pcm_writei() repeatedly. This is causing problems when I first start playback. My goal was to fill up the playback buffer until it's almost full when first starting, and then enter my regular playback loop where I write period_size at a time. However, I'm not able to tell when the playback buffer is full from snd_pcm_avail() or snd_pcm_avail_update() as expected. In case it's useful, the full snd_pcm_dump() output of the playback device is available here: http://pastebin.com/ai3e0cer To summarize the configuration, I'm using a chain of PCM devices that looks like this: Soft volume -> Rate conversion -> Route conversion -> HW PCM (USB audio) (notes: buffer_size for soft volume PCM is 640 [80ms], period size is 160 [20ms]. buffer_size for HW PCM is 3846 and period_size is 960. I'm opening the playback device in blocking mode, although the same thing appears to happen in non-blocking mode) Here is the sequence of events I'm seeing: 1) Call snd_pcm_writei() with 160 frames successfully. Function returns immediately in less than 1ms because the buffer is empty. 2) snd_pcm_avail() returns 640 (expected 640-160 = 480) snd_pcm_dump() shows the following for the HW PCM device: appl_ptr : 960 hw_ptr : 0 3) Call snd_pcm_writei() again with 160 frames successfully. Function returns immediately again. 4) snd_pcm_avail() returns 640 (expected 480-160 = 320) snd_pcm_dump() shows the following for the HW PCM device: appl_ptr : 1920 hw_ptr : 0 5) Cycle repeats two more times, with these values for apply_ptr/hw_ptr reported after each subsequent snd_pcm_writei() call: appl_ptr : 2880 hw_ptr : 288 appl_ptr : 3840 hw_ptr : 288 All along, snd_pcm_avail() returns 640. 6) Call snd_pcm_writei() with 160 frames again. This time, the buffer is actually full, so it blocks for 20 ms as expected. 7) snd_pcm_avail() returns 640 snd_pcm_dump() shows the following for the HW PCM device: appl_ptr : 4800 hw_ptr : 960 8) Continue this loop, with each subsequent snd_pcm_writei() call blocking for 20 ms, while snd_pcm_avail() always returns 640. Any ideas on why this could be happening? Or am I misunderstanding something here? Thanks, Nate Case <ncase(a)xes-inc.com>

2 2

Re: [alsa-devel] PCM buffering ussues ( or probably the lack of understanding )
by Lars-Peter Clausen 20 Apr '13

20 Apr '13

On 04/20/2013 12:59 PM, marcelg wrote: > Lars Peter, > > Thanks for your reply. > > Some things are more clear now, however one issue I still wonder. > > > Quote > > " >> Suppose I want to have some buffering inside my pcm driver, how will I be >> able to get some samples in advance before starting playback ? Can I just >> call pcm_period_elapsed() a few times in a row to get the buffer filled >> before starting the actual playcback, or does this cause side effects ? >> > Why'd you want to do that? > " > > > If Alsa is not having an internal buffer as you pointed out. An my driver > for example advertises > min periods = 1 and max_periods = 10. Then it means my drivers is capable > of buffering up to 10 periods. > > However what I notice is that the Alsa layer pcm_copy() always supplies > "period_bytes" after each call to period_elapsed() > > This would imply that even my driver is able to buffer 10 periods, it never > receives more data as one period, because I call period_elapsed() > as soon as the data is consumed. The ALSA core keeps track of how many bytes are available in your buffer. It will supply your driver with as many bytes as there is space in the buffer. So if you start playback you should see it supplying you more than one period worth of bytes. Once the buffer is full you'll naturally only get one new period of each period that has elapsed. But as I said before if you don't do anything other then copying data to your buffer in the copy callback, you should probably get rid of the copy callback altogether and let ALSA take care of writing the data to your buffer. This will also allow you to use for example mmap. - Lars

1 0

[alsa-devel] Invitation to connect on LinkedIn
by Barry Song via LinkedIn 20 Apr '13

20 Apr '13

LinkedIn ------------ Barry Song requested to add you as a connection on LinkedIn: ------------------------------------------ abdul, I'd like to add you to my professional network on LinkedIn. - Barry Accept invitation from Barry Song http://www.linkedin.com/e/jpxkk3-hfqntbbx-71/uii-rtptP1H4ViCg9YiBUOvto1r4_5… View profile of Barry Song http://www.linkedin.com/e/jpxkk3-hfqntbbx-71/rso/196461153/a2mu/name/138036… ------------------------------------------ You are receiving Invitation emails. This email was intended for abdul moiz. Learn why this is included: http://www.linkedin.com/e/jpxkk3-hfqntbbx-71/plh/http%3A%2F%2Fhelp%2Elinked… (c) 2012, LinkedIn Corporation. 2029 Stierlin Ct, Mountain View, CA 94043, USA.

1 0

[alsa-devel] PCM buffering ussues ( or probably the lack of understanding )
by marcelg 20 Apr '13

20 Apr '13

I am working on a PCM driver, have some issues and thing which are unclear to me, hopefully somebody here can clarify something for me. My PCM driver is straigh forward: - Copy callback copies the frames received in the callback into a small ringbuffer and starts a DMA transfer to the hardware. - DMA interrupt each times take the next chunk from the ringbuffer. - In the DMA interrupt the number of frames is counted, if te number >= period_size reported in runtime_struct pcm_period_elapsed() is called. - the pointer which is read by the pcm_pointer() callback is updated in each DMA interrupt. When using mplayer this works without problems, however with other applications like mpg123 its causes a lot of problems, for some reaosns I do not understand yet. It has something to do with buffer handling. basically in the cm driver I can influence a few parameters: periods_min/periods_max period_bytes_min, period_bytes_max buffer_size ( should be sufficient to hold periods_max with period_bytes_max I assume ) As far as I understand periods_min/periods_max is the size (number of buffer entries) of the internal ringbuffer Alsa uses. - Why is there both a min and a max ? How is chosen what will be used ? - Currently my period_min is set to 1 and my period_max set to 4, If I increase the period_max value it does not start properly, it seems that the samples are not deliverered in time. Is there any explanation for this, does the Alsa layer not any pre-buffering before the first copy() is called ? - Is there any advice / guidline for period min/max values ? I checked sourecs of severl drivers, some use 1 and some use values like 32 or more for period_max. The same applies to buffer_bytes min/max, currently my min is set to 128bytes , max to 2kB, larger values of max seem to cause more problems. From the documentation I understand that it does not matter if pcm_period_elapsed() is not always called, How dows the ALSA layer then know how many samples are played. the pointer value read the pcm_pointer() only counts from [0..period_max] so what if 2 or more calls to period_elapsed() are skipped ? Suppose I want to have some buffering inside my pcm driver, how will I be able to get some samples in advance before starting playback ? Can I just call pcm_period_elapsed() a few times in a row to get the buffer filled before starting the actual playcback, or does this cause side effects ? I noticed that the number of frames passed to pcm_copy is often less than the periods_size, is this determined by the application ? Lots of questions, but I try to understand the odd behaviour with certain applications ( and the best settings for a pcm driver which will work with most applications ) Any help would be appreciated. Marcel

3 2

Re: [alsa-devel] [PATCH 4/7] ALSA: compress_core: Add support for capture streams
by Vinod Koul 20 Apr '13

20 Apr '13

On Thu, Apr 18, 2013 at 11:02:08AM +0100, Charles Keepax wrote: > Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> > Signed-off-by: Richard Fitzgerald <rf(a)opensource.wolfsonmicro.com> > --- > sound/core/compress_offload.c | 43 +++++++++++++++++++++++++++++++++++++++- > 1 files changed, 41 insertions(+), 2 deletions(-) > > diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c > index 52ca4cc..52a2765 100644 > --- a/sound/core/compress_offload.c > +++ b/sound/core/compress_offload.c > @@ -296,7 +296,41 @@ static ssize_t snd_compr_write(struct file *f, const char __user *buf, > static ssize_t snd_compr_read(struct file *f, char __user *buf, > size_t count, loff_t *offset) > { > - return -ENXIO; > + struct snd_compr_file *data = f->private_data; > + struct snd_compr_stream *stream; > + size_t avail; > + int retval; > + > + if (snd_BUG_ON(!data)) > + return -EFAULT; > + > + stream = &data->stream; > + mutex_lock(&stream->device->lock); > + > + /* read is allowed when stream is running */ > + if (stream->runtime->state != SNDRV_PCM_STATE_RUNNING) { > + retval = -EBADFD; > + goto out; minor one but shouldnt we allow read even when we have stoped or paused the stream. Stop is important as you might want to get all buffers after you have stopped. > + } > + > + avail = snd_compr_get_avail(stream); > + pr_debug("avail returned %ld\n", (unsigned long)avail); > + /* calculate how much we can read from buffer */ > + if (avail > count) > + avail = count; > + > + if (stream->ops->copy) { > + retval = stream->ops->copy(stream, buf, avail); > + } else { > + retval = -ENXIO; > + goto out; > + } > + if (retval > 0) > + stream->runtime->total_bytes_transferred += retval; > + > +out: > + mutex_unlock(&stream->device->lock); > + return retval; > } > > static int snd_compr_mmap(struct file *f, struct vm_area_struct *vma) > @@ -481,9 +515,14 @@ snd_compr_set_params(struct snd_compr_stream *stream, unsigned long arg) > retval = stream->ops->set_params(stream, params); > if (retval) > goto out; > - stream->runtime->state = SNDRV_PCM_STATE_SETUP; > + > stream->metadata_set = false; > stream->next_track = false; > + > + if (stream->direction == SND_COMPRESS_PLAYBACK) > + stream->runtime->state = SNDRV_PCM_STATE_SETUP; > + else > + stream->runtime->state = SNDRV_PCM_STATE_PREPARED; > } else { > return -EPERM; > } > -- > 1.7.2.5 >

3 2

[alsa-devel] Solved Hercules RMX2
by Daniel Schürmann 20 Apr '13

20 Apr '13

Hallo Alsa Developers, I have fixed Support for Hercules RMX2. You can find the Bug and the patch here: https://bugs.launchpad.net/mixxx/+bug/1096687 The issue was caused by the first time setting the rate. I have changed the usb_msg_timeout to 1500 ms to make it work. The measures time is a ~1240 ms. All following rate settings are finished in not time < 4 ms Sound is now working fine but there are still IO errors just after connecting the device errno 5 - input/output error Here the extended Log: Apr 14 23:50:37 KellerPc kernel: [19213.746929] snd_usb_autoresume() -19 ID:6f8b113 chip->shutdown 0 chip->probing 1. Apr 14 23:50:37 KellerPc kernel: [19213.746934] -5 1 cannot get ctl value: req = 0x83, wValue = 0x201, wIndex = 0x0, type = 4 Apr 14 23:50:37 KellerPc kernel: [19213.747053] snd_usb_autoresume() -19 ID:6f8b113 chip->shutdown 0 chip->probing 1. Apr 14 23:50:37 KellerPc kernel: [19213.747058] -5 1 cannot get ctl value: req = 0x83, wValue = 0x200, wIndex = 0x0, type = 4 Apr 14 23:50:37 KellerPc kernel: [19213.747430] snd_usb_autoresume() -19 ID:6f8b113 chip->shutdown 0 chip->probing 1. Apr 14 23:50:37 KellerPc kernel: [19213.747435] -5 1 cannot get ctl value: req = 0x83, wValue = 0x201, wIndex = 0x0, type = 4 Apr 14 23:50:37 KellerPc kernel: [19213.747554] snd_usb_autoresume() -19 ID:6f8b113 chip->shutdown 0 chip->probing 1. Apr 14 23:50:37 KellerPc kernel: [19213.747559] -5 1 cannot get ctl value: req = 0x83, wValue = 0x200, wIndex = 0x0, type = 4 Apr 14 23:50:37 KellerPc kernel: [19213.752599] usbcore: registered new interface driver snd-usb-audio Apr 14 23:50:37 KellerPc kernel: [19213.775204] snd_usb_ctl_msg() dev:ed5eb000 pipe:80000d80 request:02, requesttype:a1, value:0201, index:0a00, data_size:8. Apr 14 23:50:37 KellerPc kernel: [19213.776264] snd_usb_ctl_msg() dev:ed5eb000 pipe:80000d80 request:02, requesttype:a1, value:0201, index:0a00, data_size:8. Apr 14 23:50:37 KellerPc kernel: [19213.776436] snd_usb_ctl_msg() dev:ed5eb000 pipe:80000d80 request:02, requesttype:a1, value:0201, index:0a00, data_size:8. The current solution is fine for me, but maybe there is an other place for tweaking the startup timing. Any ideas? Is it possible to include the fix in trunk? Thank you. Kind regards, Daniel Schürmann

3 9

[alsa-devel] [PATCH 2/2] ALSA: ASoC: spdif_receiver: Add DT support
by Michal Bachraty 19 Apr '13

19 Apr '13

Add devicetree support for this dummy audio soc driver. Signed-off-by: Michal Bachraty <michal.bachraty(a)streamunlimited.com> --- sound/soc/codecs/spdif_receiver.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sound/soc/codecs/spdif_receiver.c b/sound/soc/codecs/spdif_receiver.c index dd8d856..5d469c7 100644 --- a/sound/soc/codecs/spdif_receiver.c +++ b/sound/soc/codecs/spdif_receiver.c @@ -21,6 +21,9 @@ #include <sound/soc.h> #include <sound/pcm.h> #include <sound/initval.h> +#include <linux/of.h> + +#define DRV_NAME "spdif-dir" #define STUB_RATES SNDRV_PCM_RATE_8000_192000 #define STUB_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \ @@ -51,12 +54,21 @@ static int spdif_dir_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_OF +static const struct of_device_id spdif_dit_dt_ids[] = { + { .compatible = DRV_NAME, }, + { } +}; +MODULE_DEVICE_TABLE(of, spdif_dits_dt_ids); +#endif + static struct platform_driver spdif_dir_driver = { .probe = spdif_dir_probe, .remove = spdif_dir_remove, .driver = { .name = "spdif-dir", .owner = THIS_MODULE, + .of_match_table = of_match_ptr(spdif_dit_dt_ids), }, }; -- 1.7.9.5

1 0

Re: [alsa-devel] [PATCH 5/7] ASoC: soc-compress: Deduce stream direction
by Vinod Koul 19 Apr '13

19 Apr '13

On Thu, Apr 18, 2013 at 11:02:38AM +0100, Charles Keepax wrote: > Previously we just hard coded all streams as playback streams, this > patch checks the DAI to see if it is a capture or playback stream. It is > worth noting that at this time only unidirectional streams are > supported. well the intention was the compress device would be either playback or record. you should have two devices if you support both. > > Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> > Signed-off-by: Richard Fitzgerald <rf(a)opensource.wolfsonmicro.com> > --- > sound/soc/soc-compress.c | 9 ++++++++- > 1 files changed, 8 insertions(+), 1 deletions(-) > > diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c > index da83e56..3853f7e 100644 > --- a/sound/soc/soc-compress.c > +++ b/sound/soc/soc-compress.c > @@ -384,7 +384,14 @@ int soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) > /* check client and interface hw capabilities */ > snprintf(new_name, sizeof(new_name), "%s %s-%d", > rtd->dai_link->stream_name, codec_dai->name, num); > - direction = SND_COMPRESS_PLAYBACK; > + > + if (codec_dai->driver->playback.channels_min) > + direction = SND_COMPRESS_PLAYBACK; > + else if (codec_dai->driver->capture.channels_min) > + direction = SND_COMPRESS_CAPTURE; > + else > + return -EINVAL; > + > compr = kzalloc(sizeof(*compr), GFP_KERNEL); > if (compr == NULL) { > snd_printk(KERN_ERR "Cannot allocate compr\n"); > -- > 1.7.2.5 >

1 0

[alsa-devel] ALSA framework problem: FE disconnected, BE still connected!
by lkasam＠codeaurora.org 19 Apr '13

19 Apr '13

Hi Liam, We have a problem encountered in ALSA framework wrt FE/BE disconnection and fix to it is mentioned in below code change. please check it and provide your valuable comments. ---------------------- From: Laxminath Kasam <lkasam(a)codeaurora.org> Date: Wed, 3 Apr 2013 14:03:17 +0530 Subject: [PATCH] ASoC: audio: Fix BE not disconnected even codec teardown Scenario: When FE1(LowLatency) comes in which opens BE1 and puts it in state SND_SOC_DPCM_STATE_START. Similarly FE2(LPA) comes in with connecting to same BE. Now FE2 is in SND_SOC_DPCM_STATE_PREPARE state and waits for TRIGGER_START. Meanwhile FE1 is closed which doesn't affect BE1 and FE2 which are connected. Also, for FE2 pcm_close is called before TRIGGER_START itself. In such a case, BE1 is not getting disconnected while Codec is teared down resulting in failures. Fix: Whenever BE1 is found to be in SND_SOC_DPCM_STATE_START state and FE1 being connected is not started yet, and close sequence happens for this FE, then allow hw_free to happen for BE1 if this is the only FE connected to this BE1. This allows BE to be disconnected which calls afe_close then followed by Codec teardown not resulting in any failures. Signed-off-by: Laxminath Kasam <lkasam(a)codeaurora.org> --- sound/soc/soc-pcm.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 915c3c2..ed0ea86 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1765,7 +1765,12 @@ static int soc_dpcm_be_dai_hw_free(struct snd_soc_pcm_runtime *fe, int stream) (be->dpcm[stream].state != SND_SOC_DPCM_STATE_PREPARE) && (be->dpcm[stream].state != SND_SOC_DPCM_STATE_HW_FREE) && (be->dpcm[stream].state != SND_SOC_DPCM_STATE_PAUSED) && - (be->dpcm[stream].state != SND_SOC_DPCM_STATE_STOP)) + (be->dpcm[stream].state != SND_SOC_DPCM_STATE_STOP) && + !((be->dpcm[stream].state == SND_SOC_DPCM_STATE_START)&& + ((fe->dpcm[stream].state != SND_SOC_DPCM_STATE_START) && + (fe->dpcm[stream].state != SND_SOC_DPCM_STATE_PAUSED) && + (fe->dpcm[stream].state != + SND_SOC_DPCM_STATE_SUSPEND)))) continue; dev_dbg(be->dev, "dpcm: hw_free BE %s\n", -- ----------------------------------------- Please let me know if you are looking for more details. Thanks Kasam

3 3