linux-toradex.git/drivers/dma/ioat/dma.c, branch v3.9.2

Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

2013-02-26T17:24:48+00:00

Pull slave-dmaengine updates from Vinod Koul:
 "This is fairly big pull by my standards as I had missed last merge
  window.  So we have the support for device tree for slave-dmaengine,
  large updates to dw_dmac driver from Andy for reusing on different
  architectures.  Along with this we have fixes on bunch of the drivers"

Fix up trivial conflicts, usually due to #include line movement next to
each other.

* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (111 commits)
  Revert "ARM: SPEAr13xx: Pass DW DMAC platform data from DT"
  ARM: dts: pl330: Add #dma-cells for generic dma binding support
  DMA: PL330: Register the DMA controller with the generic DMA helpers
  DMA: PL330: Add xlate function
  DMA: PL330: Add new pl330 filter for DT case.
  dma: tegra20-apb-dma: remove unnecessary assignment
  edma: do not waste memory for dma_mask
  dma: coh901318: set residue only if dma is in progress
  dma: coh901318: avoid unbalanced locking
  dmaengine.h: remove redundant else keyword
  dma: of-dma: protect list write operation by spin_lock
  dmaengine: ste_dma40: do not remove descriptors for cyclic transfers
  dma: of-dma.c: fix memory leakage
  dw_dmac: apply default dma_mask if needed
  dmaengine: ioat - fix spare sparse complain
  dmaengine: move drivers/of/dma.c -> drivers/dma/of-dma.c
  ioatdma: fix race between updating ioat->head and IOAT_COMPLETION_PENDING
  dw_dmac: add support for Lynxpoint DMA controllers
  dw_dmac: return proper residue value
  dw_dmac: fill individual length of descriptor
  ...

ioat: add missing DMA unmap to ioat_dma_self_test()

2013-01-08T06:04:58+00:00

Make ioat_dma_self_test() do DMA unmapping itself and fix handling
of failure cases.

Cc: Dan Williams 
Cc: Tomasz Figa 
Signed-off-by: Bartlomiej Zolnierkiewicz 
Signed-off-by: Kyungmin Park 
Signed-off-by: Dan Williams

Drivers: dma: remove __dev* attributes.

2013-01-03T23:57:15+00:00

CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
markings need to be removed.

This change removes the use of __devinit, __devexit_p, __devinitconst,
and __devexit from these drivers.

Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.

Cc: Bill Pemberton 
Cc: Viresh Kumar 
Cc: Dan Williams 
Cc: Vinod Koul 
Cc: Barry Song 
Cc: Jeff Kirsher 
Cc: Alexander Duyck 
Cc: Russell King 
Cc: Linus Walleij 
Cc: Jassi Brar 
Cc: Dave Jiang 
Cc: Bill Pemberton 
Cc: Guennadi Liakhovetski 
Signed-off-by: Greg Kroah-Hartman

Merge tag 'dmaengine-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine

2012-04-10T22:30:16+00:00

Pull dmaengine fixes from Dan Williams:

1/ regression fix for Xen as it now trips over a broken assumption
   about the dma address size on 32-bit builds

2/ new quirk for netdma to ignore dma channels that cannot meet
   netdma alignment requirements

3/ fixes for two long standing issues in ioatdma (ring size overflow)
   and iop-adma (potential stack corruption)

* tag 'dmaengine-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine:
  netdma: adding alignment check for NETDMA ops
  ioatdma: DMA copy alignment needed to address IOAT DMA silicon errata
  ioat: ring size variables need to be 32bit to avoid overflow
  iop-adma: Corrected array overflow in RAID6 Xscale(R) test.
  ioat: fix size of 'completion' for Xen

ioat: fix size of 'completion' for Xen

2012-03-23T20:36:42+00:00

