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

Re: [alsa-devel] [Alsa-user] hdmi sound rerouted?
by daggs＠gmx.com 04 Nov '13

04 Nov '13

the original issue is that wen using an ATI gpu with hdmi in it, rerouting the sound via the ati hdmi card doesn't work, only via the generic. alsa devs pointed out that the ati cards listed in intel_hda.c aren't updated with latest cards due to insufficient info on about the cards. Alex Deucher from AMD's dev answered that he will query the right team in his workplace but no response was received fro him yet. > ----- Original Message ----- > From: Takashi Iwai > Sent: 11/04/13 10:43 AM > To: Dagg Stompler > Subject: Re: [alsa-devel] [Alsa-user] hdmi sound rerouted? > > At Sun, 03 Nov 2013 08:50:55 +0100, > Dagg Stompler wrote: > > > > > ----- Original Message ----- > > > From: Deucher, Alexander > > > Sent: 10/19/13 03:59 PM > > > To: Dagg Stompler, Takashi Iwai > > > Subject: RE: [alsa-devel] [Alsa-user] hdmi sound rerouted? > > > > > > > -----Original Message----- > > > > > > > From: Dagg Stompler [mailto:daggs@gmx.com] > > > > > > > Sent: Saturday, October 19, 2013 5:49 AM > > > > > > > To: Takashi Iwai; Deucher, Alexander > > > > > > > Cc: Clemens Ladisch; alsa-user(a)lists.sourceforge.net; alsa-devel@alsa- > > > > > > > project.org > > > > > > > Subject: Re: [alsa-devel] [Alsa-user] hdmi sound rerouted? > > > > > > > > > > > > > > > ----- Original Message ----- > > > > > > > > From: Takashi Iwai > > > > > > > > Sent: 10/08/13 10:49 AM > > > > > > > > To: Deucher, Alexander > > > > > > > > Subject: Re: [alsa-devel] [Alsa-user] hdmi sound rerouted? > > > > > > > > > > > > > > > > At Mon, 7 Oct 2013 13:36:24 +0000, > > > > > > > > Deucher, Alexander wrote: > > > > > > > > > > > > > > > > > > > -----Original Message----- > > > > > > > > > > From: Takashi Iwai [mailto:tiwai@suse.de] > > > > > > > > > > Sent: Monday, September 30, 2013 5:18 AM > > > > > > > > > > To: Deucher, Alexander > > > > > > > > > > Cc: Clemens Ladisch; Dagg Stompler; alsa-user(a)lists.sourceforge.net; > > > > > > > alsa- > > > > > > > > > > devel(a)alsa-project.org > > > > > > > > > > Subject: Re: [alsa-devel] [Alsa-user] hdmi sound rerouted? > > > > > > > > > > > > > > > > > > > > At Mon, 30 Sep 2013 02:23:22 +0000, > > > > > > > > > > Deucher, Alexander wrote: > > > > > > > > > > > > > > > > > > > > > > > -----Original Message----- > > > > > > > > > > > > From: Clemens Ladisch [mailto:cladisch@googlemail.com] > > > > > > > > > > > > Sent: Saturday, September 28, 2013 6:33 PM > > > > > > > > > > > > To: Dagg Stompler > > > > > > > > > > > > Cc: alsa-user(a)lists.sourceforge.net; Deucher, Alexander; alsa- > > > > > > > > > > devel@alsa- > > > > > > > > > > > > project.org > > > > > > > > > > > > Subject: Re: [Alsa-user] [alsa-devel] hdmi sound rerouted? > > > > > > > > > > > > > > > > > > > > > > > > Dagg Stompler wrote: > > > > > > > > > > > > >> daggs(a)gmx.com wrote: > > > > > > > > > > > > >>> card 0: PCH [HDA Intel PCH], device 3: HDMI 0 [HDMI 0] > > > > > > > > > > > > >>> card 1: Generic [HD-Audio Generic], device 3: HDMI 0 [HDMI 0] > > > > > > > > > > > > >>> card 2: HDMI [HDA ATI HDMI], device 3: HDMI 0 [HDMI 0] > > > > > > > > > > > > >> > > > > > > > > > > > > >> The second one is called "Generic" because your kernel does not > > > > > > > (yet) > > > > > > > > > > > > >> know the hardware. > > > > > > > > > > > > >> > > > > > > > > > > > > >>> 01:00.1 Audio device: Advanced Micro Devices, Inc. [AMD/ATI] > > > > > > > Cedar > > > > > > > > > > > > HDMI Audio [Radeon HD 5400/6300 Series] > > > > > > > > > > > > >>> 06:00.1 Audio device: Advanced Micro Devices, Inc. [AMD/ATI] > > > > > > > RV635 > > > > > > > > > > > > HDMI Audio [Radeon HD 3600 Series] > > > > > > > > > > > > >> > > > > > > > > > > > > >> These are the HDMI outputs of *two* graphics cards. The first > > > > > > > one's > > > > > > > > > > > > >> model is so new that the driver doesn't know it. > > > > > > > > > > > > > > > > > > > > > > > > > > the 3600 doesn't have hdmi socket so I think it is irrelevant for my > > > > > > > issue. > > > > > > > > > > > > > > > > > > > > > > > > The RV635 chip does support HDMI outputs (even if none are > > > > > > > actually > > > > > > > > > > > > connected), so the corresponding PCI device shows up here. > > > > > > > > > > > > > > > > > > > > > > > > >>> If you update the kernel, you will get two devices named "HDA > > > > > > > ATI > > > > > > > > > > > > HDMI". > > > > > > > > > > > > > > > > > > > > > > > > > > upgrade to where? > > > > > > > > > > > > > > > > > > > > > > > > Oops. Even the latest driver lacks the PCI IDs of many HDMI HDA > > > > > > > devices > > > > > > > > > > > > (aa50/aa58/aa60/aa68/aa80/aa88/aa90/aa98: > > > > > > > > > > > > Cypress/Juniper/Redwood/Cedar/ > > > > > > > > > > > > Cayman+Antilles/Barts/Turks/Caicos). > > > > > > > > > > > > > > > > > > > > > > > > Alex, are these devices that require disabling snooping? > > > > > > > > > > > > > > > > > > > > > > Sorry what does snooping mean in this context? > > > > > > > > > > > > > > > > > > > > Most of HD-audio controller have a snoop control, but the recent AMD > > > > > > > > > > HDMI audio controller don't have the feature, thus the driver must use > > > > > > > > > > the non-cached pages. At least, PCI ID 1002:aaa0, aaa8 and aab0 are > > > > > > > > > > known to require such. > > > > > > > > > > > > > > > > > > > > Now the question is whether all new chips above (aa50,...) require the > > > > > > > > > > same workaround, too. Could you check this or forward the inquiry to > > > > > > > > > > someone in AMD? > > > > > > > > > > > > > > > > > > According to our internal teams, disabling snooping is only required on > > > > > > > the audio parts included in Evergreen and Northern Islands GPUs. Older chips > > > > > > > like R7xx (aa48) and newer chips like Southern Islands (aaa0) are able to use > > > > > > > snooping. I'm not real familiar with the audio portions of the GPUs so if you > > > > > > > need further clarification, let me know. > > > > > > > > > > > > > > > > Thanks for the information. > > > > > > > > > > > > > > > > Though, it's strange that the information doesn't match with what I've > > > > > > > > heard (and also with what I've tested with a laptop). I've heard that > > > > > > > > it's Southern Island HDMI that needs the snoop-disablement. > > > > > > > > > > > > > > > > Could you ask again whether it's really Evergreen / Nothern Islands? > > > > > > > > > > > > > > > > > > > > > > > > thanks, > > > > > > > > > > > > > > > > Takashi > > > > > > > > > > > > > > > > > > > > > > > > > > Alex > > > > > > > > > > > > > > > > > > > > > > > > > > > > > FWIW, such a chip needs to set AZX_DRIVER_ATIHDMI_NS bits in > > > > > > > > > > driver_data of pci entries in sound/pci/hda/hda_intel.c. > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > thanks, > > > > > > > > > > > > > > > > > > > > Takashi > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > any updates on the matter guys? > > > > > > > > > > > > > > > > > > Haven't heard back. I'll ping them again. > > > > > > > > > > > > Alex > > > > sorry for nudging, any updates? > > Well, what's your original issue? > I wasn't in the loop from the beginning, so I don't know what is the > information you need to know. > > If disablement of the snoop is mandatory on your board, we need to add > the workaround in the driver no matter what spec says. (The datasheet > is often wrong in practice :) > > > Takashi >

3 3

[alsa-devel] [PATCH] ALSA: hda - rename function not_share_unassigned_cvt()
by mengdong.lin＠intel.com 04 Nov '13

04 Nov '13

