13 Aug, 2010
1 commit
-
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
mmc_spi: Fix unterminated of_match_table
of/sparc: fix build regression from of_device changes
of/device: Replace struct of_device with struct platform_device
11 Aug, 2010
1 commit
-
Conflicts:
arch/arm/Kconfig
arch/arm/mm/Kconfig
10 Aug, 2010
1 commit
-
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (30 commits)
DMAENGINE: at_hdmac: locking fixlet
DMAENGINE: pch_dma: kill another usage of __raw_{read|write}l
dma: dmatest: fix potential sign bug
ioat2: catch and recover from broken vtd configurations v6
DMAENGINE: add runtime slave control to COH 901 318 v3
DMAENGINE: add runtime slave config to DMA40 v3
DMAENGINE: generic slave channel control v3
dmaengine: Driver for Topcliff PCH DMA controller
intel_mid: Add Mrst & Mfld DMA Drivers
drivers/dma: Eliminate a NULL pointer dereference
dma/timb_dma: compile warning on 32 bit
DMAENGINE: ste_dma40: support older silicon
DMAENGINE: ste_dma40: support disabling physical channels
DMAENGINE: ste_dma40: no disabled phy channels on ux500
DMAENGINE: ste_dma40: fix suspend bug
DMAENGINE: ste_dma40: add DB8500 memcpy channels
DMAENGINE: ste_dma40: no flow control on memcpy
DMAENGINE: ste_dma40: arch updates for LCLA and LCPA
DMAENGINE: ste_dma40: allocate LCLA dynamically
DMAENGINE: ste_dma40: no premature stop
...Fix up trivial conflicts in arch/arm/mach-ux500/devices-db8500.c
07 Aug, 2010
1 commit
-
Conflicts:
drivers/net/irda/sh_irda.c
06 Aug, 2010
1 commit
-
of_device is just an alias for platform_device, so remove it entirely. Also
replace to_of_device() with to_platform_device() and update comment blocks.This patch was initially generated from the following semantic patch, and then
edited by hand to pick up the bits that coccinelle didn't catch.@@
@@
-struct of_device
+struct platform_deviceSigned-off-by: Grant Likely
Reviewed-by: David S. Miller
05 Aug, 2010
7 commits
-
atc_chain_complete shall be called with atchan->lock held
and bh disabled.Signed-off-by: Yong Wang
Signed-off-by: Dan Williams -
Use {read|write}l instead of __raw_{read|write}l since PCH DMA
controller is PCI device.Signed-off-by: Yong Wang
Signed-off-by: Dan Williams -
'cnt' is unsigned, so this code may become wrong in future as
dmatest_add_threads() can return error code:cnt = dmatest_add_threads(dtc, DMA_MEMCPY);
thread_count += cnt > 0 ? cnt : 0;
^^^^^^^Now it can return only -EINVAL if and only if second argument of
dmatest_add_threads() is not one of DMA_MEMCPY, DMA_XOR, DMA_PQ.
So, now it is not wrong but may become wrong in future.The semantic patch that finds this problem (many false-positive results):
(http://coccinelle.lip6.fr/)//
@ r1 @
identifier f;
@@
int f(...) { ... }@@
identifier r1.f;
type T;
unsigned T x;
@@*x = f(...)
...
*x > 0Signed-off-by: Kulikov Vasiliy
Signed-off-by: Dan Williams -
On some platforms (MacPro3,1) the BIOS assigns the ioatdma device to the
incorrect iommu causing faults when the driver initializes. Add a quirk
to catch this misconfiguration and try falling back to untranslated
operation (which works in the MacPro3,1 case).Assuming there are other platforms with misconfigured iommus teach the
ioatdma driver to treat initialization failures as non-fatal (just fail
the driver load and emit a warning instead of triggering a BUG_ON).This can be classified as a boot regression since 2.6.32 on affected
platforms since the ioatdma module did not autoload prior to that
kernel.Cc:
Acked-by: David Woodhouse
Reported-by: Chris Li
Tested-by: Chris Li
Signed-off-by: Dan Williams -
This extends the DMA engine driver for the COH 901 318 used in the
U300 platform with the generic runtime slave control command.Signed-off-by: Linus Walleij
Signed-off-by: Dan Williams -
This extends the DMA engine driver for the DMA40 used in the
U8500 platform with the generic runtime slave configuration
interface.Signed-off-by: Linus Walleij
Signed-off-by: Dan Williams -
Topcliff PCH is the platform controller hub that is going to
be used in Intel's upcoming general embedded platforms. This
adds the driver for Topcliff PCH DMA controller. The DMA
channels are strictly for device to host or host to device
transfers and cannot be used for generic memcpy.Signed-off-by: Yong Wang
[kill GFP_ATOMIC, kill __raw_{read|write}l, locking fixlet]
Signed-off-by: Dan Williams
04 Aug, 2010
2 commits
-
Cc: Jiri Kosina
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Stefan Weil
Signed-off-by: Jiri Kosina
28 Jul, 2010
1 commit
-
This patch add DMA drivers for DMA controllers in Langwell chipset
of Intel(R) Moorestown platform and DMA controllers in Penwell of
Intel(R) Medfield platfromThis patch adds support for Moorestown DMAC1 and DMAC2 controllers.
It also add support for Medfiled GP DMA and DMAC1 controllers.
These controllers supports memory to peripheral and peripheral to
memory transfers. It support only single block transfers.This driver is based on Kernel DMA engine
Anyone who wishes to use this controller should use DMA engine APIsThis controller exposes DMA_SLAVE capabilities and notifies the client drivers
of DMA transaction completionConfig option required to be enabled CONFIG_INTEL_MID_DMAC=y
Signed-off-by: Vinod Koul
Signed-off-by: Alan Cox
Signed-off-by: Dan Williams
05 Jul, 2010
1 commit
-
Conflicts:
include/linux/serial_sci.hSigned-off-by: Paul Mundt
03 Jul, 2010
1 commit
-
Convert ppc4xx adma driver to use new node pointer location
Signed-off-by: Dan Williams
Acked-by: Anatolij Gustschin
Signed-off-by: Grant Likely
01 Jul, 2010
3 commits
-
If td_desc is NULL, just skip both kfrees.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)//
@r exists@
expression E,E1;
identifier f;
statement S1,S2,S3;
@@if ((E == NULL && ...) || ...)
{
... when != if (...) S1 else S2
when != E = E1
* E->f
... when any
return ...;
}
else S3
//Signed-off-by: Julia Lawall
Signed-off-by: Dan Williams -
This silences a compile warning on 32 bit systems:
drivers/dma/timb_dma.c:203: warning: cast to pointer from integer of different sizeSigned-off-by: Dan Carpenter
Signed-off-by: Dan Williams
23 Jun, 2010
15 commits
-
This makes sure the DMA40 driver will also work on the oldest
silicon revisions that have the on-chip memory on another location
in the DB8500 and also requires explicit suspend before starting
or resuming a logical channel.Signed-off-by: Linus Walleij
[added parenthesis to the definition of U8500_DMA_LCPA_BASE_ED]
Signed-off-by: Dan Williams -
This makes it possible to disable physical channels.
Signed-off-by: Jonas Aaberg
Signed-off-by: Linus Walleij
Signed-off-by: Dan Williams -
This fixes a bug when suspending channels: first make the checks,
then suspend the channel, not the other way around.Signed-off-by: Jonas Aaberg
Signed-off-by: Linus Walleij
Signed-off-by: Dan Williams -
Switch to allocating LCLA in memory instead of having a fixed
address.Signed-off-by: Jonas Aaberg
Signed-off-by: Linus Walleij
Signed-off-by: Dan Williams -
Correct bug that could cause paused channels to stop.
Signed-off-by: Jonas Aaberg
Signed-off-by: Linus Walleij
Signed-off-by: Dan Williams -
We don't want interrupts when the source is done, only when
the destination is done and everything is complete at the
recieveing end of a transfer.Signed-off-by: Jonas Aaberg
Signed-off-by: Linus Walleij
Signed-off-by: Dan Williams -
Avoid doing unnessecary suspend when modifying logical channels.
Signed-off-by: Jonas Aaberg
Signed-off-by: Linus Walleij
Signed-off-by: Dan Williams -
Fix up some locking issues found by enabling lock debugging.
Signed-off-by: Jonas Aaberg
Signed-off-by: Linus Walleij
Signed-off-by: Dan Williams -
Added checks to deny operating on none-allocated channels.
Signed-off-by: Jonas Aaberg
Signed-off-by: Linus Walleij
Signed-off-by: Dan Williams -
This cleans up some extra newlines, removes some code duplication
and moves the code to comply better with checkpatch.Signed-off-by: Jonas Aaberg
Signed-off-by: Linus Walleij
Signed-off-by: Dan Williams -
Better error handling when channel allocation fails.
Signed-off-by: Jonas Aaberg
Signed-off-by: Linus Walleij
Signed-off-by: Dan Williams -
Use kmem cache instead of own cache, reducing code duplication
and bug sources.Signed-off-by: Jonas Aaberg
Signed-off-by: Linus Walleij
Signed-off-by: Dan Williams -
fixed typo and moved freeing of client owned desc to free_dma.
Signed-off-by: Jonas Aaberg
Signed-off-by: Linus Walleij
Signed-off-by: Dan Williams -
We only need to write the configuration to a physical channel if
it is free, else it is already written.Signed-off-by: Jonas Aaberg
Signed-off-by: Linus Walleij
Signed-off-by: Dan Williams -
Fixed lli_max=1 issue in case of full lcla, currently this case
is not properly handled.Signed-off-by: Jonas Aaberg
Signed-off-by: Linus Walleij
Signed-off-by: Dan Williams
17 Jun, 2010
2 commits
-
Signed-off-by: Uwe Kleine-König
Signed-off-by: Jiri Kosina
03 Jun, 2010
2 commits
-
Fixes build error caused by the OF device_node
pointer being moved into struct deviceSigned-off-by: Anatolij Gustschin
Signed-off-by: Grant Likely -
Fixes build errors caused by the:
- OF device_node pointer being moved into struct device
- removal of the match_table field from struct of_platform_driverSigned-off-by: Anatolij Gustschin
Signed-off-by: Grant Likely
31 May, 2010
1 commit