linux-stable.git/drivers/dma/ioat, branch linux-3.5.y

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

ioatdma: DMA copy alignment needed to address IOAT DMA silicon errata

2012-04-05T22:24:35+00:00

Silicon errata where when RAID and legacy descriptors are mixed, the legacy
(memcpy and friends) operation must have alignment of 64 bytes to avoid
hanging. This effects Intel Xeon C55xx, C35xx, E5-2600.

Signed-off-by: Dave Jiang 
Signed-off-by: Dan Williams

ioat: ring size variables need to be 32bit to avoid overflow

2012-04-05T22:22:58+00:00

The alloc order can be up to 16 and 1 << 16 will over flow the 16bit
integer. Change the appropriate variables to 16bit to avoid overflow.

Reported-by: Jim Harris 
Signed-off-by: Dave Jiang 
Signed-off-by: Dan Williams

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: fix for cookie changes and merge

2012-03-13T06:28:12+00:00

Fixed trivial issues in drivers:
	drivers/dma/imx-sdma.c
	drivers/dma/intel_mid_dma.c
	drivers/dma/ioat/dma_v3.c
	drivers/dma/iop-adma.c
	drivers/dma/sirf-dma.c
	drivers/dma/timb_dma.c

Signed-off-by: Vinod Koul

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