From: Mengdong Lin <mengdong.lin(a)intel.com> The function name not_share_unassigned_cvt() is opposite to what it does. This patch renames it to intel_not_share_assigned_cvt(), and addes comments to explain why some Intel display codecs need this workaround. Signed-off-by: Mengdong Lin <mengdong.lin(a)intel.com> diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index bcf764f..1b1fe68 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1149,7 +1149,16 @@ static int hdmi_choose_cvt(struct hda_codec *codec, return 0; } -static void not_share_unassigned_cvt(struct hda_codec *codec, +/* Intel HDMI workaround to fix audio routing issue: + * For some Intel display codecs, pins share the same connection list. + * So a conveter can be selected by multiple pins and playback on any of these + * pins will generate sound on the external display, because audio flows from + * the same converter to the display pipeline. Also muting one pin may make + * other pins have no sound output. + * So this function assures that an assigned converter for a pin is not selected + * by any other pins. + */ +static void intel_not_share_assigned_cvt(struct hda_codec *codec, hda_nid_t pin_nid, int mux_idx) { struct hdmi_spec *spec = codec->spec; @@ -1228,7 +1237,7 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo, /* configure unused pins to choose other converters */ if (is_haswell(codec) || is_valleyview(codec)) - not_share_unassigned_cvt(codec, per_pin->pin_nid, mux_idx); + intel_not_share_assigned_cvt(codec, per_pin->pin_nid, mux_idx); snd_hda_spdif_ctls_assign(codec, pin_idx, per_cvt->cvt_nid); -- 1.8.1.2

2 1

[alsa-devel] [RFC] ALSA: usb: supply channel maps even when wChannelConfig is unspecified
by David Henningsson 04 Nov '13

04 Nov '13

If wChannelconfig is given for some formats but not others, userspace might not be able to set the channel map. This is RFC because I'm not sure what the best behaviour is - to guess the channel map from the given number of channels (it's quite likely that one channel is MONO and two channels is FL FR), or just to supply UNKNOWN for all channels. But the complete lack of channel map for a format leads userspace to believe that the format is not available at all. Or am I misunderstanding how this should be used? Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/usb/stream.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/sound/usb/stream.c b/sound/usb/stream.c index c4339f9..b43b6ee 100644 --- a/sound/usb/stream.c +++ b/sound/usb/stream.c @@ -281,8 +281,6 @@ static struct snd_pcm_chmap_elem *convert_chmap(int channels, unsigned int bits, const unsigned int *maps; int c; - if (!bits) - return NULL; if (channels > ARRAY_SIZE(chmap->map)) return NULL; @@ -293,9 +291,19 @@ static struct snd_pcm_chmap_elem *convert_chmap(int channels, unsigned int bits, maps = protocol == UAC_VERSION_2 ? uac2_maps : uac1_maps; chmap->channels = channels; c = 0; - for (; bits && *maps; maps++, bits >>= 1) { - if (bits & 1) - chmap->map[c++] = *maps; + + if (bits) { + for (; bits && *maps; maps++, bits >>= 1) + if (bits & 1) + chmap->map[c++] = *maps; + } else { + /* If we're missing wChannelConfig, then guess something + to make sure the channel map is not skipped entirely */ + if (channels == 1) + chmap->map[c++] = SNDRV_CHMAP_MONO; + else + for (; c < channels && *maps; maps++) + chmap->map[c++] = *maps; } for (; c < channels; c++) -- 1.7.9.5

2 4

[alsa-devel] More ASoC updates for v3.13
by Mark Brown 04 Nov '13

04 Nov '13

The following changes since commit 9645083ca5ef365b7b750cf219bb20b61bb925f8: Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-next (2013-10-24 11:24:18 +0100) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v3.13-2 for you to fetch changes up to 71d0c3a876e007f68fc2ed433119dd4f4dc408a7: Merge remote-tracking branch 'asoc/topic/wm8996' into asoc-next (2013-11-03 22:04:22 -0800) ---------------------------------------------------------------- ASoC: Final updates for v3.13 A few final updates for v3.13, all driver updates apart from some DPCM and Coverity fixes which should have minor impact on practical systems. ---------------------------------------------------------------- Aaron Lu (1): [SCSI] sd: call blk_pm_runtime_init before add_disk AceLan Kao (2): HID: usbhid: quirk for Synaptics Large Touchccreen HID: usbhid: quirk for SiS Touchscreen Al Viro (1): nfsd regression since delayed fput() Alan Ott (5): 6lowpan: Only make 6lowpan links to IEEE802154 devices 6lowpan: Sync default hardware address of lowpan links to their wpan mrf24j40: Move INIT_COMPLETION() to before packet transmission mrf24j40: Use threaded IRQ handler mrf24j40: Use level-triggered interrupts Alex Deucher (6): drm/radeon/atom: workaround vbios bug in transmitter table on rs780 drm/radeon: make missing smc ucode non-fatal (r7xx-SI) drm/radeon: make missing smc ucode non-fatal (CI) drm/radeon/audio: don't set speaker allocation on DCE3.2 drm/radeon: rework audio option drm/radeon/audio: don't set speaker allocation on DCE4+ Alexander Bondar (1): iwlwifi: mvm: Disable uAPSD for D3 image Alexandre Belloni (1): mac802154: correct a typo in ieee802154_alloc_device() prototype Alexei Starovoitov (1): net: fix unsafe set_memory_rw from softirq Amir Vadai (2): net/mlx4_en: Rename name of mlx4_en_rx_alloc members net/mlx4_en: Fix pages never dma unmapped on rx Amitkumar Karwar (1): mwifiex: fix SDIO interrupt lost issue Andi Kleen (2): igb: Avoid uninitialized advertised variable in eee_set_cur tcp: Always set options to 0 before calling tcp_established_options Andreas Matthies (1): [media] tda10071: change firmware download condition Andy Gospodarek (1): bonding: update MAINTAINERS Anjana V Kumar (1): cgroup: fix to break the while loop in cgroup_attach_task() correctly Antti Palosaari (3): [media] e4000: fix PLL calc bug on 32-bit arch [media] msi3101: Kconfig select VIDEOBUF2_VMALLOC [media] msi3101: correct max videobuf2 alloc Ariel Elior (3): bnx2x: Unlock VF-PF channel on MAC/VLAN config error bnx2x: Fix config when SR-IOV and iSCSI are enabled bnx2x: Lock DMAE when used by statistic flow Arnaldo Carvalho de Melo (1): perf scripting perl: Fix build error on Fedora 12 Avinash Patil (2): mwifiex: inform cfg80211 about disconnect if device is removed mwifiex: inform cfg80211 about disconnect for P2P client interface Ben Hutchings (1): sfc: Only bind to EF10 functions with the LinkCtrl and Trusted flags Ben Widawsky (2): drm/i915: Make PTE valid encoding optional drm/i915: Disable GGTT PTEs on GEN6+ suspend Bian Yu (1): md: avoid deadlock when md_set_badblocks. Brennan Shacklett (1): intel_pstate: Improve accuracy by not truncating until final result Brian Austin (4): ASoC: cs42l52: Add platform data for reset gpio ASoC: cs42l52: convert pdata config to regmap_update_bits ASoC: cs42l52: Add chip rev id message ASoC: cs42l52: increase MAX_REGISTER for regmap_register_patch Bruno Randolf (1): cfg80211: fix warning when using WEXT for IBSS Chad Dupuis (1): [SCSI] qla2xxx: Fix request queue null dereference. Charles Keepax (1): ASoC: wm5110: Add missing routes for AEC Loopback Chris Wilson (2): drm: Prevent overwriting from userspace underallocating core ioctl structs drm: Pad drm_mode_get_connector to 64-bit boundary Christian König (2): drm/radeon: stop the leaks in cik_ib_test drm/radeon/uvd: revert lower msg&fb buffer requirements on UVD3 Christophe Gouault (1): vti: get rid of nf mark rule in prerouting Chun-Yeow Yeoh (1): mac80211: fix the setting of extended supported rate IE Claudiu Manoil (3): gianfar: Enable eTSEC-A002 erratum w/a for all parts gianfar: Use mpc85xx support for errata detection gianfar: Enable eTSEC-20 erratum w/a for P2020 Rev1 Colin Ian King (1): eCryptfs: fix 32 bit corruption issue Dan Carpenter (5): [media] sh_vou: almost forever loop in sh_vou_try_fmt_vid_out() [media] mx3-camera: locking cleanup in mx3_videobuf_queue() net: heap overflow in __audit_sockaddr() yam: integer underflow in yam_ioctl() yam: remove a no-op in yam_ioctl() Daniel Borkmann (1): net: unix: inherit SOCK_PASS{CRED, SEC} flags from socket to fix race Dave Airlie (2): Merge tag 'drm-intel-fixes-2013-10-21' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes Merge branch 'drm-fixes-3.12' of git://people.freedesktop.org/~agd5f/linux into drm-fixes Dave Jiang (1): MAINTAINERS: add to ioatdma maintainer list Dave Kleikamp (1): jfs: fix error path in ialloc David Herrmann (1): HID: wiimote: add LEGO-wiimote VID David S. Miller (20): Merge branch 'connector' Merge branch 'calxedaxgmac' Merge branch 'mv643xx' Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless Merge branch '6lowpan' Merge branch 'mrf24j40' l2tp: Fix build warning with ipv6 disabled. Merge branch 'mlx4' Merge branch 'sfc-3.12' of git://git.kernel.org/.../bwh/sfc Merge branch 'master' of git://git.kernel.org/.../klassert/ipsec Merge branch 'gianfar' Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless Merge branch 'dm9000' Merge branch 'sctp_csum' Merge branch 'for-davem' of git://git.kernel.org/.../linville/wireless Merge branch 'bridge_pvid' Merge branch 'ufo_fixes' Merge branch 'bnx2x' Merge branch 'rt6i_gateway' David Vrabel (1): xen-netback: transition to CLOSED when removing a VIF David Woodhouse (1): mtd: gpmi: fix ECC regression Denis Carikli (1): ASoC: eukrea-tlv320: Use dev_err instead of pr_err. Dimitris Papastamos (5): ASoC: wm_adsp: Print error when regmap reads/writes fail ASoC: wm_adsp: Release firmware on memory allocation failure ASoC: wm_adsp: Add debug info on get()/put() transfers ASoC: wm_adsp: Remove and free algorithm regions for ADSP1 ASoC: wm_adsp: Print out the firmware version Dirk Brandewie (1): intel_pstate: Correct calculation of min pstate value Dmitry Kravkov (2): bnx2x: Fix Coalescing configuration bnx2x: Don't pretend during register dump Eduardo Valentin (1): drivers: thermal: allow ti-soc-thermal run without pcb zone Edward Cree (3): sfc: Fix internal indices of ethtool stats for EF10 sfc: Refactor EF10 stat mask code to allow for more conditional stats sfc: Add PM and RXDP drop counters to ethtool stats Emmanuel Grumbach (6): iwlwifi: pcie: don't reset the TX queue counter iwlwifi: don't WARN on host commands sent when firmware is dead iwlwifi: pcie: add SKUs for 6000, 6005 and 6235 series iwlwifi: mvm: call ieee80211_scan_completed when needed mac80211: correctly close cancelled scans cfg80211: don't add p2p device while in RFKILL Enrico Mioso (1): net: qmi_wwan: Olivetti Olicard 200 support Eric Dumazet (8): net: do not call sock_put() on TIMEWAIT sockets tcp: do not forget FIN in tcp_shifted_skb() pkt_sched: fq: fix typo for initial_quantum pkt_sched: fq: fix non TCP flows pacing l2tp: must disable bh before calling l2tp_xmit_skb() bnx2x: record rx queue for LRO packets tcp: must unclone packets before mangling them tcp: remove the sk_can_gso() check from tcp_set_skb_tso_segs() Eric W. Biederman (1): net: Update the sysctl permissions handler to test effective uid/gid Ezequiel Garcia (1): mtd: nand: pxa3xx: Fix registered MTD name Fabio Estevam (1): net: secure_seq: Fix warning when CONFIG_IPV6 and CONFIG_INET are not selected Fan Du (2): xfrm: Guard IPsec anti replay window against replay bitmap sctp: Use software crc32 checksum when xfrm transform will happen. Felix Fietkau (5): mac80211: drop spoofed packets in ad-hoc mode mac80211: use sta_info_get_bss() for nl80211 tx and client probing mac80211: update sta->last_rx on acked tx frames ath9k: fix powersave response handling for BA session packets ath9k: fix tx queue scheduling after channel changes Fengguang Wu (1): [media] msi3101: msi3101_ioctl_ops can be static François Cachereul (1): l2tp: fix kernel panic when using IPv4-mapped IPv6 addresses Freddy Xin (2): ax88179_178a: Correct the RX error definition in RX header ax88179_178a: Add VID:DID for Samsung USB Ethernet Adapter Geyslan G. Bem (1): ecryptfs: Fix memory leakage in keystore.c Gianluca Gennari (4): [media] adv7842: fix compilation with GCC < 4.4.6 [media] adv7511: fix compilation with GCC < 4.4.6 [media] ad9389b: fix compilation with GCC < 4.4.6 [media] ths8200: fix compilation with GCC < 4.4.6 Gregor Jasny (1): [media] Add HCL T12Rg-H to STK webcam upside-down table Gu Zheng (1): seq_file: always update file->f_pos in seq_lseek() Gwendal Grignou (1): libata: make ata_eh_qc_retry() bump scmd->allowed on bogus failures Hannes Frederic Sowa (1): ipv6: probe routes asynchronous in rt6_probe Heiko Carstens (2): s390/compat,signal: fix return value of copy_siginfo_(to|from)_user32() s390/vmlogrdr: fix array access in vmlogrdr_open() Heiko Stuebner (1): MAINTAINERS: Add maintainers entry for Rockchip SoCs Helge Deller (3): Revert "parisc: Export flush_cache_page() (needed by lustre)" parisc: enable DEVTMPFS, DEVTMPFS_MOUNT and BLK_DEV_INITRD in defconfigs parisc: Do not crash 64bit SMP kernels on machines with >= 4GB RAM Himanshu Madhani (1): qlcnic: Validate Tx queue only for 82xx adapters. Ingo Molnar (1): Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/.../acme/linux into perf/urgent Jacek Anaszewski (1): [media] s5p-jpeg: Initialize vfd_decoder->vfl_dir field Jason Cooper (1): MAINTAINERS: ARM: mvebu: add Sebastian Hesselbarth Jason Wang (2): virtio-net: don't respond to cpu hotplug notifier if we're not ready virtio-net: refill only when device is up during setting queues Jean-Francois Moine (1): ASoC: kirkwood: Fix compile error due to patch 'add S/PDIF support' Jesse Barnes (1): drm/i915: disable LVDS clock gating on CPT v2 Jingoo Han (2): ahci: use dev_info() instead of printk() ahci_platform: use dev_info() instead of printk() Jiri Benc (1): ipv4: fix ineffective source address selection Jiri Pirko (3): udp6: respect IPV6_DONTFRAG sockopt in case there are pending frames ip6_output: do skb ufo init for peeked non ufo skb as well ip_output: do skb ufo init for peeked non ufo skb as well Johannes Berg (4): cfg80211: fix sysfs registration race iwlwifi: pcie: fix merge damage wireless: radiotap: fix parsing buffer overrun mac80211: fix crash if bitrate calculation goes wrong John W. Linville (7): Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211 Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem Merge branch 'for-john' of git://git.kernel.org/.../iwlwifi/iwlwifi-fixes Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211 Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211 Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem Jon Cooper (1): sfc: Add rmb() between reading stats and generation count to ensure consistency Joseph Salisbury (1): [media] uvcvideo: quirk PROBE_DEF for Dell SP2008WFP monitor Jouni Malinen (1): mac80211: Run deferred scan if last roc_list item is not started Julian Anastasov (3): ipv6: always prefer rt6i_gateway if present ipv6: fill rt6i_gateway with nexthop address netfilter: nf_conntrack: fix rt6i_gateway checks for H.323 helper Kent Overstreet (1): bcache: Fixed incorrect order of arguments to bio_alloc_bioset() Khalid Aziz (1): [SCSI] BusLogic: Fix an oops when intializing multimaster adapter Kuninori Morimoto (1): ASoC: rcar: remove original filter from rsnd_dma_init() Laurent Pinchart (1): [media] uvcvideo: quirk PROBE_DEF for Microsoft Lifecam NX-3000 Linus Lüssing (1): Revert "bridge: only expire the mdb entry when query is received" Linus Torvalds (26): Merge branch 'parisc-3.12' of git://git.kernel.org/.../deller/parisc-linux Merge branch 'for-3.12-fixes' of git://git.kernel.org/.../tj/cgroup Merge branch 'for-3.12-fixes' of git://git.kernel.org/.../tj/libata Merge branch 'for-linus' of git://git.kernel.org/.../jikos/hid Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux Merge tag 'jfs-3.12' of git://github.com/kleikamp/linux-shaggy Merge tag 'sound-3.12' of git://git.kernel.org/.../tiwai/sound Merge git://git.kernel.org/.../davem/net Merge tag 'rdma-for-linus' of git://git.kernel.org/.../roland/infiniband Merge branch 'v4l_for_linus' of git://git.kernel.org/.../mchehab/linux-media Merge branch 'for-rc' of git://git.kernel.org/.../rzhang/linux Merge branch 'for-linus' of git://git.kernel.org/.../s390/linux Merge tag 'scsi-fixes' of git://git.kernel.org/.../jejb/scsi Merge tag 'md/3.12-fixes' of git://neil.brown.name/md Merge tag 'ecryptfs-3.12-rc7-fixes' of git://git.kernel.org/.../tyhicks/ecryptfs Merge tag 'fixes-for-linus' of git://git.kernel.org/.../arm/arm-soc Merge branch 'for-linus' of git://git.kernel.org/.../viro/vfs Merge tag 'for-linus-20131025' of git://git.infradead.org/linux-mtd Merge tag 'pm+acpi-3.12-rc7' of git://git.kernel.org/.../rafael/linux-pm Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma Merge git://git.kernel.org/.../nab/target-pending Merge branch 'core-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'parisc-3.12' of git://git.kernel.org/.../deller/parisc-linux Linux 3.12-rc7 Linus Walleij (1): ARM: integrator: deactivate timer0 on the Integrator/CP Luciano Coelho (1): cfg80211: use the correct macro to check for active monitor support Lukasz Dorau (2): libahci: fix turning on LEDs in ahci_start_port() md: Fix skipping recovery for read-only arrays. Lukasz Majewski (3): thermal: exynos: Remove check for thermal device pointer at exynos_report_trigger() thermal: exynos: Provide separate TMU data for Exynos4412 thermal: exynos: Provide initial setting for TMU's test MUX address at Exynos4412 Marc Kleine-Budde (5): can: dev: fix nlmsg size calculation in can_get_size() net: vlan: fix nlmsg size calculation in vlan_get_size() can: flexcan: flexcan_chip_start: fix regression, mark one MB for TX and abort pending TX can: flexcan: fix mx28 detection by rearanging OF match table can: at91-can: fix device to driver data mapping for platform devices Marek Szyprowski (1): [media] videobuf2-dc: Fix support for mappings without struct page in userptr mode Mariusz Ceier (1): davinci_emac.c: Fix IFF_ALLMULTI setup Mark Brown (26): Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus Merge remote-tracking branch 'asoc/fix/omap' into asoc-linus Merge remote-tracking branch 'asoc/fix/pcm1681' into asoc-linus Merge remote-tracking branch 'asoc/fix/pcm1792a' into asoc-linus Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus Merge remote-tracking branch 'asoc/fix/tlv320aic3x' into asoc-linus ALSA: Add MAINTAINERS entry for dmaengine helpers ASoC: pcm: Check for ops before deferencing them Merge remote-tracking branch 'asoc/fix/ak4642' into asoc-linus Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus Merge remote-tracking branch 'asoc/fix/wm8994' into asoc-linus Merge remote-tracking branch 'asoc/topic/ab8500' into asoc-next Merge remote-tracking branch 'asoc/topic/adsp' into asoc-next Merge remote-tracking branch 'asoc/topic/arizona' into asoc-next Merge remote-tracking branch 'asoc/topic/core' into asoc-next Merge remote-tracking branch 'asoc/topic/cs42l52' 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/kirkwood' into asoc-next Merge remote-tracking branch 'asoc/topic/ml26124' into asoc-next Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next Merge remote-tracking branch 'asoc/topic/rt5640' into asoc-next Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next Merge remote-tracking branch 'asoc/topic/wm0010' into asoc-next Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-next Merge remote-tracking branch 'asoc/topic/wm8996' into asoc-next Mark Cave-Ayland (1): rtlwifi: rtl8192cu: Fix error in pointer arithmetic Markus Pargmann (3): net: ethernet: cpsw: Search childs for slave nodes net/ethernet: cpsw: DT read bool dual_emac net/ethernet: cpsw: Bugfix interrupts before enabling napi Martin Schwidefsky (2): s390/mm,kvm: fix software dirty bits vs. kvm for old machines s390/time: correct use of store clock fast Masami Hiramatsu (1): perf probe: Fix to initialize fname always before use it Mathias Krause (5): proc connector: fix info leaks connector: use nlmsg_len() to check message length connector: use 'size' everywhere in cn_netlink_send() connector - documentation: simplify netlink message length assignment unix_diag: fix info leak Matthew Slattery (1): sfc: Add definitions for new stats counters and capability flag Matthias Schiffer (1): batman-adv: set up network coding packet handlers during module init Matti Gottlieb (1): iwlwifi: pcie: add new SKUs for 7000 & 3160 NIC series Mattia Dongili (1): sony-laptop: don't change keyboard backlight settings Merav Sicron (1): bnx2x: Set NETIF_F_HIGHDMA unconditionally Michael Abbott (1): dm9000: Implement full reset of DM9000 network device Michael S. Tsirkin (2): netif_set_xps_queue: make cpu mask const tun: don't look at current when non-blocking Mugunthan V N (1): drivers: net: cpsw: fix kernel warn during iperf test with interrupt pacing Neal Cardwell (1): tcp: initialize passive-side sk_pacing_rate after 3WHS Nguyen Hong Ky (1): net: sh_eth: Fix RX packets errors on R8A7740 Nicholas Bellinger (7): target: Make target_do_xcopy failures return INVALID_PARAMETER_LIST target: Allow non zero ListID in EXTENDED_COPY parameter list target: Reject EXTENDED_COPY when emulate_3pc is disabled target: Add missing XCOPY I/O operation sense_buffer target: Generate failure for XCOPY I/O with non-zero scsi_status target: Fail XCOPY for non matching source + destination block_size vhost/scsi: Fix incorrect usage of get_user_pages_fast write parameter Nicolin Chen (1): ASoC: wm8962: Fix null pointer pdata access in I2C probe() Nikita Kiryanov (3): dm9000: during init reset phy only for dm9000b dm9000: take phy out of reset during init dm9000: report the correct LPA Nikolai Kondrashov (1): HID: Fix unit exponent parsing again Ondrej Zary (1): pata_isapnp: Don't use invalid I/O ports Oussama Ghorbel (3): ipv6: Allow the MTU of ipip6 tunnel to be set below 1280 ipv6: Fix the upper MTU limit in GRE tunnel ipv6: Initialize ip6_tnl.hlen in gre tunnel even if no route is found Phil Edworthy (1): ASoC: ak4642: prevent un-necessary changes to SG_SL1 Rafael J. Wysocki (1): acpi-cpufreq: Fail initialization if driver cannot be registered Randy Dunlap (3): fs/namei.c: fix new kernel-doc warning vfs: fix new kernel-doc warnings platform/x86: fix asus-wmi build error Richard Fitzgerald (2): ASoC: wm8962: Add ALC coefficient support ASoC: wm8962: Add EQ coefficient support Rob Herring (3): net: calxedaxgmac: fix clearing of old filter addresses net: calxedaxgmac: add uc and mc filter addresses in promiscuous mode net: calxedaxgmac: determine number of address filters at runtime Roland Dreier (2): target: Fix assignment of LUN in tracepoints target: Return an error for WRITE SAME with ANCHOR==1 Russ Dill (1): PM / hibernate: Move software_resume to late_initcall_sync Russell King - ARM Linux (1): ASoC: dpcm: improve robustness Salva Peiró (2): farsync: fix info leak in ioctl wanxl: fix info leak in ioctl Sebastian Hesselbarth (3): net: mv643xx_eth: update statistics timer from timer context only net: mv643xx_eth: fix orphaned statistics timer crash net: mv643xx_eth: fix missing device_node for port devices Seif Mazareeb (1): net: fix cipso packet validation when !NETLABEL Shaohua Li (2): raid5: set bio bi_vcnt 0 for discard request raid5: avoid finding "discard" stripe Simon Farnsworth (1): [media] saa7134: Fix crash when device is closed before streamoff Simon Horman (1): net: sh_eth: Correct fix for RX packet errors on R8A7740 Solomon Peachy (1): wireless: cw1200: acquire hwbus lock around cw1200_irq_handler() call. Srinivas Pandruvada (1): Thermal: x86_pkg_temp: change spin lock Stanislaw Gruszka (1): Revert "rt2x00pci: Use PCI MSIs whenever possible" Stefan Haberland (1): s390/dasd: check for availability of prefix command during format Steffen Klassert (5): xfrm: Fix replay size checking on async events xfrm: Decode sessions with output interface. ipsec: Don't update the pmtu on ICMPV6_DEST_UNREACH xfrm: Add refcount handling to queued policies xfrm: check for a vaild skb in xfrm_policy_queue_process Stephane Eranian (1): perf: Disable PERF_RECORD_MMAP2 support Stephen Warren (1): MAINTAINERS: Tegra updates, and driver ownership Sylwester Nawrocki (1): [media] vb2: Allow queuing OUTPUT buffers with zeroed 'bytesused' Takashi Iwai (12): Merge tag 'asoc-v3.12-rc5' of git://git.kernel.org/.../broonie/sound into for-linus ASoC: dmaengine: Use SNDRV_PCM_STREAM_LAST for array size ASoC: dapm: Fix source list debugfs outputs ASoC: dapm: Return -ENOMEM in snd_soc_dapm_new_dai_widgets() ASoC: ab8500: Add missing of NULL check of devm_kzalloc() ASoC: ab8500: Fix invalid cast to long pointer ASoC: wm_hubs: Add missing break in hp_supply_event() ASoC: wm0010: Fix possible out-of-bounds array read ASoC: wm8996: Fix negative array index read ASoC: rt5640: Fix ignored error checks ASoC: ml26124: Fix negative array index read ASoC: Use strlcpy() for copying in snd_soc_info_enum_double() Tejun Heo (1): cgroup: fix cgroup post-order descendant walk of empty subtree Tetsuo Handa (1): mutex: Avoid gcc version dependent __builtin_constant_p() usage Thomas Egerer (1): xfrm: Fix aevent generation for each received packet Thomas Gleixner (1): clockevents: Sanitize ticks to nsec conversion Thomas Hellstrom (2): drm/vmwgfx: Don't put resources with invalid id's on lru list drm/vmwgfx: Don't kill clients on VT switch Toshiaki Makita (4): bridge: Don't use VID 0 and 4095 in vlan filtering bridge: Apply the PVID to priority-tagged frames bridge: Fix the way the PVID is referenced bridge: Fix updating FDB entries when the PVID is applied Valentin Ilie (1): dma: edma: Fix memory leak Vasundhara Volam (1): be2net: pass if_id for v1 and V2 versions of TX_CREATE cmd Vinod Koul (2): MAINTAINERS: add the new dmaengine mailing list dmaengine: edma: fix another memory leak Vlad Yasevich (4): bridge: update mdb expiration timer upon reports. net: dst: provide accessor function to dst->xfrm sctp: Perform software checksum if packet has to be fragmented. bridge: Correctly clamp MAX forward_delay when enabling STP Vu Pham (1): iser-target: check device before dereferencing its variable Wei Yongjun (7): moxa: fix the error handling in moxart_mac_probe() qlcnic: add missing destroy_workqueue() on error path in qlcnic_probe() [media] adv7511: fix error return code in adv7511_probe() usbnet: fix error return code in usbnet_probe() ASoC: samsung: fix return value check in i2s_alloc_dai() target/pscsi: fix return value check ASoC: fsl_spdif: fix return value check in fsl_spdif_probe() Will Deacon (1): net: smc91x: dont't use SMC_outw for fixing up halfword-aligned data Yann Droneaud (1): IB/core: Temporarily disable create_flow/destroy_flow uverbs Yuchung Cheng (1): tcp: fix incorrect ca_state in tail loss probe Yuval Mintz (3): bnx2x: Fix Maximum CoS estimation for VFs bnx2x: Prevent an illegal pointer dereference during panic bnx2x: Prevent null pointer dereference on error flow Zhang Rui (2): Revert "drivers: thermal: parent virtual hwmon with thermal zone" Merge branch 'x86_pkg_temp' of .git into for-rc stephen hemminger (3): tc: export tc_defact.h to userspace netem: update backlog after drop netem: free skb's in tree on reset Documentation/connector/ucon.c | 2 +- MAINTAINERS | 86 ++++- Makefile | 2 +- arch/arm/boot/dts/integratorcp.dts | 9 +- arch/arm/net/bpf_jit_32.c | 1 + arch/parisc/configs/712_defconfig | 2 + arch/parisc/configs/a500_defconfig | 2 + arch/parisc/configs/b180_defconfig | 3 + arch/parisc/configs/c3000_defconfig | 3 + arch/parisc/configs/c8000_defconfig | 2 + arch/parisc/configs/default_defconfig | 2 + arch/parisc/kernel/cache.c | 1 - arch/parisc/kernel/head.S | 4 + arch/powerpc/net/bpf_jit_comp.c | 1 + arch/s390/include/asm/pgtable.h | 4 +- arch/s390/include/asm/timex.h | 28 +- arch/s390/kernel/compat_signal.c | 4 +- arch/s390/kernel/debug.c | 2 +- arch/s390/kvm/interrupt.c | 6 +- arch/s390/lib/delay.c | 14 +- arch/s390/net/bpf_jit_comp.c | 4 +- arch/sparc/net/bpf_jit_comp.c | 1 + arch/x86/net/bpf_jit_comp.c | 18 +- drivers/ata/ahci.c | 2 +- drivers/ata/ahci_platform.c | 2 +- drivers/ata/libahci.c | 10 +- drivers/ata/libata-eh.c | 6 +- drivers/ata/pata_isapnp.c | 2 +- drivers/connector/cn_proc.c | 18 + drivers/connector/connector.c | 9 +- drivers/cpufreq/acpi-cpufreq.c | 8 +- drivers/cpufreq/intel_pstate.c | 38 +- drivers/dma/edma.c | 2 + drivers/gpu/drm/drm_drv.c | 9 +- drivers/gpu/drm/i915/i915_drv.c | 5 +- drivers/gpu/drm/i915/i915_drv.h | 8 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 109 ++++-- drivers/gpu/drm/i915/i915_reg.h | 6 + drivers/gpu/drm/i915/intel_pm.c | 4 +- drivers/gpu/drm/radeon/atombios_encoders.c | 54 ++- drivers/gpu/drm/radeon/cik.c | 4 + drivers/gpu/drm/radeon/dce6_afmt.c | 3 + drivers/gpu/drm/radeon/evergreen_hdmi.c | 3 + drivers/gpu/drm/radeon/ni.c | 1 + drivers/gpu/drm/radeon/r600.c | 1 + drivers/gpu/drm/radeon/r600_hdmi.c | 3 + drivers/gpu/drm/radeon/radeon_connectors.c | 33 +- drivers/gpu/drm/radeon/radeon_cs.c | 3 +- drivers/gpu/drm/radeon/radeon_drv.c | 4 +- drivers/gpu/drm/radeon/radeon_uvd.c | 3 +- drivers/gpu/drm/radeon/si.c | 1 + drivers/gpu/drm/radeon/uvd_v1_0.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 17 +- drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 2 +- drivers/hid/hid-core.c | 12 +- drivers/hid/hid-ids.h | 6 + drivers/hid/hid-input.c | 13 +- drivers/hid/hid-wiimote-core.c | 5 +- drivers/hid/usbhid/hid-quirks.c | 3 + drivers/infiniband/Kconfig | 11 + drivers/infiniband/core/uverbs.h | 2 + drivers/infiniband/core/uverbs_cmd.c | 4 + drivers/infiniband/core/uverbs_main.c | 6 + drivers/infiniband/hw/mlx4/main.c | 2 + drivers/infiniband/ulp/isert/ib_isert.c | 2 +- drivers/md/bcache/request.c | 2 +- drivers/md/md.c | 5 +- drivers/md/raid1.c | 1 + drivers/md/raid10.c | 1 + drivers/md/raid5.c | 20 ++ drivers/media/dvb-frontends/tda10071.c | 9 +- drivers/media/i2c/ad9389b.c | 15 +- drivers/media/i2c/adv7511.c | 18 +- drivers/media/i2c/adv7842.c | 30 +- drivers/media/i2c/ths8200.c | 12 +- drivers/media/pci/saa7134/saa7134-video.c | 1 + drivers/media/platform/s5p-jpeg/jpeg-core.c | 1 + drivers/media/platform/sh_vou.c | 2 +- drivers/media/platform/soc_camera/mx3_camera.c | 5 +- drivers/media/tuners/e4000.c | 3 +- drivers/media/usb/stkwebcam/stk-webcam.c | 7 + drivers/media/usb/uvc/uvc_driver.c | 18 + drivers/media/v4l2-core/videobuf2-core.c | 4 +- drivers/media/v4l2-core/videobuf2-dma-contig.c | 87 ++++- drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 2 +- drivers/mtd/nand/pxa3xx_nand.c | 7 +- drivers/net/can/at91_can.c | 4 +- drivers/net/can/dev.c | 10 +- drivers/net/can/flexcan.c | 14 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 15 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 1 + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 40 +-- drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h | 38 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 388 +++++++++++---------- drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 29 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 2 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 2 +- drivers/net/ethernet/calxeda/xgmac.c | 23 +- drivers/net/ethernet/davicom/dm9000.c | 56 ++- drivers/net/ethernet/emulex/benet/be_cmds.c | 3 +- drivers/net/ethernet/freescale/gianfar.c | 38 +- drivers/net/ethernet/intel/igb/igb_ethtool.c | 2 + drivers/net/ethernet/marvell/mv643xx_eth.c | 7 +- drivers/net/ethernet/mellanox/mlx4/en_rx.c | 41 ++- drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 4 +- drivers/net/ethernet/moxa/moxart_ether.c | 22 +- .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 2 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 13 +- drivers/net/ethernet/renesas/sh_eth.c | 4 + drivers/net/ethernet/sfc/ef10.c | 87 +++-- drivers/net/ethernet/sfc/mcdi.c | 18 +- drivers/net/ethernet/sfc/mcdi_pcol.h | 56 ++- drivers/net/ethernet/sfc/nic.c | 9 +- drivers/net/ethernet/sfc/nic.h | 12 + drivers/net/ethernet/smsc/smc91x.h | 6 +- drivers/net/ethernet/ti/cpsw.c | 19 +- drivers/net/ethernet/ti/davinci_emac.c | 3 +- drivers/net/hamradio/yam.c | 1 - drivers/net/ieee802154/mrf24j40.c | 31 +- drivers/net/tun.c | 8 +- drivers/net/usb/ax88179_178a.c | 23 +- drivers/net/usb/qmi_wwan.c | 1 + drivers/net/usb/usbnet.c | 4 +- drivers/net/virtio_net.c | 14 +- drivers/net/wan/farsync.c | 1 + drivers/net/wan/wanxl.c | 1 + drivers/net/wireless/ath/ath9k/main.c | 23 +- drivers/net/wireless/ath/ath9k/xmit.c | 9 +- drivers/net/wireless/cw1200/cw1200_spi.c | 2 + drivers/net/wireless/iwlwifi/iwl-6000.c | 6 + drivers/net/wireless/iwlwifi/iwl-config.h | 1 + drivers/net/wireless/iwlwifi/iwl-trans.h | 6 +- drivers/net/wireless/iwlwifi/mvm/power.c | 5 +- drivers/net/wireless/iwlwifi/mvm/scan.c | 12 +- drivers/net/wireless/iwlwifi/pcie/drv.c | 42 +++ drivers/net/wireless/iwlwifi/pcie/trans.c | 8 +- drivers/net/wireless/iwlwifi/pcie/tx.c | 2 + drivers/net/wireless/mwifiex/join.c | 10 +- drivers/net/wireless/mwifiex/main.c | 6 +- drivers/net/wireless/mwifiex/sta_event.c | 3 +- drivers/net/wireless/rt2x00/rt2x00pci.c | 9 +- drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 3 +- drivers/net/xen-netback/xenbus.c | 4 + drivers/platform/x86/Kconfig | 1 + drivers/platform/x86/sony-laptop.c | 26 +- drivers/s390/block/dasd_eckd.c | 98 ++++-- drivers/s390/char/sclp.c | 4 +- drivers/s390/char/vmlogrdr.c | 2 +- drivers/s390/cio/cio.c | 4 +- drivers/s390/cio/qdio_main.c | 10 +- drivers/scsi/BusLogic.c | 16 +- drivers/scsi/qla2xxx/qla_dbg.c | 2 +- drivers/scsi/qla2xxx/qla_isr.c | 9 + drivers/scsi/sd.c | 2 +- drivers/staging/media/msi3101/Kconfig | 1 + drivers/staging/media/msi3101/sdr-msi3101.c | 10 +- drivers/target/target_core_pscsi.c | 8 +- drivers/target/target_core_sbc.c | 5 + drivers/target/target_core_xcopy.c | 53 ++- drivers/thermal/samsung/exynos_thermal_common.c | 2 - drivers/thermal/samsung/exynos_tmu.c | 12 +- drivers/thermal/samsung/exynos_tmu.h | 7 +- drivers/thermal/samsung/exynos_tmu_data.c | 30 +- drivers/thermal/samsung/exynos_tmu_data.h | 13 +- drivers/thermal/thermal_hwmon.c | 2 +- drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 1 + drivers/thermal/x86_pkg_temp_thermal.c | 14 +- drivers/vhost/scsi.c | 2 +- fs/dcache.c | 15 +- fs/ecryptfs/crypto.c | 2 +- fs/ecryptfs/keystore.c | 3 +- fs/file_table.c | 4 +- fs/jfs/jfs_inode.c | 3 +- fs/namei.c | 3 +- fs/seq_file.c | 2 + include/linux/filter.h | 15 +- include/linux/netdevice.h | 5 +- include/linux/yam.h | 2 +- include/net/cipso_ipv4.h | 6 +- include/net/dst.h | 12 + include/net/ip6_route.h | 6 +- include/net/mac802154.h | 2 +- include/net/sock.h | 6 +- include/sound/cs42l52.h | 2 + include/trace/events/target.h | 4 +- include/uapi/drm/drm_mode.h | 2 + include/uapi/linux/tc_act/Kbuild | 1 + include/{ => uapi}/linux/tc_act/tc_defact.h | 2 +- include/uapi/rdma/ib_user_verbs.h | 6 + kernel/cgroup.c | 14 +- kernel/events/core.c | 4 + kernel/mutex.c | 32 +- kernel/power/hibernate.c | 2 +- kernel/time/clockevents.c | 65 +++- net/8021q/vlan_netlink.c | 2 +- net/batman-adv/main.c | 5 +- net/batman-adv/network-coding.c | 28 +- net/batman-adv/network-coding.h | 14 +- net/bridge/br_fdb.c | 4 +- net/bridge/br_mdb.c | 2 +- net/bridge/br_multicast.c | 38 +- net/bridge/br_netlink.c | 2 +- net/bridge/br_private.h | 5 +- net/bridge/br_stp_if.c | 2 +- net/bridge/br_vlan.c | 125 ++++--- net/compat.c | 2 + net/core/dev.c | 3 +- net/core/filter.c | 8 +- net/core/secure_seq.c | 2 + net/core/sock.c | 1 + net/ieee802154/6lowpan.c | 5 + net/ipv4/inet_hashtables.c | 2 +- net/ipv4/ip_output.c | 13 +- net/ipv4/ip_vti.c | 14 +- net/ipv4/route.c | 2 +- net/ipv4/tcp_input.c | 9 +- net/ipv4/tcp_output.c | 14 +- net/ipv4/xfrm4_policy.c | 1 + net/ipv6/ah6.c | 3 +- net/ipv6/esp6.c | 3 +- net/ipv6/inet6_hashtables.c | 2 +- net/ipv6/ip6_gre.c | 6 +- net/ipv6/ip6_output.c | 29 +- net/ipv6/ip6_tunnel.c | 12 +- net/ipv6/ipcomp6.c | 3 +- net/ipv6/route.c | 46 ++- net/ipv6/udp.c | 5 +- net/ipv6/xfrm6_policy.c | 1 + net/key/af_key.c | 3 +- net/l2tp/l2tp_core.c | 36 +- net/l2tp/l2tp_core.h | 3 + net/l2tp/l2tp_ppp.c | 4 + net/mac80211/cfg.c | 2 +- net/mac80211/ieee80211_i.h | 3 + net/mac80211/offchannel.c | 2 + net/mac80211/rx.c | 3 + net/mac80211/scan.c | 19 + net/mac80211/status.c | 3 + net/mac80211/tx.c | 3 +- net/mac80211/util.c | 9 +- net/netfilter/nf_conntrack_h323_main.c | 4 +- net/sched/sch_fq.c | 22 +- net/sched/sch_netem.c | 17 + net/sctp/output.c | 3 +- net/socket.c | 24 +- net/unix/af_unix.c | 10 + net/unix/diag.c | 1 + net/wireless/core.c | 23 +- net/wireless/core.h | 3 + net/wireless/ibss.c | 3 + net/wireless/nl80211.c | 4 +- net/wireless/radiotap.c | 7 +- net/xfrm/xfrm_policy.c | 28 +- net/xfrm/xfrm_replay.c | 54 +-- net/xfrm/xfrm_user.c | 5 +- sound/soc/codecs/ab8500-codec.c | 14 +- sound/soc/codecs/ak4642.c | 2 +- sound/soc/codecs/cs42l52.c | 93 ++--- sound/soc/codecs/cs42l52.h | 2 +- sound/soc/codecs/ml26124.c | 2 + sound/soc/codecs/rt5640.c | 7 +- sound/soc/codecs/wm0010.c | 8 +- sound/soc/codecs/wm5110.c | 12 + sound/soc/codecs/wm8962.c | 22 +- sound/soc/codecs/wm8996.c | 2 + sound/soc/codecs/wm_adsp.c | 27 +- sound/soc/codecs/wm_hubs.c | 1 + sound/soc/fsl/eukrea-tlv320.c | 15 +- sound/soc/fsl/fsl_spdif.c | 4 +- sound/soc/kirkwood/kirkwood-i2s.c | 2 +- sound/soc/samsung/i2s.c | 2 +- sound/soc/sh/rcar/core.c | 31 +- sound/soc/soc-core.c | 5 +- sound/soc/soc-dapm.c | 4 +- sound/soc/soc-generic-dmaengine-pcm.c | 2 +- sound/soc/soc-pcm.c | 52 +-- tools/perf/util/event.c | 30 +- tools/perf/util/evsel.c | 1 - tools/perf/util/probe-finder.c | 2 +- .../perf/util/scripting-engines/trace-event-perl.c | 2 +- 280 files changed, 2464 insertions(+), 1239 deletions(-) rename include/{ => uapi}/linux/tc_act/tc_defact.h (75%)

2 1

[alsa-devel] NVIDIA HDMI: Channel remapping does not work for stereo?
by Anssi Hannula 04 Nov '13

04 Nov '13

Hi! I just noticed while testing the ALSA HDMI channel remapping code that my NVIDIA codec 0x10de0015 does not seem to follow the Audio Sample Packet (ASP) channel mapping (set by verb F34h as per HDA spec 7.3.3.41) when playing back stereo audio. This can be reproduced by e.g.: $ speaker-test -c2 -Dhdmi:CARD=NVidia,DEV=0 -m FR,FL The channels are reversed compared to what the printout is (i.e. the codec plays the streams straight-through instead of swapping channels as instructed). E.g. this works expectedly, however: $ speaker-test -c4 -Dhdmi:CARD=NVidia,DEV=1 -m FR,FL,RR,RL (note that recent sound git master or for-next is needed for these kind of remappings to work properly at all) On Intel HDMI codec 0x80862806 both work. While stereo right-left swapping is admittedly a rather corner-case situation, I guess we should probably refuse such chmaps when they are not supported. Aaron, do you have any information on whether this affects all NVIDIA HDMI codecs? -- Anssi Hannula

3 5

Re: [alsa-devel] [Alsa-user] hdmi sound rerouted?
by Dagg Stompler 04 Nov '13

04 Nov '13

> ----- Original Message ----- > From: Deucher, Alexander > Sent: 10/19/13 03:59 PM > To: Dagg Stompler, Takashi Iwai > Subject: RE: [alsa-devel] [Alsa-user] hdmi sound rerouted? > > > -----Original Message----- > > > From: Dagg Stompler [mailto:daggs@gmx.com] > > > Sent: Saturday, October 19, 2013 5:49 AM > > > To: Takashi Iwai; Deucher, Alexander > > > Cc: Clemens Ladisch; alsa-user(a)lists.sourceforge.net; alsa-devel@alsa- > > > project.org > > > Subject: Re: [alsa-devel] [Alsa-user] hdmi sound rerouted? > > > > > > > ----- Original Message ----- > > > > From: Takashi Iwai > > > > Sent: 10/08/13 10:49 AM > > > > To: Deucher, Alexander > > > > Subject: Re: [alsa-devel] [Alsa-user] hdmi sound rerouted? > > > > > > > > At Mon, 7 Oct 2013 13:36:24 +0000, > > > > Deucher, Alexander wrote: > > > > > > > > > > > -----Original Message----- > > > > > > From: Takashi Iwai [mailto:tiwai@suse.de] > > > > > > Sent: Monday, September 30, 2013 5:18 AM > > > > > > To: Deucher, Alexander > > > > > > Cc: Clemens Ladisch; Dagg Stompler; alsa-user(a)lists.sourceforge.net; > > > alsa- > > > > > > devel(a)alsa-project.org > > > > > > Subject: Re: [alsa-devel] [Alsa-user] hdmi sound rerouted? > > > > > > > > > > > > At Mon, 30 Sep 2013 02:23:22 +0000, > > > > > > Deucher, Alexander wrote: > > > > > > > > > > > > > > > -----Original Message----- > > > > > > > > From: Clemens Ladisch [mailto:cladisch@googlemail.com] > > > > > > > > Sent: Saturday, September 28, 2013 6:33 PM > > > > > > > > To: Dagg Stompler > > > > > > > > Cc: alsa-user(a)lists.sourceforge.net; Deucher, Alexander; alsa- > > > > > > devel@alsa- > > > > > > > > project.org > > > > > > > > Subject: Re: [Alsa-user] [alsa-devel] hdmi sound rerouted? > > > > > > > > > > > > > > > > Dagg Stompler wrote: > > > > > > > > >> daggs(a)gmx.com wrote: > > > > > > > > >>> card 0: PCH [HDA Intel PCH], device 3: HDMI 0 [HDMI 0] > > > > > > > > >>> card 1: Generic [HD-Audio Generic], device 3: HDMI 0 [HDMI 0] > > > > > > > > >>> card 2: HDMI [HDA ATI HDMI], device 3: HDMI 0 [HDMI 0] > > > > > > > > >> > > > > > > > > >> The second one is called "Generic" because your kernel does not > > > (yet) > > > > > > > > >> know the hardware. > > > > > > > > >> > > > > > > > > >>> 01:00.1 Audio device: Advanced Micro Devices, Inc. [AMD/ATI] > > > Cedar > > > > > > > > HDMI Audio [Radeon HD 5400/6300 Series] > > > > > > > > >>> 06:00.1 Audio device: Advanced Micro Devices, Inc. [AMD/ATI] > > > RV635 > > > > > > > > HDMI Audio [Radeon HD 3600 Series] > > > > > > > > >> > > > > > > > > >> These are the HDMI outputs of *two* graphics cards. The first > > > one's > > > > > > > > >> model is so new that the driver doesn't know it. > > > > > > > > > > > > > > > > > > the 3600 doesn't have hdmi socket so I think it is irrelevant for my > > > issue. > > > > > > > > > > > > > > > > The RV635 chip does support HDMI outputs (even if none are > > > actually > > > > > > > > connected), so the corresponding PCI device shows up here. > > > > > > > > > > > > > > > > >>> If you update the kernel, you will get two devices named "HDA > > > ATI > > > > > > > > HDMI". > > > > > > > > > > > > > > > > > > upgrade to where? > > > > > > > > > > > > > > > > Oops. Even the latest driver lacks the PCI IDs of many HDMI HDA > > > devices > > > > > > > > (aa50/aa58/aa60/aa68/aa80/aa88/aa90/aa98: > > > > > > > > Cypress/Juniper/Redwood/Cedar/ > > > > > > > > Cayman+Antilles/Barts/Turks/Caicos). > > > > > > > > > > > > > > > > Alex, are these devices that require disabling snooping? > > > > > > > > > > > > > > Sorry what does snooping mean in this context? > > > > > > > > > > > > Most of HD-audio controller have a snoop control, but the recent AMD > > > > > > HDMI audio controller don't have the feature, thus the driver must use > > > > > > the non-cached pages. At least, PCI ID 1002:aaa0, aaa8 and aab0 are > > > > > > known to require such. > > > > > > > > > > > > Now the question is whether all new chips above (aa50,...) require the > > > > > > same workaround, too. Could you check this or forward the inquiry to > > > > > > someone in AMD? > > > > > > > > > > According to our internal teams, disabling snooping is only required on > > > the audio parts included in Evergreen and Northern Islands GPUs. Older chips > > > like R7xx (aa48) and newer chips like Southern Islands (aaa0) are able to use > > > snooping. I'm not real familiar with the audio portions of the GPUs so if you > > > need further clarification, let me know. > > > > > > > > Thanks for the information. > > > > > > > > Though, it's strange that the information doesn't match with what I've > > > > heard (and also with what I've tested with a laptop). I've heard that > > > > it's Southern Island HDMI that needs the snoop-disablement. > > > > > > > > Could you ask again whether it's really Evergreen / Nothern Islands? > > > > > > > > > > > > thanks, > > > > > > > > Takashi > > > > > > > > > > > > > > Alex > > > > > > > > > > > > > > > > > FWIW, such a chip needs to set AZX_DRIVER_ATIHDMI_NS bits in > > > > > > driver_data of pci entries in sound/pci/hda/hda_intel.c. > > > > > > > > > > > > > > > > > > thanks, > > > > > > > > > > > > Takashi > > > > > > > > > > > > > > > > any updates on the matter guys? > > > > > > Haven't heard back. I'll ping them again. > > > > Alex sorry for nudging, any updates?

2 1

[alsa-devel] [PATCH v2 5/6] ASoC: sirf-inner: add mach driver for SiRFSoC internal codec
by Barry Song 04 Nov '13

04 Nov '13

From: Rongjun Ying <Rongjun.Ying(a)csr.com> This connects DMA, CPU DAI and Codec DAI together and works as a mach driver. Signed-off-by: Rongjun Ying <Rongjun.Ying(a)csr.com> Signed-off-by: Barry Song <Baohua.Song(a)csr.com> --- -v2: use extcon for both Linux and Android support; use DAPM to replace legacy kcontrol sound/soc/sirf/Kconfig | 5 + sound/soc/sirf/Makefile | 2 + sound/soc/sirf/sirf-inner.c | 237 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 244 insertions(+) create mode 100644 sound/soc/sirf/sirf-inner.c diff --git a/sound/soc/sirf/Kconfig b/sound/soc/sirf/Kconfig index afa3952..564b0ec 100644 --- a/sound/soc/sirf/Kconfig +++ b/sound/soc/sirf/Kconfig @@ -11,3 +11,8 @@ config SND_SIRF_SOC_INNER config SND_SOC_SIRF_USP tristate + +config SND_SIRF_INNER + tristate "SoC Audio support for SiRF inner codec of SiRF EVB" + depends on SND_SIRF_SOC + select SND_SIRF_SOC_INNER diff --git a/sound/soc/sirf/Makefile b/sound/soc/sirf/Makefile index 8517c67..80abdf6 100644 --- a/sound/soc/sirf/Makefile +++ b/sound/soc/sirf/Makefile @@ -1,9 +1,11 @@ snd-soc-sirf-objs := sirf-pcm.o +snd-soc-sirf-inner-objs := sirf-inner.o snd-soc-sirf-soc-inner-objs := sirf-soc-inner.o snd-soc-sirf-i2s-objs := sirf-i2s.o snd-soc-sirf-usp-objs := sirf-usp.o obj-$(CONFIG_SND_SIRF_SOC) += snd-soc-sirf.o +obj-$(CONFIG_SND_SIRF_INNER) += snd-soc-sirf-inner.o obj-$(CONFIG_SND_SIRF_SOC_INNER) += snd-soc-sirf-soc-inner.o obj-$(CONFIG_SND_SOC_SIRF_I2S) += snd-soc-sirf-i2s.o obj-$(CONFIG_SND_SOC_SIRF_USP) += snd-soc-sirf-usp.o diff --git a/sound/soc/sirf/sirf-inner.c b/sound/soc/sirf/sirf-inner.c new file mode 100644 index 0000000..e36ac5e --- /dev/null +++ b/sound/soc/sirf/sirf-inner.c @@ -0,0 +1,237 @@ +/* + * SiRF inner audio device driver + * + * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. + * + * Licensed under GPLv2 or later. + */ + +#include <linux/platform_device.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/gpio.h> +#include <linux/of_gpio.h> + +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/soc.h> + +#include <linux/extcon.h> +#include <linux/extcon/extcon-gpio.h> + +#define SIRF_JACK_GPIO_DEBOUNCE_TIME 200 /* in ms */ +struct sirf_inner_extcon_info { + struct platform_device pdev; + struct gpio_extcon_platform_data extcon_data; + int last_state; + int state_changed; +}; + +struct sirf_inner_card { + unsigned int gpio_hp_pa; + unsigned int gpio_spk_pa; + struct platform_device *sirf_inner_device; + struct sirf_inner_extcon_info extcon_info; +}; + +static int sirf_inner_hp_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *ctrl, int event) +{ + struct snd_soc_dapm_context *dapm = w->dapm; + struct snd_soc_card *card = dapm->card; + struct sirf_inner_card *sinner_card = snd_soc_card_get_drvdata(card); + int on = !SND_SOC_DAPM_EVENT_OFF(event); + if (gpio_is_valid(sinner_card->gpio_hp_pa)) + gpio_direction_output(sinner_card->gpio_hp_pa, on); + return 0; +} + +static int sirf_inner_spk_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *ctrl, int event) +{ + struct snd_soc_dapm_context *dapm = w->dapm; + struct snd_soc_card *card = dapm->card; + struct sirf_inner_card *sinner_card = snd_soc_card_get_drvdata(card); + int on = !SND_SOC_DAPM_EVENT_OFF(event); + + if (sinner_card->extcon_info.state_changed) { + sinner_card->extcon_info.state_changed = 0; + if (!sinner_card->extcon_info.last_state) + gpio_direction_output(sinner_card->gpio_spk_pa, 0); + else + gpio_direction_output(sinner_card->gpio_spk_pa, 1); + } else { + if (gpio_is_valid(sinner_card->gpio_spk_pa)) + gpio_direction_output(sinner_card->gpio_spk_pa, on); + } + + return 0; +} +static const struct snd_soc_dapm_widget sirf_inner_dapm_widgets[] = { + SND_SOC_DAPM_HP("Hp", sirf_inner_hp_event), + SND_SOC_DAPM_SPK("Ext Spk", sirf_inner_spk_event), + SND_SOC_DAPM_MIC("Ext Mic", NULL), +}; + +static const struct snd_soc_dapm_route intercon[] = { + {"Hp", NULL, "HPOUTL"}, + {"Hp", NULL, "HPOUTR"}, + {"Ext Spk", NULL, "SPKOUT"}, + {"MICIN1", NULL, "Mic Bias"}, + {"Mic Bias", NULL, "Ext Mic"}, +}; + +/* Digital audio interface glue - connects codec <--> CPU */ +static struct snd_soc_dai_link sirf_inner_dai_links[] = { + { + .name = "SiRF inner", + .stream_name = "SiRF inner", + .codec_dai_name = "sirf-soc-inner", + .platform_name = "sirf-pcm-audio.1", + }, +}; + +/* Audio machine driver */ +static struct snd_soc_card snd_soc_sirf_inner_card = { + .name = "SiRF inner", + .owner = THIS_MODULE, + .dai_link = sirf_inner_dai_links, + .num_links = ARRAY_SIZE(sirf_inner_dai_links), + .dapm_widgets = sirf_inner_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(sirf_inner_dapm_widgets), + .dapm_routes = intercon, + .num_dapm_routes = ARRAY_SIZE(intercon), +}; + +static int sirf_inner_probe(struct platform_device *pdev) +{ + struct snd_soc_card *card = &snd_soc_sirf_inner_card; + struct sirf_inner_card *sinner_card; + int ret; + + sinner_card = devm_kzalloc(&pdev->dev, sizeof(struct sirf_inner_card), + GFP_KERNEL); + if (sinner_card == NULL) + return -ENOMEM; + + sinner_card->sirf_inner_device = platform_device_alloc("soc-audio", -1); + if (!sinner_card->sirf_inner_device) + return -ENOMEM; + + sirf_inner_dai_links[0].cpu_of_node = + of_parse_phandle(pdev->dev.of_node, "sirf,inner-platform", 0); + sirf_inner_dai_links[0].codec_of_node = + of_parse_phandle(pdev->dev.of_node, "sirf,inner-codec", 0); + sinner_card->gpio_spk_pa = of_get_named_gpio(pdev->dev.of_node, + "spk-pa-gpios", 0); + sinner_card->gpio_hp_pa = of_get_named_gpio(pdev->dev.of_node, + "hp-pa-gpios", 0); + if (gpio_is_valid(sinner_card->gpio_spk_pa)) + gpio_request(sinner_card->gpio_spk_pa, "SPA_PA_SD"); + if (gpio_is_valid(sinner_card->gpio_hp_pa)) + gpio_request(sinner_card->gpio_hp_pa, "HP_PA_SD"); + + card->dev = &pdev->dev; + snd_soc_card_set_drvdata(card, sinner_card); + platform_set_drvdata(pdev, card); + if (gpio_is_valid(sinner_card->gpio_hp_pa)) + gpio_direction_output(sinner_card->gpio_hp_pa, 0); + if (gpio_is_valid(sinner_card->gpio_spk_pa)) + gpio_direction_output(sinner_card->gpio_spk_pa, 0); + + platform_set_drvdata(sinner_card->sirf_inner_device, + &snd_soc_sirf_inner_card); + + ret = platform_device_add(sinner_card->sirf_inner_device); + if (ret) { + platform_device_put(sinner_card->sirf_inner_device); + return ret; + } + + sinner_card->extcon_info.extcon_data.name = "h2w"; + sinner_card->extcon_info.extcon_data.debounce = + SIRF_JACK_GPIO_DEBOUNCE_TIME; + sinner_card->extcon_info.extcon_data.irq_flags = + IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_SHARED; + sinner_card->extcon_info.extcon_data.state_on = "0"; + sinner_card->extcon_info.extcon_data.state_off = "1"; + sinner_card->extcon_info.extcon_data.gpio = + of_get_named_gpio(pdev->dev.of_node, + "hp-switch-gpios", 0); + + sinner_card->extcon_info.pdev.name = "extcon-gpio"; + sinner_card->extcon_info.pdev.id = pdev->id; + sinner_card->extcon_info.pdev.dev.platform_data = + &sinner_card->extcon_info.extcon_data; + + return platform_device_register(&sinner_card->extcon_info.pdev); +} + +static int sirf_inner_remove(struct platform_device *pdev) +{ + struct snd_soc_card *card = platform_get_drvdata(pdev); + struct sirf_inner_card *sinner_card = snd_soc_card_get_drvdata(card); + + if (gpio_is_valid(sinner_card->gpio_hp_pa)) + gpio_free(sinner_card->gpio_hp_pa); + if (gpio_is_valid(sinner_card->gpio_spk_pa)) + gpio_free(sinner_card->gpio_spk_pa); + + platform_device_put(sinner_card->sirf_inner_device); + return 0; +} + +#ifdef CONFIG_PM_SLEEP +static int sirf_inner_resume(struct device *dev) +{ + struct snd_soc_card *card = dev_get_drvdata(dev); + struct sirf_inner_card *sinner_card = snd_soc_card_get_drvdata(card); + struct extcon_dev *edev; + int state; + + edev = extcon_get_extcon_dev(sinner_card->extcon_info.extcon_data.name); + state = gpio_get_value(sinner_card->extcon_info.extcon_data.gpio); + if (state != sinner_card->extcon_info.last_state) { + sinner_card->extcon_info.state_changed = 1; + sinner_card->extcon_info.last_state = state; + extcon_set_state(edev, state); + } + return 0; +} + +static int sirf_inner_suspend(struct device *dev) +{ + struct snd_soc_card *card = dev_get_drvdata(dev); + struct sirf_inner_card *sinner_card = snd_soc_card_get_drvdata(card); + sinner_card->extcon_info.last_state = gpio_get_value(sinner_card->extcon_info.extcon_data.gpio); + if (gpio_is_valid(sinner_card->gpio_spk_pa)) + gpio_direction_output(sinner_card->gpio_spk_pa, 0); + return 0; +} +#endif + +static const struct of_device_id sirf_inner_of_match[] = { + {.compatible = "sirf,sirf-inner", }, + { }, +}; +MODULE_DEVICE_TABLE(of, sirf_inner_of_match); + +static const struct dev_pm_ops sirf_inner_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(sirf_inner_suspend, sirf_inner_resume) +}; + +static struct platform_driver sirf_inner_driver = { + .driver = { + .name = "sirf-inner", + .owner = THIS_MODULE, + .pm = &sirf_inner_pm_ops, + .of_match_table = sirf_inner_of_match, + }, + .probe = sirf_inner_probe, + .remove = sirf_inner_remove, +}; +module_platform_driver(sirf_inner_driver); + +MODULE_AUTHOR("RongJun Ying <RongJun.Ying(a)csr.com>"); +MODULE_DESCRIPTION("ALSA SoC SIRF inner AUDIO driver"); +MODULE_LICENSE("GPL v2"); -- 1.8.2.3

2 2

[alsa-devel] include/uapi/firewire.h for other firewire drivers
by Takashi Sakamoto 03 Nov '13

03 Nov '13

Hi Clemens, About include/uapi/firewire.h, I'd like you to give me an advice. I'm sorry but I have little knowledgement about Dice chipset. So here I want to know what I should do for snd-fireworks/snd-bebob. The header file includes an interface for users to know its already streaming or not, and lock it. But for Fireworks/BeBoB, I think checking CMP connections do the same thing. Current FFADO can be failed when CMP connections on the device are established, and ALSA can do the same. (but there are some problems. both drivers set sampling rate before checking CMP connections. For this I have a plan to post a patch for both FFADO and ALSA.) Should I implement the same lock for Fireworks/BeBoB drivers? Regards Takashi Sakamoto

2 7

[alsa-devel] [PATCH v3] ASoC: Add pinctrl PM to components of active DAIs
by Nicolin Chen 01 Nov '13

01 Nov '13

It's quite popular that more drivers are using pinctrl PM, for example: (Documentation/devicetree/bindings/arm/primecell.txt). Just like what runtime PM does, it would de-active and en-active pin group depending on whether it's being used or not. And this pinctrl PM might be also beneficial to cpu dai drivers because they might have actual pinctrl so as to sleep their pins and wake them up as needed. To achieve this goal, this patch sets pins to the default state during resume or startup; While during suspend and shutdown, it would set pins to the sleep state. As pinctrl PM would return zero if there is no such pinctrl sleep state settings, this patch would not break current ASoC subsystem directly. [ However, there is still an exception that the patch can not handle, that is, when cpu dai driver does not have pinctrl property but another device has it. (The AUDMUX <-> SSI on Freescale i.MX6 series for example. SSI as a cpu dai doesn't contain pinctrl property while AUDMUX, an Audio Multiplexer, has it). In this case, this kind of cpu dai driver needs to find a way to obtain the pinctrl property as its own, by moving property from AUDMUX to SSI, or creating a pins link/dependency between these two devices, or using a more decent way after we figure it out. ] Signed-off-by: Nicolin Chen <b42378(a)freescale.com> --- Changelog: v3: * Add pinctrl_pm() for codec_dai/codec * Add more proper active check for each pinctrl_pm_select_xx() v2: * Add cpu_dai->active check sound/soc/soc-core.c | 33 +++++++++++++++++++++++++++++++++ sound/soc/soc-pcm.c | 10 ++++++++++ 2 files changed, 43 insertions(+) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index bdc1d74..4e53d87 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -662,6 +662,8 @@ int snd_soc_suspend(struct device *dev) codec->cache_sync = 1; if (codec->using_regmap) regcache_mark_dirty(codec->control_data); + /* deactivate pins to sleep state */ + pinctrl_pm_select_sleep_state(codec->dev); break; default: dev_dbg(codec->dev, @@ -679,6 +681,9 @@ int snd_soc_suspend(struct device *dev) if (cpu_dai->driver->suspend && cpu_dai->driver->ac97_control) cpu_dai->driver->suspend(cpu_dai); + + /* deactivate pins to sleep state */ + pinctrl_pm_select_sleep_state(cpu_dai->dev); } if (card->suspend_post) @@ -807,6 +812,16 @@ int snd_soc_resume(struct device *dev) if (list_empty(&card->codec_dev_list)) return 0; + /* activate pins from sleep state */ + for (i = 0; i < card->num_rtd; i++) { + struct snd_soc_dai *cpu_dai = card->rtd[i].cpu_dai; + struct snd_soc_dai *codec_dai = card->rtd[i].codec_dai; + if (cpu_dai->active) + pinctrl_pm_select_default_state(cpu_dai->dev); + if (codec_dai->active) + pinctrl_pm_select_default_state(codec_dai->dev); + } + /* AC97 devices might have other drivers hanging off them so * need to resume immediately. Other drivers don't have that * problem and may take a substantial amount of time to resume @@ -1929,6 +1944,14 @@ int snd_soc_poweroff(struct device *dev) snd_soc_dapm_shutdown(card); + /* deactivate pins to sleep state */ + for (i = 0; i < card->num_rtd; i++) { + struct snd_soc_dai *cpu_dai = card->rtd[i].cpu_dai; + struct snd_soc_dai *codec_dai = card->rtd[i].codec_dai; + pinctrl_pm_select_sleep_state(codec_dai->dev); + pinctrl_pm_select_sleep_state(cpu_dai->dev); + } + return 0; } EXPORT_SYMBOL_GPL(snd_soc_poweroff); @@ -3767,6 +3790,16 @@ int snd_soc_register_card(struct snd_soc_card *card) if (ret != 0) soc_cleanup_card_debugfs(card); + /* deactivate pins to sleep state */ + for (i = 0; i < card->num_rtd; i++) { + struct snd_soc_dai *cpu_dai = card->rtd[i].cpu_dai; + struct snd_soc_dai *codec_dai = card->rtd[i].codec_dai; + if (!codec_dai->active) + pinctrl_pm_select_sleep_state(codec_dai->dev); + if (!cpu_dai->active) + pinctrl_pm_select_sleep_state(cpu_dai->dev); + } + return ret; } EXPORT_SYMBOL_GPL(snd_soc_register_card); diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index d81b792..1f0aeea 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -183,6 +183,8 @@ static int soc_pcm_open(struct snd_pcm_substream *substream) struct snd_soc_dai_driver *codec_dai_drv = codec_dai->driver; int ret = 0; + pinctrl_pm_select_default_state(cpu_dai->dev); + pinctrl_pm_select_default_state(codec_dai->dev); pm_runtime_get_sync(cpu_dai->dev); pm_runtime_get_sync(codec_dai->dev); pm_runtime_get_sync(platform->dev); @@ -317,6 +319,10 @@ out: pm_runtime_put(platform->dev); pm_runtime_put(codec_dai->dev); pm_runtime_put(cpu_dai->dev); + if (!codec_dai->active) + pinctrl_pm_select_sleep_state(codec_dai->dev); + if (!cpu_dai->active) + pinctrl_pm_select_sleep_state(cpu_dai->dev); return ret; } @@ -426,6 +432,10 @@ static int soc_pcm_close(struct snd_pcm_substream *substream) pm_runtime_put(platform->dev); pm_runtime_put(codec_dai->dev); pm_runtime_put(cpu_dai->dev); + if (!codec_dai->active) + pinctrl_pm_select_sleep_state(codec_dai->dev); + if (!cpu_dai->active) + pinctrl_pm_select_sleep_state(cpu_dai->dev); return 0; } -- 1.8.4

2 1

[alsa-devel] [PATCH] ASoC: dpcm: improve robustness
by Russell King - ARM Linux 01 Nov '13

01 Nov '13

Mark, Liam, You may also wish to consider adding this patch as well - it avoids oopsing due to a NULL be_substream when writing be_substream->runtime if the frontend is marked as having a playback/capture stream but there is no backend. I found this with Liam's "Explicitly set capture/playback support in DAI links" patch applied, and I'd configured the FE to have both capture and playback, but I'd forgotten to configure the BE appropriately. It seems nicer to gracefully handle this than oops the kernel. 8<===== From: Russell King <rmk+kernel(a)arm.linux.org.uk> ASoC: dpcm: improve robustness Avoid oopsing if there is no backend stream associated with a front end stream. Signed-off-by: Russell King <rmk+kernel(a)arm.linux.org.uk> --- sound/soc/soc-pcm.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 7798072c45ea..419af79fa30e 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1036,6 +1036,12 @@ static int dpcm_be_dai_startup(struct snd_soc_pcm_runtime *fe, int stream) struct snd_pcm_substream *be_substream = snd_soc_dpcm_get_substream(be, stream); + if (!be_substream) { + dev_err(be->dev, "ASoC: no backend %s stream\n", + stream ? "capture" : "playback"); + continue; + } + /* is this op for this BE ? */ if (!snd_soc_dpcm_be_can_update(fe, be, stream)) continue; @@ -1053,7 +1059,8 @@ static int dpcm_be_dai_startup(struct snd_soc_pcm_runtime *fe, int stream) (be->dpcm[stream].state != SND_SOC_DPCM_STATE_CLOSE)) continue; - dev_dbg(be->dev, "ASoC: open BE %s\n", be->dai_link->name); + dev_dbg(be->dev, "ASoC: open %s BE %s\n", + stream ? "capture" : "playback", be->dai_link->name); be_substream->runtime = be->dpcm[stream].runtime; err = soc_pcm_open(be_substream); -- 1.7.4.4

2 1