14 Jun, 2011
1 commit
-
Fix the recently added SH_DMAC_MAX_CHANNELS handling code in
300e5f9 dmaengine: shdma: Fix SH_DMAC_MAX_CHANNELS handlingWithout this fix the shdma driver outputs silly messages in
case SH_DMAC_MAX_CHANNELS happens to match the platform data:sh-dma-engine sh-dma-engine.0: Attempting to register 20 DMA channels when a max
imum of 20 are supported.Signed-off-by: Magnus Damm
Signed-off-by: Paul Mundt
02 Jun, 2011
1 commit
-
A recent patch has introduced a regression, where repeating a memcpy
DMA test with shdma module unloading between them skips the DMA channel
configuration. Fix this regression by always configuring the channel
during its allocation.Signed-off-by: Guennadi Liakhovetski
Signed-off-by: Paul Mundt
31 May, 2011
1 commit
-
The runtime PM changes introduce sh_dmae_rst() wrapping via the
runtime_resume helper, depending on dev_get_drvdata() to fetch the
platform data needed for the DMAOR initialization default at a time
where drvdata hasn't yet been established by the probe path, resulting
in general probe misery:Unable to handle kernel NULL pointer dereference at virtual address 000000c4
pc = 8025adee
*pde = 00000000
Oops: 0000 [#1]
Modules linked in:Pid : 1, Comm: swapper
CPU : 0 Not tainted (3.0.0-rc1-00012-g9436b4a-dirty #1456)PC is at sh_dmae_rst+0x28/0x86
PR is at sh_dmae_rst+0x22/0x86
PC : 8025adee SP : 9e803d10 SR : 400080f1 TEA : 000000c4
R0 : 000000c4 R1 : 0000fff8 R2 : 00000000 R3 : 00000040
R4 : 000000f0 R5 : 00000000 R6 : 00000000 R7 : 804f184c
R8 : 00000000 R9 : 804dd0e8 R10 : 80283204 R11 : ffffffda
R12 : 000000a0 R13 : 804dd18c R14 : 9e803d10
MACH: 00000000 MACL: 00008f20 GBR : 00000000 PR : 8025ade8Call trace:
[] sh_dmae_runtime_resume+0x24/0x34
[] pm_generic_runtime_resume+0x34/0x3c
[] rpm_callback+0x4a/0x7e
[] rpm_resume+0x240/0x384
[] rpm_resume+0x298/0x384
[] __pm_runtime_resume+0x44/0x7c
[] __ioremap_caller+0x0/0xec
[] __pm_runtime_resume+0x4e/0x7c
[] __ioremap_caller+0x0/0xec
[] sh_dmae_probe+0x180/0x6a0
[] platform_drv_probe+0x26/0x2eFix up the ordering accordingly.
Signed-off-by: Paul Mundt
29 May, 2011
1 commit
-
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (33 commits)
x86: poll waiting for I/OAT DMA channel status
maintainers: add dma engine tree details
dmaengine: add TODO items for future work on dma drivers
dmaengine: Add API documentation for slave dma usage
dmaengine/dw_dmac: Update maintainer-ship
dmaengine: move link order
dmaengine/dw_dmac: implement pause and resume in dwc_control
dmaengine/dw_dmac: Replace spin_lock* with irqsave variants and enable submission from callback
dmaengine/dw_dmac: Divide one sg to many desc, if sg len is greater than DWC_MAX_COUNT
dmaengine/dw_dmac: set residue as total len in dwc_tx_status if status is !DMA_SUCCESS
dmaengine/dw_dmac: don't call callback routine in case dmaengine_terminate_all() is called
dmaengine: at_hdmac: pause: no need to wait for FIFO empty
pch_dma: modify pci device table definition
pch_dma: Support new device ML7223 IOH
pch_dma: Support I2S for ML7213 IOH
pch_dma: Fix DMA setting issue
pch_dma: modify for checkpatch
pch_dma: fix dma direction issue for ML7213 IOH video-in
dmaengine: at_hdmac: use descriptor chaining help function
dmaengine: at_hdmac: implement pause and resume in atc_control
...Fix up trivial conflict in drivers/dma/dw_dmac.c
27 May, 2011
3 commits
-
For certain system configurations a 5 usec udelay before checking I/OAT DMA
channel status is sometimes not sufficient, resulting in a false failure
status and unnecessary freeing of channel resources. Conversely, for many
configurations 5 usec is longer than necessary.Loop for up to 20 usec waiting for successful status before failing.
Signed-off-by: Dimitri Sivanich
Signed-off-by: Dan Williams -
Signed-off-by: Vinod Koul
Signed-off-by: Dan Williams -
With the addition of a device platform mfd_cell pointer, MFD drivers
can go back to passing platform data back to their sub drivers.
This allows for an mfd_cell->mfd_data removal and thus keep the
sub drivers MFD agnostic. This is mostly needed for non MFD aware
sub drivers.Acked-by: Richard Röjfors
Signed-off-by: Samuel Ortiz
25 May, 2011
4 commits
-
Nobody is currently maintaining dw_dmac. We are using dw_dmac for SPEAr13xx and
are currently maintaining it. After discussing with Vinod, sending this patch to
update maintainer-ship of dw_dmac.Signed-off-by: Viresh Kumar
Acked-by: Havard Skinnemoen
Signed-off-by: Vinod Koul -
Update SH_DMAC_MAX_CHANNELS to support the 20 DMA
channels included in the sh73a0 SY-DMAC hardware.Signed-off-by: Magnus Damm
Signed-off-by: Paul Mundt -
Fix the shdma.c handing of SH_DMAC_MAX_CHANNELS
to avoid overwriting the chan_irq[] and chan_flag[]
arrays in the case of pdata->channel_num is larger
than SH_DMAC_MAX_CHANNELS.With this patch applied up to SH_DMAC_MAX_CHANNELS
will be used by the shdma.c driver. If more channels
are available in the platform data the user will
be notified on the console.Signed-off-by: Magnus Damm
Signed-off-by: Paul Mundt -
This patch makes the shdma.c driver allow slave operation
on DMA hardware mapped with a single I/O-memory window.The dmae_set_dmars() function is adjusted to use the
first memory window in case of a missing DMARS window.At probe() time the code is updated to enable DMA_SLAVE
only if slave information is passed with the platform data.Signed-off-by: Magnus Damm
Signed-off-by: Paul Mundt
24 May, 2011
2 commits
-
* 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (23 commits)
sh: Ignore R_SH_NONE module relocations.
SH: SE7751: Fix pcibios_map_platform_irq prototype.
sh: remove warning and warning_symbol from struct stacktrace_ops
sh: wire up sys_sendmmsg.
clocksource: sh_tmu: Runtime PM support
clocksource: sh_tmu: __clocksource_updatefreq_hz() update
clocksource: sh_cmt: Runtime PM support
clocksource: sh_cmt: __clocksource_updatefreq_hz() update
dmaengine: shdma: synchronize RCU before freeing, simplify spinlock
dmaengine: shdma: add runtime- and system-level power management
dmaengine: shdma: fix locking
sh: sh-sci: sh7377 and sh73a0 build fixes
sh: cosmetic improvement: use an existing pointer
serial: sh-sci: suspend/resume wakeup support V2
serial: sh-sci: Runtime PM support
sh: select IRQ_FORCED_THREADING.
sh: intc: Set virtual IRQs as nothread.
sh: fixup fpu.o compile order
i2c: add a module alias to the sh-mobile driver
ALSA: add a module alias to the FSI driver
... -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
b43: fix comment typo reqest -> request
Haavard Skinnemoen has left Atmel
cris: typo in mach-fs Makefile
Kconfig: fix copy/paste-ism for dell-wmi-aio driver
doc: timers-howto: fix a typo ("unsgined")
perf: Only include annotate.h once in tools/perf/util/ui/browsers/annotate.c
md, raid5: Fix spelling error in comment ('Ofcourse' --> 'Of course').
treewide: fix a few typos in comments
regulator: change debug statement be consistent with the style of the rest
Revert "arm: mach-u300/gpio: Fix mem_region resource size miscalculations"
audit: acquire creds selectively to reduce atomic op overhead
rtlwifi: don't touch with treewide double semicolon removal
treewide: cleanup continuations and remove logging message whitespace
ath9k_hw: don't touch with treewide double semicolon removal
include/linux/leds-regulator.h: fix syntax in example code
tty: fix typo in descripton of tty_termios_encode_baud_rate
xtensa: remove obsolete BKL kernel option from defconfig
m68k: fix comment typo 'occcured'
arch:Kconfig.locks Remove unused config option.
treewide: remove extra semicolons
...
23 May, 2011
4 commits
-
After discovering that wide use of prefetch on modern CPUs
could be a net loss instead of a win, net drivers which were
relying on the implicit inclusion of prefetch.h via the list
headers showed up in the resulting cleanup fallout. Give
them an explicit include via the following $0.02 script.=========================================
#!/bin/bash
MANUAL=""
for i in `git grep -l 'prefetch(.*)' .` ; do
grep -q '' $i
if [ $? = 0 ] ; then
continue
fi( echo '?^#include '
echo .
echo w
echo q
) | ed -s $i > /dev/null 2>&1
if [ $? != 0 ]; then
echo $i needs manual fixup
MANUAL="$i $MANUAL"
fi
done
echo ------------------- 8\
[ Fixed up some incorrect #include placements, and added some
non-network drivers and the fib_trie.c case - Linus ]
Signed-off-by: Linus Torvalds -
List elements, deleted using list_del_rcu(), cannot be freed without
synchronising RCU. Further, the spinlock, used to protect the RCU
writer, is called in process context, so, we don't have to save flags.Signed-off-by: Guennadi Liakhovetski
Signed-off-by: Paul Mundt -
This patch extends and fixes runtime power management in the shdma
driver to support powering down the DMA controller and adds support
for system-level suspend and resume.Signed-off-by: Guennadi Liakhovetski
Signed-off-by: Paul Mundt -
Close multiple theoretical races, especially the one in
.device_free_chan_resources().Signed-off-by: Guennadi Liakhovetski
Signed-off-by: Paul Mundt
19 May, 2011
2 commits
-
Move the dmaengine subsystem up early in the drivers Makefile so
DMA is made available early to all drivers, just like e.g.
regulators. Now even regulators can use DMA on the same initlevel.
As a result we can bump the ste_dma40 and coh901318 dmaengine
drivers down one initlevel to subsys_init().Signed-off-by: Linus Walleij
Signed-off-by: Vinod Koul -
Haavard's e-mail address at Atmel is no longer valid.
Signed-off-by: Jean Delvare
Acked-by: Havard Skinnemoen
Signed-off-by: Jiri Kosina
13 May, 2011
5 commits
-
Some peripherals like amba-pl011 needs pause to be implemented in DMA controller
drivers. This also returns correct status from dwc_tx_status() in case chan is
paused.Signed-off-by: Linus Walleij
Signed-off-by: Viresh Kumar
Signed-off-by: Vinod Koul -
dmaengine routines can be called from interrupt context and with interrupts
disabled. Whereas spin_unlock_bh can't be called from such contexts. So this
patch converts all spin_*_bh routines to irqsave variants.Also, spin_lock() used in tasklet is converted to irqsave variants, as tasklet
can be interrupted, and dma requests from such interruptions may also call
spin_lock.Now, submission from callbacks are permitted as per dmaengine framework. So we
shouldn't hold any locks while calling callbacks. As locks were taken by parent
routines, so releasing them before calling callbacks doesn't look clean enough.
So, locks are taken inside all routine now, whereever they are required. And
dwc_descriptor_complete is always called without taking locks.Signed-off-by: Viresh Kumar
Signed-off-by: Vinod Koul -
If len passed in sg for slave_sg transfers is greater than DWC_MAX_COUNT, then
driver programmes controller incorrectly. This patch adds code to handle this
situation by allocation more than one desc for same sg.Signed-off-by: Viresh Kumar
Signed-off-by: Vinod Koul -
If transfer status is !=DMA_SUCCESS, return total transfer len as residue,
instead of zero.Signed-off-by: Viresh Kumar
Signed-off-by: Vinod Koul -
If dmaengine_terminate_all() is called for dma channel, then it doesn't make
much sense to call registered callback routine. While in case of success or
failure it must be called.Signed-off-by: Viresh Kumar
Signed-off-by: Vinod Koul
12 May, 2011
1 commit
-
With the addition of the "pause" feature, an active wait was introduced
to check the "FIFO empty" event. This event was not always happening and
a timout contition was needed.
But, in some cases, this event depend on the peripheral connected to the
channel that is paused: FIFO becomes empty if the peripheral consumes data.
The timeout is pretty difficult to evaluate. Moreover, this check is not
needed.
In conclusion, it seems sensible to entirely remove the checking of
"FIFO empty" status when pausing.Signed-off-by: Nicolas Ferre
[commit msg edited for grammer]
Signed-off-by: Vinod Koul
09 May, 2011
10 commits
-
Signed-off-by: Tomoya MORINAGA
Signed-off-by: Vinod Koul -
Support new device OKI SEMICONDUCTOR ML7223 IOH(Input/Output Hub).
The ML7223 IOH is for MP(Media Phone) use.
The ML7223 is companion chip for Intel Atom E6xx series.
The ML7223 is completely compatible for Intel EG20T PCH.Signed-off-by: Tomoya MORINAGA
Signed-off-by: Vinod Koul -
Support I2S device for ML7213 IOH
Signed-off-by: Tomoya MORINAGA
Signed-off-by: Vinod Koul -
Currently, Direct-Start mode(*) is enabled.
Our IOH's devices must not use this mode.
This causes unexpected behavior.
This patch deletes Direct-Start setting.
(*) This mode is used in order for CPU to generate the DMA request.Signed-off-by: Tomoya MORINAGA
Signed-off-by: Vinod Koul -
Fix checkpatch warnings.
Signed-off-by: Tomoya MORINAGA
Signed-off-by: Vinod Koul -
Currently, even-channel number is set as tx direction and odd is set as rx.
However, though video-in uses ch6, the direction is not tx but rx.
This patch sets video-in's DMA direction correctly.Signed-off-by: Tomoya MORINAGA
Signed-off-by: Vinod Koul -
A little function helps to chain descriptors:
it is already used in cyclic dma operations, now use it in memcpy and slave_sg
preparation functions.Signed-off-by: Nicolas Ferre
Signed-off-by: Vinod Koul -
Pause and resume controls are useful for audio devices. This also returns
correct status from atc_tx_status() in case chan is paused.Idea from dw_dmac patch by Linus Walleij.
Signed-off-by: Nicolas Ferre
Acked-by: Linus Walleij
Signed-off-by: Vinod Koul -
If transfer status is !=DMA_SUCCESS, return total transfer len as residue,
instead of zero.Idea from dw_dmac patch by Viresh Kumar.
Signed-off-by: Nicolas Ferre
Signed-off-by: Vinod Koul -
The compiler nowadays moans about possibly non-assigned variable.
Fix this by default-assigning 0.Signed-off-by: Philippe Langlais
Signed-off-by: Linus Walleij
Signed-off-by: Vinod Koul
02 May, 2011
5 commits
-
DMA controller has two AHB interfaces on the SOC internal
matrix.
It is more efficient to specialize each interface as the
access to memory can introduce latencies that are not compatible
with peripheral accesses requirements.Signed-off-by: Nicolas Ferre
Signed-off-by: Vinod Koul -
There is no need to test if channel is enabled in tasklet:
- in error path, channel is disabled in interrupt routine
- in normal path, this test is performed in sub functions to report
a misuse of the engine.Signed-off-by: Nicolas Ferre
Signed-off-by: Vinod Koul -
Signed-off-by: Nicolas Ferre
Signed-off-by: Vinod Koul -
Signed-off-by: Nicolas Ferre
Signed-off-by: Vinod Koul -
Now we use Buffer Transfer Completed interrupts. If we
want a chained buffer completed information, we setup the
ATC_IEN bit in CTRLB register in the lli.
This is done by set_desc_eol() function and used by
memcpy/slave_sg functions.Signed-off-by: Nicolas Ferre
Signed-off-by: Vinod Koul