Starting with v3.2 Jonathan reports that Xen crashes loading the ioatdma
driver.  A debug run shows:

  ioatdma 0000:00:16.4: desc[0]: (0x300cc7000->0x300cc7040) cookie: 0 flags: 0x2 ctl: 0x29 (op: 0 int_en: 1 compl: 1)
  ...
  ioatdma 0000:00:16.4: ioat_get_current_completion: phys_complete: 0xcc7000

...which shows that in this environment GFP_KERNEL memory may be backed
by a 64-bit dma address.  This breaks the driver's assumption that an
unsigned long should be able to contain the physical address for
descriptor memory.  Switch to dma_addr_t which beyond being the right
size, is the true type for the data i.e. an io-virtual address
inidicating the engine's last processed descriptor.

[stable: 3.2+]
Cc: 
Reported-by: Jonathan Nieder 
Reported-by: William Dauchy 
Tested-by: William Dauchy 
Tested-by: Dave Jiang 
Signed-off-by: Dan Williams

dmaengine: ensure all DMA engine drivers initialize their cookies

2012-03-13T06:07:42+00:00

Ensure all DMA engine drivers initialize their cookies in the same way,
so that they all behave in a similar fashion.  This means their first
issued cookie will be 2 rather than 1, and will increment to INT_MAX
before returning 1 and starting over.

In connection with this, Dan Williams said:
> Russell King wrote:
> > Secondly, some DMA engine drivers initialize the dma_chan cookie to 0,
> > others to 1.  Is there a reason for this, or are these all buggy?
>
> I know that ioat and iop-adma expect 0 to mean "I have cleaned up this
> descriptor and it is idle", and would break if zero was an in-flight
> cookie value.  The reserved usage of zero is an driver internal
> concern, but I have no problem formalizing it as a reserved value.

Signed-off-by: Russell King 
Tested-by: Linus Walleij 
Reviewed-by: Linus Walleij 
Acked-by: Jassi Brar 
[imx-sdma.c & mxs-dma.c]
Tested-by: Shawn Guo 
Signed-off-by: Vinod Koul

dmaengine: consolidate tx_status functions

2012-03-13T06:07:14+00:00

Now that we have the completed cookie in the dma_chan structure, we
can consolidate the tx_status functions by providing a function to set
the txstate structure and returning the DMA status.  We also provide
a separate helper to set the residue for cookies which are still in
progress.

Signed-off-by: Russell King 
Tested-by: Linus Walleij 
Reviewed-by: Linus Walleij 
Acked-by: Jassi Brar 
[imx-sdma.c & mxs-dma.c]
Tested-by: Shawn Guo 
Signed-off-by: Vinod Koul

dmaengine: provide a common function for completing a dma descriptor

2012-03-13T06:07:01+00:00

Provide a common function to do the cookie mechanics for completing
a DMA descriptor.

Signed-off-by: Russell King 
Tested-by: Linus Walleij 
Reviewed-by: Linus Walleij 
Acked-by: Jassi Brar 
[imx-sdma.c & mxs-dma.c]
Tested-by: Shawn Guo 
Signed-off-by: Vinod Koul

dmaengine: consolidate assignment of DMA cookies

2012-03-13T06:06:52+00:00

Everyone deals with assigning DMA cookies in the same way (it's part of
the API so they should be), so lets consolidate the common code into a
helper function to avoid this duplication.

Signed-off-by: Russell King 
Tested-by: Linus Walleij 
Reviewed-by: Linus Walleij 
Acked-by: Jassi Brar 
[imx-sdma.c & mxs-dma.c]
Tested-by: Shawn Guo 
Signed-off-by: Vinod Koul

dmaengine: add private header file

2012-03-13T06:06:44+00:00

Add a local private header file to contain definitions and declarations
which should only be used by DMA engine drivers.

We also fix linux/dmaengine.h to use LINUX_DMAENGINE_H to guard against
multiple inclusion.

Signed-off-by: Russell King 
Tested-by: Linus Walleij 
Reviewed-by: Linus Walleij 
Acked-by: Jassi Brar 
[imx-sdma.c & mxs-dma.c]
Tested-by: Shawn Guo 
Signed-off-by: Vinod Koul