1. 05 Aug, 2015 3 commits
    • Maxime Ripard's avatar
      dmaengine: Add an enum for the dmaengine alignment constraints · 77a68e56
      Maxime Ripard authored
      Most drivers need to set constraints on the buffer alignment for async tx
      operations. However, even though it is documented, some drivers either use
      a defined constant that is not matching what the alignment variable expects
      (like DMA_BUSWIDTH_* constants) or fill the alignment in bytes instead of
      power of two.
      
      Add a new enum for these alignments that matches what the framework
      expects, and convert the drivers to it.
      Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
      Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
      77a68e56
    • Geert Uytterhoeven's avatar
      dmaengine: shdma: Make dummy shdma_chan_filter() always return false · 056f6c87
      Geert Uytterhoeven authored
      If CONFIG_SH_DMAE_BASE (which is required for DMA engine support for
      legacy SH, SH/R-Mobile, and R-Car Gen1, but not for R-Car Gen2) is not
      enabled, but CONFIG_RCAR_DMAC (for R-Car Gen2 DMA engine support) is,
      and the DTS doesn't provide a "dmas" property for a device,
      dma_request_slave_channel_compat() incorrectly succeeds, and returns a
      DMA channel.
      
      However, when trying to use that DMA channel later, it fails with:
      
          rcar-dmac e6700000.dma-controller: rcar_dmac_prep_slave_sg: bad parameter: len=1, id=-22
      
      (Fortunately most drivers can handle this failure, and fall back to
      PIO)
      
      The reason for this is that a NULL legacy filter function is used, which
      actually means "all channels are OK", not "do not match".
      If CONFIG_SH_DMAE_BASE is enabled (like in shmobile_defconfig, which
      supports other SoCs besides R-Car Gen2), shdma_chan_filter() correctly
      returns false, as no available channel on R-Car Gen2 matches a
      shdma-base channel.
      If the DTS does provide a "dmas" property, dma_request_slave_channel()
      succeeds, and legacy filter-based matching is not used.
      
      To fix this, change shdma_chan_filter from being NULL to a dummy
      function that always returns false, like is done on other platforms.
      Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
      Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
      056f6c87
    • Shengjiu Wang's avatar
      dmaengine: imx-sdma: Add device to device support · 8391ecf4
      Shengjiu Wang authored
      This patch adds DEV_TO_DEV support for i.MX SDMA driver to support data
      transfer between two peripheral FIFOs.
      The per_2_per script requires two peripheral addresses and two DMA
      requests, and it need to check the src addr and dst addr is in the SPBA
      bus space or in the AIPS bus space.
      Signed-off-by: default avatarShengjiu Wang <shengjiu.wang@freescale.com>
      Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
      8391ecf4
  2. 16 Jul, 2015 4 commits
  3. 07 Jul, 2015 3 commits
  4. 06 Jul, 2015 1 commit
  5. 05 Jul, 2015 4 commits
    • Linus Torvalds's avatar
      Linux 4.2-rc1 · d770e558
      Linus Torvalds authored
      d770e558
    • Linus Torvalds's avatar
      Merge tag 'platform-drivers-x86-v4.2-2' of... · a585d2b7
      Linus Torvalds authored
      Merge tag 'platform-drivers-x86-v4.2-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
      
      Pull late x86 platform driver updates from Darren Hart:
       "The following came in a bit later and I wanted them to bake in next a
        few more days before submitting, thus the second pull.
      
        A new intel_pmc_ipc driver, a symmetrical allocation and free fix in
        dell-laptop, a couple minor fixes, and some updated documentation in
        the dell-laptop comments.
      
        intel_pmc_ipc:
         - Add Intel Apollo Lake PMC IPC driver
      
        tc1100-wmi:
         - Delete an unnecessary check before the function call "kfree"
      
        dell-laptop:
         - Fix allocating & freeing SMI buffer page
         - Show info about WiGig and UWB in debugfs
         - Update information about wireless control"
      
      * tag 'platform-drivers-x86-v4.2-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
        intel_pmc_ipc: Add Intel Apollo Lake PMC IPC driver
        tc1100-wmi: Delete an unnecessary check before the function call "kfree"
        dell-laptop: Fix allocating & freeing SMI buffer page
        dell-laptop: Show info about WiGig and UWB in debugfs
        dell-laptop: Update information about wireless control
      a585d2b7
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 1dc51b82
      Linus Torvalds authored
      Pull more vfs updates from Al Viro:
       "Assorted VFS fixes and related cleanups (IMO the most interesting in
        that part are f_path-related things and Eric's descriptor-related
        stuff).  UFS regression fixes (it got broken last cycle).  9P fixes.
        fs-cache series, DAX patches, Jan's file_remove_suid() work"
      
      [ I'd say this is much more than "fixes and related cleanups".  The
        file_table locking rule change by Eric Dumazet is a rather big and
        fundamental update even if the patch isn't huge.   - Linus ]
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (49 commits)
        9p: cope with bogus responses from server in p9_client_{read,write}
        p9_client_write(): avoid double p9_free_req()
        9p: forgetting to cancel request on interrupted zero-copy RPC
        dax: bdev_direct_access() may sleep
        block: Add support for DAX reads/writes to block devices
        dax: Use copy_from_iter_nocache
        dax: Add block size note to documentation
        fs/file.c: __fget() and dup2() atomicity rules
        fs/file.c: don't acquire files->file_lock in fd_install()
        fs:super:get_anon_bdev: fix race condition could cause dev exceed its upper limitation
        vfs: avoid creation of inode number 0 in get_next_ino
        namei: make set_root_rcu() return void
        make simple_positive() public
        ufs: use dir_pages instead of ufs_dir_pages()
        pagemap.h: move dir_pages() over there
        remove the pointless include of lglock.h
        fs: cleanup slight list_entry abuse
        xfs: Correctly lock inode when removing suid and file capabilities
        fs: Call security_ops->inode_killpriv on truncate
        fs: Provide function telling whether file_remove_privs() will do anything
        ...
      1dc51b82
    • Linus Torvalds's avatar
      bluetooth: fix list handling · 9b284cbd
      Linus Torvalds authored
      Commit 835a6a2f ("Bluetooth: Stop sabotaging list poisoning")
      thought that the code was sabotaging the list poisoning when NULL'ing
      out the list pointers and removed it.
      
      But what was going on was that the bluetooth code was using NULL
      pointers for the list as a way to mark it empty, and that commit just
      broke it (and replaced the test with NULL with a "list_empty()" test on
      a uninitialized list instead, breaking things even further).
      
      So fix it all up to use the regular and real list_empty() handling
      (which does not use NULL, but a pointer to itself), also making sure to
      initialize the list properly (the previous NULL case was initialized
      implicitly by the session being allocated with kzalloc())
      
      This is a combination of patches by Marcel Holtmann and Tedd Ho-Jeong
      An.
      
      [ I would normally expect to get this through the bt tree, but I'm going
        to release -rc1, so I'm just committing this directly   - Linus ]
      Reported-and-tested-by: default avatarJörg Otte <jrg.otte@gmail.com>
      Cc: Alexey Dobriyan <adobriyan@gmail.com>
      Original-by: default avatarTedd Ho-Jeong An <tedd.an@intel.com>
      Original-by: Marcel Holtmann <marcel@holtmann.org>:
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      9b284cbd
  6. 04 Jul, 2015 25 commits