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

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
  ...

dmaengine: ioat - fix spare sparse complain

2013-02-13T16:10:09+00:00

>> drivers/dma/ioat/dma_v3.c:371:6: sparse: symbol 'ioat3_timer_event' was not declared.

Reported-by: Fengguang Wu 
Signed-off-by: Fengguang Wu 
Acked-by: Dave Jiang 
Signed-off-by: Vinod Koul

ioatdma: fix race between updating ioat->head and IOAT_COMPLETION_PENDING

2013-02-12T16:27:21+00:00

There is a race that can hit during __cleanup() when the ioat->head pointer is
incremented during descriptor submission. The __cleanup() can clear the
PENDING flag when it does not see any active descriptors. This causes new
submitted descriptors to be ignored because the COMPLETION_PENDING flag is
cleared. This was introduced when code was adapted from ioatdma v1 to ioatdma
v2. For v2 and v3, IOAT_COMPLETION_PENDING flag will be abandoned and a new
flag IOAT_CHAN_ACTIVE will be utilized. This flag will also be protected under
the prep_lock when being modified in order to avoid the race.

Signed-off-by: Dave Jiang 
Reviewed-by: Dan Williams 
Signed-off-by: Vinod Koul

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

2013-01-24T18:17:49+00:00

Pull slave-dmaengine fixes from Vinod Koul:
 "A few fixes on slave dmanengine.  There are trivial fixes in imx-dma,
  tegra-dma & ioat driver"

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
  dma: tegra: implement flags parameters for cyclic transfer
  dmaengine: imx-dma: Disable use of hw_chain to fix sg_dma transfers.
  ioat: Fix DMA memory sync direction correct flag

ioat: remove chanerr mask setting for IOAT v3.x

2013-01-08T06:05:13+00:00

The existing code set a value in the PCI_CHANERRMSK_INT register
for a workaround to address a pre-silicon bug on the Intel 5520 IO hub that
has been fixed when the hardware was released. There is no need for this
code.

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

ioat: Add alignment workaround for IVB platforms

2013-01-08T06:05:13+00:00

The PCI IDs for IvyBridge IOAT DMA needs to go into a header file since
dma_v3.c looks them up for certain hardware workarounds. Need to add to the
alignment workaround for IOAT 3.2 since it wasn't fixed in IVB.

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

ioat3: add missing DMA unmap to ioat_xor_val_self_test()

2013-01-08T06:05:08+00:00

Make ioat_xor_val_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

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

ioat: Fix DMA memory sync direction correct flag

2013-01-06T16:36:34+00:00

ioat does DMA memory sync with DMA_TO_DEVICE direction on a buffer allocated
for DMA_FROM_DEVICE dma, resulting in the following warning from dma debug.
Fixed the dma_sync_single_for_device() call to use the correct direction.

[  226.288947] WARNING: at lib/dma-debug.c:990 check_sync+0x132/0x550()
[  226.288948] Hardware name: ProLiant DL380p Gen8
[  226.288951] ioatdma 0000:00:04.0: DMA-API: device driver syncs DMA memory with different direction [device address=0x00000000ffff7000] [size=4096 bytes] [mapped with DMA_FROM_DEVICE] [synced with DMA_TO_DEVICE]
[  226.288953] Modules linked in: iTCO_wdt(+) sb_edac(+) ioatdma(+) microcode serio_raw pcspkr edac_core hpwdt(+) iTCO_vendor_support hpilo(+) dca acpi_power_meter ata_generic pata_acpi sd_mod crc_t10dif ata_piix libata hpsa tg3 netxen_nic(+) sunrpc dm_mirror dm_region_hash dm_log dm_mod
[  226.288967] Pid: 1055, comm: work_for_cpu Tainted: G        W    3.3.0-0.20.el7.x86_64 #1
[  226.288968] Call Trace:
[  226.288974]  [] warn_slowpath_common+0x7f/0xc0
[  226.288977]  [] warn_slowpath_fmt+0x46/0x50
[  226.288980]  [] check_sync+0x132/0x550
[  226.288983]  [] debug_dma_sync_single_for_device+0x3f/0x50
[  226.288988]  [] ? wait_for_common+0x72/0x180
[  226.288995]  [] ioat_xor_val_self_test+0x3e5/0x832 [ioatdma]
[  226.288999]  [] ? kfree+0x259/0x270
[  226.289004]  [] ioat3_dma_self_test+0x1b/0x20 [ioatdma]
[  226.289008]  [] ioat_probe+0x2f8/0x348 [ioatdma]
[  226.289011]  [] ioat3_dma_probe+0x1d5/0x2aa [ioatdma]
[  226.289016]  [] ioat_pci_probe+0x139/0x17c [ioatdma]
[  226.289020]  [] local_pci_probe+0x5c/0xd0
[  226.289023]  [] ? destroy_work_on_stack+0x20/0x20
[  226.289025]  [] do_work_for_cpu+0x18/0x30
[  226.289029]  [] kthread+0xb7/0xc0
[  226.289033]  [] kernel_thread_helper+0x4/0x10
[  226.289036]  [] ? _raw_spin_unlock_irq+0x30/0x50
[  226.289038]  [] ? retint_restore_args+0x13/0x13
[  226.289041]  [] ? kthread_worker_fn+0x1a0/0x1a0
[  226.289044]  [] ? gs_change+0x13/0x13
[  226.289045] ---[ end trace e1618afc7a606089 ]---
[  226.289047] Mapped at:
[  226.289048]  [] debug_dma_map_page+0x87/0x150
[  226.289050]  [] dma_map_page.constprop.18+0x70/0xb34 [ioatdma]
[  226.289054]  [] ioat_xor_val_self_test+0x1d8/0x832 [ioatdma]
[  226.289058]  [] ioat3_dma_self_test+0x1b/0x20 [ioatdma]
[  226.289061]  [] ioat_probe+0x2f8/0x348 [ioatdma]

Signed-off-by: Shuah Khan 
CC: 
Signed-off-by: Vinod Koul

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