1. 04 Apr, 2014 2 commits
  2. 03 Apr, 2014 4 commits
  3. 31 Mar, 2014 6 commits
  4. 26 Mar, 2014 1 commit
  5. 25 Mar, 2014 24 commits
    • Mark Brown's avatar
    • Mark Brown's avatar
    • Mark Brown's avatar
    • Mark Brown's avatar
      Merge tag 'asoc-v3.15-rcar' into asoc-next · b5f93fae
      Mark Brown authored
      ASoC: A few more fixes for rcar
      
      Since Linus hasn't done the release yet and Morimoto-san here are some
      additional bug fixes for rcar which Morimoto-san sent overnight.
      
      # gpg: Signature made Mon 24 Mar 2014 11:21:18 GMT using RSA key ID 7EA229BD
      # gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>"
      # gpg:                 aka "Mark Brown <broonie@debian.org>"
      # gpg:                 aka "Mark Brown <broonie@kernel.org>"
      # gpg:                 aka "Mark Brown <broonie@tardis.ed.ac.uk>"
      # gpg:                 aka "Mark Brown <broonie@linaro.org>"
      # gpg:                 aka "Mark Brown <Mark.Brown@linaro.org>"
      b5f93fae
    • Mark Brown's avatar
      Merge tag 'asoc-v3.15-3' into asoc-next · 8efe588b
      Mark Brown authored
      ASoC: Updates for v3.15
      
      A few more updates for the merge window:
      
       - Fixes for the simple-card DAI format DT mess.
       - A new driver for Cirrus cs42xx8 devices.
       - DT support for a couple more devices.
       - A revert of a previous buggy fix for soc-pcm, plus a few more fixes
         and cleanups.
      
      # gpg: Signature made Sun 23 Mar 2014 16:56:11 GMT using RSA key ID 7EA229BD
      # gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>"
      # gpg:                 aka "Mark Brown <broonie@debian.org>"
      # gpg:                 aka "Mark Brown <broonie@kernel.org>"
      # gpg:                 aka "Mark Brown <broonie@tardis.ed.ac.uk>"
      # gpg:                 aka "Mark Brown <broonie@linaro.org>"
      # gpg:                 aka "Mark Brown <Mark.Brown@linaro.org>"
      8efe588b
    • Mark Brown's avatar
      Merge tag 'asoc-v3.15-2' into asoc-next · acae02c4
      Mark Brown authored
      ASoC: Updates for v3.15
      
      This is mostly a few additional fixes from Lars-Peter, a new driver and
      cleaning up a git failure with merging the Intel branch (combined with
      an xargs failure to pay attention to error codes).  The history lists a
      bunch of additional commits for the branch but the content of those
      commits is actually present already but not recorded in history due to
      git failing.  Unfortunately xargs is used in the merge script and it
      doesn't do a good job of noticing errors from the commands it invokes.
      
      # gpg: Signature made Thu 13 Mar 2014 14:25:44 GMT using RSA key ID 7EA229BD
      # gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>"
      # gpg:                 aka "Mark Brown <broonie@debian.org>"
      # gpg:                 aka "Mark Brown <broonie@kernel.org>"
      # gpg:                 aka "Mark Brown <broonie@tardis.ed.ac.uk>"
      # gpg:                 aka "Mark Brown <broonie@linaro.org>"
      # gpg:                 aka "Mark Brown <Mark.Brown@linaro.org>"
      acae02c4
    • Mark Brown's avatar
      Merge tag 'asoc-v3.15' into asoc-next · ba052e1b
      Mark Brown authored
      ASoC: Updates for v3.15
      
      Quite a busy release for ASoC this time, more on janitorial work than
      exciting new features but welcome nontheless:
      
       - Lots of cleanups from Takashi for enumerations; the original API for
         these was error prone so he's refactored lots of code to use more
         modern APIs which avoid issues.
       - Elimination of the ASoC level wrappers for I2C and SPI moving us
         closer to converting to regmap completely and avoiding some
         randconfig hassle.
       - Provide both manually and transparently locked DAPM APIs rather than
         a mix of the two fixing some concurrency issues.
       - Start converting CODEC drivers to use separate bus interface drivers
         rather than having them all in one file helping avoid dependency
         issues.
       - DPCM support for Intel Haswell and Bay Trail platforms.
       - Lots of work on improvements for simple-card, DaVinci and the Renesas
         rcar drivers.
       - New drivers for Analog Devices ADAU1977, TI PCM512x and parts of the
         CSR SiRF SoC.
      
      # gpg: Signature made Wed 12 Mar 2014 23:05:45 GMT using RSA key ID 7EA229BD
      # gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>"
      # gpg:                 aka "Mark Brown <broonie@debian.org>"
      # gpg:                 aka "Mark Brown <broonie@kernel.org>"
      # gpg:                 aka "Mark Brown <broonie@tardis.ed.ac.uk>"
      # gpg:                 aka "Mark Brown <broonie@linaro.org>"
      # gpg:                 aka "Mark Brown <Mark.Brown@linaro.org>"
      ba052e1b
    • Mark Brown's avatar
      Merge remote-tracking branches 'asoc/fix/cs42l51', 'asoc/fix/cs42l52',... · a23af4ab
      Mark Brown authored
      Merge remote-tracking branches 'asoc/fix/cs42l51', 'asoc/fix/cs42l52', 'asoc/fix/cs42l73', 'asoc/fix/rcar', 'asoc/fix/spear' and 'asoc/fix/tegra' into asoc-linus
      a23af4ab
    • Mark Brown's avatar
      758fc06d
    • Lucas Stach's avatar
      ASoC: tegra: move AC97 clock handling to the machine driver · 1ca2e847
      Lucas Stach authored
      On Tegra the convention is to have a single machine driver
      that's controlling the whole audio subsystem.
      
      Move the clock handling to the machine driver, to be in line
      with the other Tegra drivers and give the machine driver
      full control over the single Tegra audio PLL.
      Signed-off-by: default avatarLucas Stach <dev@lynxeye.de>
      Acked-by: default avatarStephen Warren <swarren@nvidia.com>
      Signed-off-by: default avatarMark Brown <broonie@linaro.org>
      1ca2e847
    • Jean-Francois Moine's avatar
      ASoC: simple-card: Handle many DAI links · 6a91a17b
      Jean-Francois Moine authored
      Some simple audio cards may have many DAI links.
      This patch extends the simple-card driver for handling such cards.
      Signed-off-by: default avatarJean-Francois Moine <moinejf@free.fr>
      Signed-off-by: default avatarMark Brown <broonie@linaro.org>
      6a91a17b
    • Jean-Francois Moine's avatar
      ASoC: simple-card: Add DT documentation for multi-DAI links · 015f630d
      Jean-Francois Moine authored
      Many couples of CPU/CODEC DAI links may be described in the DT
      thanks to 'simple-audio-card,dai-link' containers.
      Signed-off-by: default avatarJean-Francois Moine <moinejf@free.fr>
      Signed-off-by: default avatarMark Brown <broonie@linaro.org>
      015f630d
    • Jean-Francois Moine's avatar
      ASoC: simple-card: dynamically allocate the DAI link and properties · cf7dc23c
      Jean-Francois Moine authored
      The DAI link array and the properties (fmt, sysclk slots) are
      hard-coded for a single CPU / CODEC link.
      
      This patch dynamically allocates the DAI link array and the
      properties with the aim of supporting many DAI links.
      Signed-off-by: default avatarJean-Francois Moine <moinejf@free.fr>
      Signed-off-by: default avatarMark Brown <broonie@linaro.org>
      cf7dc23c
    • Xiubo Li's avatar
      ASoC: imx-ssi: Add .xlate_tdm_slot_mask() support. · 5f9e6ff6
      Xiubo Li authored
      This patch add .xlate_tdm_slot_mask support for IMX SSI, and this
      will generate the TDM slot TX and RX masks.
      Signed-off-by: default avatarXiubo Li <Li.Xiubo@freescale.com>
      Signed-off-by: default avatarMark Brown <broonie@linaro.org>
      5f9e6ff6
    • Xiubo Li's avatar
      ASoC: fsl-esai: Add .xlate_tdm_slot_mask() support. · a603c8ee
      Xiubo Li authored
      This patch add .xlate_tdm_slot_mask support for ESAI, and this will
      generate the TDM slot TX and RX masks.
      Signed-off-by: default avatarXiubo Li <Li.Xiubo@freescale.com>
      Signed-off-by: default avatarMark Brown <broonie@linaro.org>
      a603c8ee
    • Xiubo Li's avatar
      ASoC: fsl-utils: Add fsl_asoc_xlate_tdm_slot_mask() support. · 82535314
      Xiubo Li authored
      This patch add fsl_asoc_xlate_tdm_slot_mask() support for utils.
      For the some spcified DAI driver, this will be used to generate the
      TDM slot TX/RX mask. And the TX/RX mask will use a 0 bit for an active
      slot as default, and the default active bits are at the LSB of
      the masks.
      Signed-off-by: default avatarXiubo Li <Li.Xiubo@freescale.com>
      Signed-off-by: default avatarMark Brown <broonie@linaro.org>
      82535314
    • Xiubo Li's avatar
      ASoC: core: remove the 'of_' prefix of of_xlate_tdm_slot_mask. · e5c21514
      Xiubo Li authored
      The 'of_' is not appropriate here for there hasn't any DT parsing.
      Signed-off-by: default avatarXiubo Li <Li.Xiubo@freescale.com>
      Signed-off-by: default avatarMark Brown <broonie@linaro.org>
      e5c21514
    • Kuninori Morimoto's avatar
      ASoC: rcar: subnode tidyup for renesas,rsnd.txt · 8bab0dd5
      Kuninori Morimoto authored
      rcar_sound,ssi/src/dai subnode documentation
      become more cleaner
      Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
      Signed-off-by: default avatarMark Brown <broonie@linaro.org>
      8bab0dd5
    • Lars-Peter Clausen's avatar
      ASoC: Remove name_prefix unset during DAI link init hack · 6479f15a
      Lars-Peter Clausen authored
      Before we had card level support for DAPM and controls machine drivers would
      register their controls and DAPM elements with the CODEC. This required us to
      temporarily unset the name_prefix of a CODEC during the rtd init callback to
      avoid the machine level controls getting the CODEC's prefix. Now that all
      machine drivers properly register their machine level controls and DAPM elements
      with the card rather than with the CODEC we can drop the hack that sets the
      CODEC's name_prefix to NULL while calling the DAI link or AUX dev init callback.
      Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
      Signed-off-by: default avatarMark Brown <broonie@linaro.org>
      6479f15a
    • Takashi Iwai's avatar
      ALSA: hda - Inform the unexpectedly ignored pins by auto-parser · 9b7564a6
      Takashi Iwai authored
      The auto-parser may ignore some pins that could be valid when they
      don't match with the assumption or if there are way too many pins
      assigned to the same output type.  So far, such a pin has been
      silently ignored, but it's better to leave a message, which would help
      for debugging and understanding the problem.
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      9b7564a6
    • Linus Torvalds's avatar
      Linux 3.14-rc8 · b098d672
      Linus Torvalds authored
      b098d672
    • Linus Torvalds's avatar
      Merge branch 'parisc-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · 82231646
      Linus Torvalds authored
      Pull parisc updates from Helge Deller:
       - revert parts of the latest patch regarding font selection with STICON
         console
       - wire up the utimes() syscall for parisc
       - remove the unused parisc tmpalias code and unnecessary arch*relax
         defines
      
      * 'parisc-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: locks: remove redundant arch_*_relax operations
        parisc: wire up sys_utimes
        parisc: Remove unused CONFIG_PARISC_TMPALIAS code
        partly revert commit 8a10bc9d: parisc/sti_console: prefer Linux fonts over built-in ROM fonts
      82231646
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · 56f1f4b2
      Linus Torvalds authored
      Pull sparc fixes from David Miller:
      
       1) Do serial locking in a way that makes things clear that these are
          IRQ spinlocks.
      
       2) Conversion to generic idle loop broke first generation Niagara
          machines, need to have %pil interrupts enabled during cpu yield
          hypervisor call.
      
       3) Do not use magic constants for iterations over tsb tables, from Doug
          Wilson.
      
       4) Fix erroneous truncation of 64-bit system call return values to
          32-bit.  From Dave Kleikamp.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc64: Make sure %pil interrupts are enabled during hypervisor yield.
        sparc64:tsb.c:use array size macro rather than number
        sparc64: don't treat 64-bit syscall return codes as 32-bit
        sparc: serial: Clean up the locking for -rt
      56f1f4b2
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 8a109446
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) OpenVswitch's lookup_datapath() returns error pointers, so don't
          check against NULL.  From Jiri Pirko.
      
       2) pfkey_compile_policy() code path tries to do a GFP_KERNEL allocation
          under RCU locks, fix by using GFP_ATOMIC when necessary.  From
          Nikolay Aleksandrov.
      
       3) phy_suspend() indirectly passes uninitialized data into the ethtool
          get wake-on-land implementations.  Fix from Sebastian Hesselbarth.
      
       4) CPSW driver unregisters CPTS twice, fix from Benedikt Spranger.
      
       5) If SKB allocation of reply packet fails, vxlan's arp_reduce() defers
          a NULL pointer.  Fix from David Stevens.
      
       6) IPV6 neigh handling in vxlan doesn't validate the destination
          address properly, and it builds a packet with the src and dst
          reversed.  Fix also from David Stevens.
      
       7) Fix spinlock recursion during subscription failures in TIPC stack,
          from Erik Hugne.
      
       8) Revert buggy conversion of davinci_emac to devm_request_irq, from
          Chrstian Riesch.
      
       9) Wrong flags passed into forwarding database netlink notifications,
          from Nicolas Dichtel.
      
      10) The netpoll neighbour soliciation handler checks wrong ethertype,
          needs to be ETH_P_IPV6 rather than ETH_P_ARP.  Fix from Li RongQing.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (34 commits)
        tipc: fix spinlock recursion bug for failed subscriptions
        vxlan: fix nonfunctional neigh_reduce()
        net: davinci_emac: Fix rollback of emac_dev_open()
        net: davinci_emac: Replace devm_request_irq with request_irq
        netpoll: fix the skb check in pkt_is_ns
        net: micrel : ks8851-ml: add vdd-supply support
        ip6mr: fix mfc notification flags
        ipmr: fix mfc notification flags
        rtnetlink: fix fdb notification flags
        tcp: syncookies: do not use getnstimeofday()
        netlink: fix setsockopt in mmap examples in documentation
        openvswitch: Correctly report flow used times for first 5 minutes after boot.
        via-rhine: Disable device in error path
        ATHEROS-ATL1E: Convert iounmap to pci_iounmap
        vxlan: fix potential NULL dereference in arp_reduce()
        cnic: Update version to 2.5.20 and copyright year.
        cnic,bnx2i,bnx2fc: Fix inconsistent use of page size
        cnic: Use proper ulp_ops for per device operations.
        net: cdc_ncm: fix control message ordering
        ipv6: ip6_append_data_mtu do not handle the mtu of the second fragment properly
        ...
      8a109446
  6. 24 Mar, 2014 3 commits
    • Erik Hugne's avatar
      tipc: fix spinlock recursion bug for failed subscriptions · a5d0e7c0
      Erik Hugne authored
      If a topology event subscription fails for any reason, such as out
      of memory, max number reached or because we received an invalid
      request the correct behavior is to terminate the subscribers
      connection to the topology server. This is currently broken and
      produces the following oops:
      
      [27.953662] tipc: Subscription rejected, illegal request
      [27.955329] BUG: spinlock recursion on CPU#1, kworker/u4:0/6
      [27.957066]  lock: 0xffff88003c67f408, .magic: dead4ead, .owner: kworker/u4:0/6, .owner_cpu: 1
      [27.958054] CPU: 1 PID: 6 Comm: kworker/u4:0 Not tainted 3.14.0-rc6+ #5
      [27.960230] Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011
      [27.960874] Workqueue: tipc_rcv tipc_recv_work [tipc]
      [27.961430]  ffff88003c67f408 ffff88003de27c18 ffffffff815c0207 ffff88003de1c050
      [27.962292]  ffff88003de27c38 ffffffff815beec5 ffff88003c67f408 ffffffff817f0a8a
      [27.963152]  ffff88003de27c58 ffffffff815beeeb ffff88003c67f408 ffffffffa0013520
      [27.964023] Call Trace:
      [27.964292]  [<ffffffff815c0207>] dump_stack+0x45/0x56
      [27.964874]  [<ffffffff815beec5>] spin_dump+0x8c/0x91
      [27.965420]  [<ffffffff815beeeb>] spin_bug+0x21/0x26
      [27.965995]  [<ffffffff81083df6>] do_raw_spin_lock+0x116/0x140
      [27.966631]  [<ffffffff815c6215>] _raw_spin_lock_bh+0x15/0x20
      [27.967256]  [<ffffffffa0008540>] subscr_conn_shutdown_event+0x20/0xa0 [tipc]
      [27.968051]  [<ffffffffa000fde4>] tipc_close_conn+0xa4/0xb0 [tipc]
      [27.968722]  [<ffffffffa00101ba>] tipc_conn_terminate+0x1a/0x30 [tipc]
      [27.969436]  [<ffffffffa00089a2>] subscr_conn_msg_event+0x1f2/0x2f0 [tipc]
      [27.970209]  [<ffffffffa0010000>] tipc_receive_from_sock+0x90/0xf0 [tipc]
      [27.970972]  [<ffffffffa000fa79>] tipc_recv_work+0x29/0x50 [tipc]
      [27.971633]  [<ffffffff8105dbf5>] process_one_work+0x165/0x3e0
      [27.972267]  [<ffffffff8105e869>] worker_thread+0x119/0x3a0
      [27.972896]  [<ffffffff8105e750>] ? manage_workers.isra.25+0x2a0/0x2a0
      [27.973622]  [<ffffffff810648af>] kthread+0xdf/0x100
      [27.974168]  [<ffffffff810647d0>] ? kthread_create_on_node+0x1a0/0x1a0
      [27.974893]  [<ffffffff815ce13c>] ret_from_fork+0x7c/0xb0
      [27.975466]  [<ffffffff810647d0>] ? kthread_create_on_node+0x1a0/0x1a0
      
      The recursion occurs when subscr_terminate tries to grab the
      subscriber lock, which is already taken by subscr_conn_msg_event.
      We fix this by checking if the request to establish a new
      subscription was successful, and if not we initiate termination of
      the subscriber after we have released the subscriber lock.
      Signed-off-by: default avatarErik Hugne <erik.hugne@ericsson.com>
      Reviewed-by: default avatarJon Maloy <jon.maloy@ericsson.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a5d0e7c0
    • David Stevens's avatar
      vxlan: fix nonfunctional neigh_reduce() · 4b29dba9
      David Stevens authored
      The VXLAN neigh_reduce() code is completely non-functional since
      check-in. Specific errors:
      
      1) The original code drops all packets with a multicast destination address,
      	even though neighbor solicitations are sent to the solicited-node
      	address, a multicast address. The code after this check was never run.
      2) The neighbor table lookup used the IPv6 header destination, which is the
      	solicited node address, rather than the target address from the
      	neighbor solicitation. So neighbor lookups would always fail if it
      	got this far. Also for L3MISSes.
      3) The code calls ndisc_send_na(), which does a send on the tunnel device.
      	The context for neigh_reduce() is the transmit path, vxlan_xmit(),
      	where the host or a bridge-attached neighbor is trying to transmit
      	a neighbor solicitation. To respond to it, the tunnel endpoint needs
      	to do a *receive* of the appropriate neighbor advertisement. Doing a
      	send, would only try to send the advertisement, encapsulated, to the
      	remote destinations in the fdb -- hosts that definitely did not do the
      	corresponding solicitation.
      4) The code uses the tunnel endpoint IPv6 forwarding flag to determine the
      	isrouter flag in the advertisement. This has nothing to do with whether
      	or not the target is a router, and generally won't be set since the
      	tunnel endpoint is bridging, not routing, traffic.
      
      	The patch below creates a proxy neighbor advertisement to respond to
      neighbor solicitions as intended, providing proper IPv6 support for neighbor
      reduction.
      Signed-off-by: default avatarDavid L Stevens <dlstevens@us.ibm.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      4b29dba9
    • David S. Miller's avatar
      Merge branch 'davinci_emac' · 866b7cdf
      David S. Miller authored
      Christian Riesch says:
      
      ====================
      net: davinci_emac: Fix interrupt requests and error handling
      
      since commit 6892b41d (Linux 3.11) the
      davinci_emac driver is broken. After doing ifconfig down, ifconfig up,
      requesting the interrupts for the driver fails. The interface remains dead
      until the board is rebooted.
      
      The first patch in this patchset reverts commit
      6892b41d partially and makes the driver
      useable again.
      
      During the work on the first patch, a number of bugs in the error handling
      of the driver's ndo_open code were found. The second patch fixes these bugs.
      
      I believe the first patch meets the rules for stable kernels, I therefore added
      the stable tag to this patch. The second patch is just cleanup, the code
      that is fixed by this patch is only executed in case of an error.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      866b7cdf