From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753679AbbBRGzV (ORCPT ); Wed, 18 Feb 2015 01:55:21 -0500 Received: from mga01.intel.com ([192.55.52.88]:59987 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753657AbbBRGzR (ORCPT ); Wed, 18 Feb 2015 01:55:17 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.09,595,1418112000"; d="asc'?scan'208";a="667921632" Date: Wed, 18 Feb 2015 12:22:26 +0530 From: Vinod Koul To: Linus Torvalds Cc: dma , LKML Subject: [GIT PULL] dmaengine updates Message-ID: <20150218065226.GU21387@intel.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="HlL+5n6rz5pIUxbD" Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --HlL+5n6rz5pIUxbD Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hello Linus, Here are the dmaengine contributions for 3.20. The last 8 commits had to be rebased as we had a regression so had to drop the offending commit. This update brings: - the big cleanup up by Maxime for device control and slave capabilities. This makes the API much cleaner. - new IMG MDC driver by Andrew - new Renesas R-Car Gen2 DMA Controller driver by Laurent along with bunch of fixes on rcar drivers - odd fixes and updates spread over driver The following changes since commit 97bf6af1f928216fd6c5a66e8a57bfa95a659672: Linux 3.19-rc1 (2014-12-20 17:08:50 -0800) are available in the git repository at: git://git.infradead.org/users/vkoul/slave-dma.git for-linus for you to fetch changes up to 88987d2c7534a0269f567fb101e6d71a08f0f01d: dmaengine: pl330: add DMA_PAUSE feature (2015-02-16 09:33:36 +0530) ---------------------------------------------------------------- Addy Ke (1): dmaengine: pl330: fix bug that cause start the same descs in cyclic Andrew Bresticker (2): dmaengine: Add binding document for IMG MDC dmaengine: Add driver for IMG MDC Andy Shevchenko (6): dmaengine: dw: provide DMA capabilities dmaengine: dw: update MAINTAINERS file dmatest: fix indentation dmatest: move src_off, dst_off, len inside loop dmaengine: dw: amend description of dma_dev field dmaengine: dw: define DW_DMA_MAX_NR_MASTERS Arnd Bergmann (4): dmaengine: k3: fix duplicate function definition dmaengine: mmp-tdma: don't include mach/regs-icu.h dmaengine: mmp-tdma: fix terminate_all return code dmaengine: coh901318: fix function return types build warnings Asaf Vertz (1): dmaengine: imx-sdma: fix indentation Cyrille Pitchen (1): dmaengine: at_xdmac: wait for in-progress transaction to complete aft= er pausing a channel Dan Carpenter (1): dmaengine: s3c24xx: missing unlock on an error path Dave Jiang (2): dmaengine: ioatdma: PQ err descriptors should callback with err resul= ts ioatdma: Adding support for BDX-DE ioatdma. Fabio Estevam (4): dmaengine: mxs-dma: Declare slave capabilities for the generic code dmaengine: imx-sdma: Declare slave capabilities for the generic code dmaengine: imx-sdma: Use devm functions dmaengine: imx-sdma: Return a proper error code in platform_get_irq() J=FCrg Billeter (1): dmaengine: rcar-dmac: Handle hardware descriptor allocation failure Kevin Hao (2): dmaengine: fsldma: declare slave capabilities for the generic code dmaengine: fsldma: remove the unused variable Krzysztof Kozlowski (1): dmaengine: k3: Fix duplicated function name and allmodconfig build Kuninori Morimoto (3): dmaengine: rcar-hpbdma: fixup WARNING of slave caps retrieval dmaengine: rcar-hpbdma: tidyup residue_granularity dmaengine: shdmac: fixup WARNING of slave caps retrieval Lad, Prabhakar (1): dmaenegine: edma: fix sparse warnings Laurent Pinchart (13): dmaengine: Add 16 bytes, 32 bytes and 64 bytes bus widths dmaengine: rcar-dmac: Remove duplicate sentence from DT bindings dmaengine: rcar-dmac: Add Renesas R-Car Gen2 DMA Controller (DMAC) dr= iver dmaengine: rcar-dmac: Implement support for hardware descriptor lists dmaengine: rcar-dmac: Cache hardware descriptors memory dmaengine: Move dma_get_slave_caps() implementation to dmaengine.c dmaengine: Add dma_get_slave_caps() inline stub when !CONFIG_DMA_ENGI= NE dmaengine: rcar-dmac: Fix uninitialized variable usage dmaengine: rcar-dmac: Fix spinlock issues in interrupt dmaengine: rcar-dmac: Fix oops due to unintialized list in error ISR dmaengine: rcar-dmac: Allocate hardware descriptors with DMAC device dmaengine: rcar-dmac: Work around descriptor mode IOMMU errata dmaengine: rcar-dmac: Disable channel 0 when using IOMMU Ludovic Desroches (6): dmaengine: at_xdmac: split device_control dmaengine: at_xdmac: Declare slave capabilities for the generic code dmaengine: at_hdmac: declare slave capabilities dmaengine: at_xdmac: introduce save_cc field dmaengine: at_xdmac: simplify channel configuration stuff dmaengine: at_xdmac: allow muliple dwidths when doing slave transfers Maxime Ripard (60): crypto: ux500: Use dmaengine_terminate_all API dmaengine: Make the destination abbreviation coherent dmaengine: Rework dma_chan_get dmaengine: Make channel allocation callbacks optional dmaengine: Introduce a device_config callback dmaengine: split out pause/resume operations from device_control dmaengine: Add device_terminate_all callback dmaengine: Remove the need to declare device_control dmaengine: Create a generic dma_slave_caps callback dmaengine: pl08x: Split device_control dmaengine: hdmac: Split device_control dmaengine: bcm2835: Split device_control dmaengine: coh901318: Split device_control dmaengine: cppi41: Split device_control dmaengine: jz4740: Split device_control dmaengine: dw: Split device_control dmaengine: edma: Split device_control dmaengine: ep93xx: Split device_control dmaengine: fsl-edma: Split device_control dmaengine: imx: Split device_control dmaengine: imx-sdma: Split device_control dmaengine: intel-mid-dma: Split device_control dmaengine: ipu-idmac: Split device_control dmaengine: k3: Split device_control dmaengine: mmp-pdma: Split device_control dmaengine: mmp-tdma: Split device_control dmaengine: moxart: Split device_control dmaengine: fsl-dma: Split device_control dmaengine: mpc512x: Split device_control dmaengine: mxs: Split device_control dmaengine: nbpfaxi: Split device_control dmaengine: omap: Split device_control dmaengine: pl330: Split device_control dmaengine: bam-dma: Split device_control dmaengine: s3c24xx: Split device_control dmaengine: sa11x0: Split device_control dmaengine: sh: Split device_control dmaengine: sirf: Split device_control dmaengine: sun6i: Split device_control dmaengine: d40: Split device_control dmaengine: tegra20: Split device_control dmaengine: xilinx: Split device_control dmaengine: mv_xor: Remove device_control dmaengine: pch-dma: Rename device_control dmaengine: td: Rename device_control dmaengine: txx9: Rename device_control dmaengine: rapidio: tsi721: Rename device_control dmaengine: bcm2835: Declare slave capabilities for the generic code dmaengine: fsl-edma: Declare slave capabilities for the generic code dmaengine: edma: Declare slave capabilities for the generic code dmaengine: nbpfaxi: Declare slave capabilities for the generic code dmaengine: omap: Declare slave capabilities for the generic code dmaengine: pl330: Declare slave capabilities for the generic code dmaengine: sirf: Declare slave capabilities for the generic code dmaengine: sun6i: Declare slave capabilities for the generic code dmaengine: Add a warning for drivers not using the generic slave caps= retrieval dmaengine: Remove device_control and device_slave_caps Documentation: dmaengine: Update the documentation dmaengine: sa11x0: Fix warning and compilation errors dmaengine: s3c24xx: Fix typo Nicholas Mc Guire (1): ioat: fail self-test if wait_for_completion times out Paul Walmsley (1): dmaengine: tegra: add slave capabilities reporting Rickard Strandqvist (1): dmaengine: imx-dma.c: Remove unused function Rob Herring (1): dma: mmp_tdma: Fix build for ARM64 Robert Baldyga (2): dmaengine: pl330: improve pl330_tx_status() function dmaengine: pl330: add DMA_PAUSE feature Sergei Shtylyov (2): dmaengine: shdmac: use SET_RUNTIME_PM_OPS() dmaengine: shdmac: extend PM methods Vinod Koul (13): dmaengine: mxs-dma: fix the arg to mxs_dma_reset_chan() dmaengine: omap: fix the assignment to .device_config Documentation: dmaengine: clarify dma_slave_config expectations dmaengine: mxs-dma: fix incompatible pointer type build warns dmaengine: mxs-dma: fix unused variable warn dmaengine: ste_dma: fix incompatible pointer type warns dmaengine: tegra: fix incompatible pointer type warns dmaengine: at_hdmac: update the driver comments dmaengine: dw: update the driver comments dmaengine: ep93xx: update the driver comments dmaengine: nbpfaxi: update the driver comments Merge branch 'topic/slave_caps_device_control_fix_rebased' into for-l= inus Merge branch 'topic/rcar' into for-linus Wolfram Sang (2): dmaengine: drop owner assignment from platform_drivers dmaengine: of: bail out early if "dmas" property is not present .../devicetree/bindings/dma/img-mdc-dma.txt | 57 + .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 3 - Documentation/devicetree/bindings/dma/snps-dma.txt | 2 +- Documentation/dmaengine/provider.txt | 97 +- MAINTAINERS | 1 + arch/arc/boot/dts/abilis_tb10x.dtsi | 2 +- arch/arm/boot/dts/spear13xx.dtsi | 4 +- arch/avr32/mach-at32ap/at32ap700x.c | 2 +- drivers/crypto/ux500/cryp/cryp_core.c | 4 +- drivers/crypto/ux500/hash/hash_core.c | 2 +- drivers/dma/Kconfig | 9 + drivers/dma/Makefile | 3 +- drivers/dma/amba-pl08x.c | 156 +- drivers/dma/at_hdmac.c | 130 +- drivers/dma/at_hdmac_regs.h | 3 +- drivers/dma/at_xdmac.c | 186 +- drivers/dma/bcm2835-dma.c | 46 +- drivers/dma/coh901318.c | 153 +- drivers/dma/cppi41.c | 30 +- drivers/dma/dma-jz4740.c | 20 +- drivers/dma/dmaengine.c | 84 +- drivers/dma/dmatest.c | 35 +- drivers/dma/dw/core.c | 101 +- drivers/dma/dw/platform.c | 4 +- drivers/dma/dw/regs.h | 4 +- drivers/dma/edma.c | 73 +- drivers/dma/ep93xx_dma.c | 43 +- drivers/dma/fsl-edma.c | 123 +- drivers/dma/fsldma.c | 97 +- drivers/dma/fsldma.h | 4 + drivers/dma/img-mdc-dma.c | 1011 +++++++++++ drivers/dma/imx-dma.c | 108 +- drivers/dma/imx-sdma.c | 150 +- drivers/dma/intel_mid_dma.c | 25 +- drivers/dma/ioat/dma_v3.c | 25 +- drivers/dma/ioat/hw.h | 5 + drivers/dma/ioat/pci.c | 5 + drivers/dma/ipu/ipu_idmac.c | 96 +- drivers/dma/k3dma.c | 203 ++- drivers/dma/mmp_pdma.c | 109 +- drivers/dma/mmp_tdma.c | 85 +- drivers/dma/moxart-dma.c | 25 +- drivers/dma/mpc512x_dma.c | 111 +- drivers/dma/mv_xor.c | 9 - drivers/dma/mxs-dma.c | 65 +- drivers/dma/nbpfaxi.c | 112 +- drivers/dma/of-dma.c | 4 + drivers/dma/omap-dma.c | 69 +- drivers/dma/pch_dma.c | 8 +- drivers/dma/pl330.c | 230 ++- drivers/dma/qcom_bam_dma.c | 85 +- drivers/dma/s3c24xx-dma.c | 73 +- drivers/dma/sa11x0-dma.c | 157 +- drivers/dma/sh/Kconfig | 14 +- drivers/dma/sh/Makefile | 1 + drivers/dma/sh/rcar-dmac.c | 1770 ++++++++++++++++= ++++ drivers/dma/sh/rcar-hpbdma.c | 6 + drivers/dma/sh/shdma-base.c | 72 +- drivers/dma/sh/shdmac.c | 23 +- drivers/dma/sirf-dma.c | 59 +- drivers/dma/ste_dma40.c | 63 +- drivers/dma/sun6i-dma.c | 160 +- drivers/dma/tegra20-apb-dma.c | 42 +- drivers/dma/timb_dma.c | 8 +- drivers/dma/txx9dmac.c | 9 +- drivers/dma/xilinx/xilinx_vdma.c | 29 +- drivers/rapidio/devices/tsi721_dma.c | 8 +- include/linux/dmaengine.h | 120 +- include/linux/platform_data/dma-dw.h | 6 +- include/linux/platform_data/dma-mmp_tdma.h | 7 + sound/soc/soc-generic-dmaengine-pcm.c | 2 +- 71 files changed, 4736 insertions(+), 1911 deletions(-) create mode 100644 Documentation/devicetree/bindings/dma/img-mdc-dma.txt create mode 100644 drivers/dma/img-mdc-dma.c create mode 100644 drivers/dma/sh/rcar-dmac.c Thanks --=20 ~Vinod --HlL+5n6rz5pIUxbD Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAEBAgAGBQJU5DapAAoJEHwUBw8lI4NHgjcP/iQIdRJYIYtPsvqIrK6bDPhg fx/rq8JDBUw07RwnRVwzuQVI8wGRTH7OLvh+qBC0tWDy/ypnnpo7gpAjtNOS8cio bRfWDuus+a85kJShMSw6+7SGSR9FPswlQRClKLS5ur4v9E4x0Uq4HsoJiitz304H 9pli1It3JVf/yLSyUzyDpvu4JmCU9EvLqRNLrgr2gi5w0X5gc+oziCEVWuFusTta qTC5dreTKnn8JVZYsKyzXauMImKhduZpV49Cdll60VJ7vdRSh82dZum8gcEXN5ce riV63IS4ZKW/wArbaHigCmJyr3fBosW2F1AiJKXa7jFRkZABhhNtIoksVdc1E22P omTS8kUxXj4Bj5KcHhu/0c1vIFqBpUCNbdZE8dMXmCJ95j0+NvfueoMrVDLqx1bC ZuVe5hQ7MtK6Dg8bKMNz04wDFH7+GNSIhh2kWKj20oTbppFIy1m0sfsvfqX+/Nev mIzQIqKz5hJPKenmBqqn6BuZOOvlVI7T3qUHw/zqGjDeBJXKrp1zyXfXAIn1L6vy MJDncOUA/mW+pIEX1ZCO9ziv2SRKERZxsxeZtghRJGiXZBqWLrowvwFd9n7R2NgH hUDTF1z3khejr9YTTcE0TDjzeVywLZPKXZFO6TNXFF25k9QW6CoAXrlTUx29fERV +ydAqU93qz5PtD41yff0 =IE+s -----END PGP SIGNATURE----- --HlL+5n6rz5pIUxbD--