aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-06-01dmaengine: shdmac: Include linux/err.hLaurent Pinchart1-0/+1
linux/err.h isn't implicitly included by the current headers on all platforms, resulting in compilation failures due to implicit declarations of IS_ERR and PTR_ERR. Fix this by including linux/err.h. Signed-off-by: Laurent Pinchart <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-06-01dmaengine: shdmac: Keep #include sorted alphabeticallyLaurent Pinchart1-7/+7
This helps detecting duplicate includes. Signed-off-by: Laurent Pinchart <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-06-01dmaengine: s3c24xx-dma: Add cyclic transfer supportVasily Khoruzhick1-1/+111
Many audio interface drivers require support of cyclic transfers to work correctly, for example Samsung ASoC DMA driver. This patch adds support for cyclic transfers to the s3c24xx-dma driver Signed-off-by: Vasily Khoruzhick <[email protected]> Reviewed-by: Heiko Stuebner <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-06-01dmaengine: s3c24xx-dma: Process whole SG chainVasily Khoruzhick1-1/+0
Due to redundant 'break' in loop driver processed only first chunk. Signed-off-by: Vasily Khoruzhick <[email protected]> Reviewed-by: Heiko Stuebner <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-06-01dmaengine: imx: correct sdmac->status for cyclic dma txJiada Wang1-2/+0
In cyclic dma tx's handler sdma_handle_channel_loop(), SDMA channel statue is set to either DMA_ERROR or DMA_IN_PROGRESS based on each period's status. This has the following issues: 1) If one period's status is BD_RROR, then channel status will be set to DMA_ERROR, but it will be overwritten to DMA_IN_PROGRESS if the following periods are OK. 2) DMA client may call sdma_control(DMA_TERMINATE_ALL) to stop the cyclic dma operation, sdma channel status will be set to DMA_ERROR, but if after this handler is called, then again the channel status will be overwritten to DMA_IN_PROGRESS. Then the following dmaengine_prep_dma_cyclic() will always fail, as channel status is DMA_IN_PROGRESS. As in cyclic dma tx, channel status will be initially set to DMA_IN_PROGRESS, driver only needs to change it to DMA_ERROR, when something wrong happens (one period status is wrong, or stoped by client explicitly). Signed-off-by: Jiada Wang <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-05-22dmaengine: pch: fix compilation for alpha targetVinod Koul1-0/+1
commit 4828b493 introduced COMPILE_TEST for this driver and this cause compile failure on alpha as kzalloc wasnt availble for this arch in included header, so explictly add slab.h Reported-by: kbuild test robot <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-05-22dma: pch_dma: Fix Kconfig dependenciesJean Delvare1-1/+1
The pch_dma driver is for a companion chip to the Intel Atom E600 series processors. These are 32-bit x86 processors so the driver is only needed on X86_32. Add COMPILE_TEST as an alternative, so that the driver can still be build-tested elsewhere. Signed-off-by: Jean Delvare <[email protected]> Cc: Dan Williams <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-05-22dmaengine: mpc512x: add support for peripheral transfersAlexander Popov1-5/+239
Introduce support for slave s/g transfer preparation and the associated device control callback in the MPC512x DMA controller driver, which adds support for data transfers between memory and peripheral I/O to the previously supported mem-to-mem transfers. Signed-off-by: Alexander Popov <[email protected]> [fixed subsytem name] Signed-off-by: Vinod Koul <[email protected]>
2014-05-22dmaengine: fix comment typoAlexander Popov1-1/+1
Fix comment typo. Signed-off-by: Alexander Popov <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-05-21dma: remove DEFINE_PCI_DEVICE_TABLE macroJingoo Han2-2/+2
Don't use DEFINE_PCI_DEVICE_TABLE macro, because this macro is deprecated. Signed-off-by: Jingoo Han <[email protected]> Acked-by: Andy Shevchenko <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-05-07dma: ste_dma40: Convert to the late system PM callbacksUlf Hansson1-1/+1
Clients may still be active in the early phase of system PM, thus we need to move the suspend operations to the late system PM phase. Signed-off-by: Ulf Hansson <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-05-07dma: mmp_pdma: add support for residue reportingDaniel Mack1-3/+84
A channel can accommodate more than one transaction, each consisting of multiple descriptors, the last of which has the DCMD_ENDIRQEN bit set. In order to report the channel's residue, we hence have to walk the list of running descriptors, look for those which match the cookie, and then try to find the descriptor which defines upper and lower boundaries that embrace the current transport pointer. Once it is found, walk forward until we find the descriptor that tells us about the end of a transaction via a set DCMD_ENDIRQEN bit. Signed-off-by: Daniel Mack <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-05-07dma: ste_dma40: Fixup system suspend/resumeUlf Hansson1-3/+10
Make sure to handle register context save/restore when needed from system PM callbacks. Previously we solely trusted the device to reside in in-active state while the system suspend callback were invoked, which is just too optimistic. Signed-off-by: Ulf Hansson <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-05-07dma: ste_dma40: Convert to PM macros while providing the PM callbacksUlf Hansson1-79/+71
Converting to the PM macros makes us simplify and remove some code. Signed-off-by: Ulf Hansson <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-05-07dma: ste_dma40: Don't require CONFIG_PM_RUNTIMEUlf Hansson1-11/+10
While probing, don't rely on CONFIG_PM_RUNTIME to be configured. Instead, let's power up the device and make it fully operational. Update the runtime PM status to reflect the active state. Signed-off-by: Ulf Hansson <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-05-07dma: ste_dma40: Maintain spinlock order while handling pauseUlf Hansson1-1/+1
The runtime PM resume callback needs to be executed while holding the spinlock, make sure to maintain this for the pause operation as well. Signed-off-by: Ulf Hansson <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-05-07dmaengine: dw: convert to use SET_LATE_SYSTEM_SLEEP_PM_OPSAndy Shevchenko1-8/+2
The commit 4501fe61 "dma: dw: Add suspend and resume handling for PCI mode DW_DMAC." introduces system power management callbacks. Regarding to commit f78c4cff "PM / Sleep: Add macro to define common late/early system PM callbacks" we have nice macro to setup dev_pm_ops structure. This patch converts a driver to use the macro. Signed-off-by: Andy Shevchenko <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-05-07dmaengine: dw: move PM to suspend_late / resume_early stagesAndy Shevchenko1-14/+4
There is no need to use *_noirq version of suspend and resume PM callbacks. The suspend_late / resume_early suit better (it was discussed in [1]) and in future could be used for runtime PM support. [1] http://www.spinics.net/lists/kernel/msg1650974.html Signed-off-by: Andy Shevchenko <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-05-02dma: mpc512x: fix freeing resources in mpc_dma_probe() and mpc_dma_remove()Alexander Popov1-17/+38
Fix mpc_dma_probe() error path and mpc_dma_remove(): manually free IRQs and dispose IRQ mappings before devm_* takes care of other resources. Moreover replace devm_request_irq() with request_irq() since there is no need to use it because the original code always frees IRQ manually with devm_free_irq(). Replace devm_free_irq() with free_irq() accordingly. Signed-off-by: Alexander Popov <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-05-02dma: mpc512x: separate 'compatible' values for MPC512x and MPC8308Alexander Popov3-2/+3
MPC512x and MPC8308 have similar DMA controllers, but are independent SoCs. DMA controller driver should have separate 'compatible' values for these SoCs. Signed-off-by: Alexander Popov <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-05-02dma: mpc512x: reorder mpc8308 specific instructionsAlexander Popov1-17/+25
Concentrate the specific code for MPC8308 in the 'if' branch and handle MPC512x in the 'else' branch. This modification only reorders instructions but doesn't change behaviour. Signed-off-by: Alexander Popov <[email protected]> Acked-by: Anatolij Gustschin <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-05-02DMA: Freescale: move functions to avoid forward declarationsHongbo Zhang1-95/+95
These functions will be modified in the next patch in the series. By moving the function in a patch separate from the changes, it will make review easier. Signed-off-by: Hongbo Zhang <[email protected]> Signed-off-by: Qiang Liu <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-05-02DMA: Freescale: add fsl_dma_free_descriptor() to reduce code duplicationHongbo Zhang1-10/+17
There are several places where descriptors are freed using identical code. This patch puts this code into a function to reduce code duplication. Signed-off-by: Hongbo Zhang <[email protected]> Signed-off-by: Qiang Liu <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-05-02DMA: Freescale: remove attribute DMA_INTERRUPT of dmaengineHongbo Zhang1-31/+0
Delete attribute DMA_INTERRUPT because fsldma doesn't support this function, exception will be thrown if talitos is used to offload xor at the same time. Signed-off-by: Hongbo Zhang <[email protected]> Signed-off-by: Qiang Liu <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-05-02DMA: Freescale: unify register access methodsHongbo Zhang1-19/+33
Methods of accessing DMA controller registers are inconsistent, some registers are accessed by DMA_IN/OUT directly, while others are accessed by functions get/set_* which are wrappers of DMA_IN/OUT, and even for the BCR register, it is read by get_bcr but written by DMA_OUT. This patch unifies the inconsistent methods, all registers are accessed by get/set_* now. Signed-off-by: Hongbo Zhang <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-05-02DMA: Freescale: remove the unnecessary FSL_DMA_LD_DEBUGHongbo Zhang1-10/+0
Some codes are calling chan_dbg with FSL_DMA_LD_DEBUG surrounded, it is really unnecessary to use such a macro because chan_dbg is a wrapper of dev_dbg, we do have corresponding DEBUG macro to switch on/off dev_dbg, and most of the other codes are also calling chan_dbg directly without using FSL_DMA_LD_DEBUG. Signed-off-by: Hongbo Zhang <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-05-02DMA: shdma: add cyclic transfer supportKuninori Morimoto2-7/+66
This patch add cyclic transfer support and enables dmaengine_prep_dma_cyclic() Signed-off-by: Kuninori Morimoto <[email protected]> [reflown changelog for readablity] Signed-off-by: Vinod Koul <[email protected]>
2014-05-02DMA: shdma: tidyup callback chunk finderKuninori Morimoto1-9/+9
Current shdma is using "last" which indicates last desc which needs to have callback function. But that desc's chunks is always 1, we can use it as finder Signed-off-by: Kuninori Morimoto <[email protected]> [reflown changelog for readablity] Signed-off-by: Vinod Koul <[email protected]>
2014-05-02dma: mmp_pdma: Fix physical channel memory allocation sizeLaurent Pinchart1-4/+2
Use sizeof(*var) instead of sizeof(type) when calling devm_k*alloc(). This avoids using the wrong type as was done to allocate the physical channels array. Signed-off-by: Laurent Pinchart <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-05-02dma: mmp_pdma: Simplify access to channel drcmr valueLaurent Pinchart1-1/+1
As the physical channel and virtual channel point to each other, pchan->phy->vchan is always equal to pchan. Simplify the code accordingly. Signed-off-by: Laurent Pinchart <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-05-02dma: mmp_pdma: Fix the #dma-channels DT property documentationLaurent Pinchart1-4/+7
The property is optional and defaults to 32. Document it as such. Cc: [email protected] Signed-off-by: Laurent Pinchart <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-04-30dmaengine: edma: update DMA memcpy to use new param elementJoel Fernandes1-2/+2
edma param struct is now within an edma_pset struct introduced in Thomas Gleixner's edma tx status series. Update memcpy function for the same. Cc: Thomas Gleixner <[email protected]> Signed-off-by: Joel Fernandes <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-04-30dmaengine: edma: Document variables used for residue accountingJoel Fernandes1-2/+24
The granular residue accounting code uses certain variables specifically for residue accounting. Document these in the structure declaration. Also move around some elements and group them together. Cc: Thomas Gleixner <[email protected]> Signed-off-by: Joel Fernandes <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-04-30dmaengine: edma: Provide granular accountingThomas Gleixner1-2/+65
The first slot in the ParamRAM of EDMA holds the current active subtransfer. Depending on the direction we read either the source or the destination address from there. In the internal psets we have the address of the buffer(s). In the cyclic case we only use the internal pset[0] which holds the start address of the circular buffer and calculate the remaining room to the end of the buffer. In the SG case we read the current address and compare it to the internal psets address and length. - If the current address is outside of this range, the pset has been processed already and we mark it done, update the residue_stat value and process the next set. That avoids that we need to walk all processed psets for every invocation of tx_status. - If its inside the range we know that we look at the current active set and stop the walk. - In case of intermediate transfers we update the stats in the interrupt callback function before starting the next batch of transfers. The tx_status callback and the interrupt callback are serialized via vchan.lock. Signed-off-by: Thomas Gleixner <[email protected]> [[email protected]: Hunk #2 in original patch manually applied] Signed-off-by: Joel Fernandes <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-04-30dmaengine: edma: Make reading the position of active channels workThomas Gleixner2-16/+10
As Joel pointed out, edma_read_position() uses memcpy_fromio() to read the parameter ram. That's not synchronized with the internal update as it does a byte by byte copy. We need to do a 32bit read to get a consistent value. Further reading destination and source is pointless. In DEV_TO_MEM transfers we are only interested in the destination, in MEM_TO_DEV we care about the source. In MEM_TO_MEM it really does not matter which one you read. Simple solution: Remove the pointers, select dest/source via a bool and return the read value. Remove the export of this function while at it. The only potential user is the dmaengine and that's always builtin. Signed-off-by: Thomas Gleixner <[email protected]> Acked-by: Sekhar Nori <[email protected]> Signed-off-by: Joel Fernandes <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-04-30dmaengine: edma: Store transfer data in edma_desc and edma_psetThomas Gleixner1-0/+9
For granular accounting we need to store the direction and the information for the individual psets: - source or destination address, depending on direction - length Signed-off-by: Thomas Gleixner <[email protected]> Signed-off-by: Joel Fernandes <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-04-30dmaengine: edma: Create private pset structThomas Gleixner1-31/+36
Preparatory patch to support finer grained accounting. Move the edma_params array out of edma_desc so we can add further per pset data to it. Signed-off-by: Thomas Gleixner <[email protected]> [[email protected]: Fixed up hunk #3 in original patch to apply] Signed-off-by: Joel Fernandes <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-04-30dmaengine: edma: Check the current decriptor first in tx_status()Thomas Gleixner1-4/+3
It's likely that the caller investigates the status of a currently active descriptor. Make that simple check first and only rumage in the vchan list if that fails. Signed-off-by: Thomas Gleixner <[email protected]> Signed-off-by: Joel Fernandes <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-04-30dmaengine: edma: Sanitize residue reportingThomas Gleixner1-25/+9
The residue reporting in edma_tx_status() is just broken. It blindly walks the psets and recalculates the lenght of the transfer from the hardware parameters. For cyclic transfers it adds the link pset, which results in interestingly large residues. For non-cyclic it adds the dummy pset, which is stupid as well. Aside of that it's silly to walk through the pset params when the per descriptor residue is known at the point of creating it. Store the information in edma_desc and use it. Signed-off-by: Thomas Gleixner <[email protected]> Signed-off-by: Joel Fernandes <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-04-29dmaengine: edma: Add channel number to debug printsPeter Ujfalusi1-3/+4
It helps to identify issues if we have some information regarding to the channel which the event is associated. Signed-off-by: Peter Ujfalusi <[email protected]> Acked-by: Joel Fernandes <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-04-23dmaengine: edma: No need save/restore interrupt flags during spin_lock in IRQJoel Fernandes1-5/+4
The vchan lock in edma_callback is acquired in hard interrupt context. As interrupts are already disabled, there's no point in save/restoring interrupt mask bit or cpsr flags. Get rid of flags local variable and use spin_lock instead of spin_lock_irqsave. Signed-off-by: Joel Fernandes <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-04-22dmaengine: edma: Add DMA memcpy supportJoel Fernandes1-0/+51
We add DMA memcpy support to EDMA driver. Successful tests performed using dmatest kernel module. Copy alignment is set to DMA_SLAVE_BUSWIDTH_4_BYTES and users must ensure length is aligned so that copy is performed fully. Signed-off-by: Joel Fernandes <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-04-22dmaengine: edma: Print the direction value as well when it is not supportedPeter Ujfalusi1-2/+2
In case of not supported direction it is better to print the direction also. It is unlikely, but in such an event it helps with the debugging. Signed-off-by: Peter Ujfalusi <[email protected]> Acked-by: Joel Fernandes <[email protected]> Reviewed-and-Tested-by: Joel Fernandes <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-04-22dmaengine: edma: Prefix debug prints where the text were identical in prep ↵Peter Ujfalusi1-6/+8
callbacks prep_slave_sg and prep_dma_cyclic callbacks have mostly same failure cases with the same texts printed in case we hit them. It helps when debugging if we know exactly which callback generated the errors. At the same time change the debug level for descriptor allocation failure from dbg to err since all other error cases are dev_err and this failure is similarly fatal as the other ones. Signed-off-by: Peter Ujfalusi <[email protected]> Acked-by: Joel Fernandes <[email protected]> Reviewed-and-Tested-by: Joel Fernandes <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-04-22dmaengine: edma: Implement device_slave_caps callbackPeter Ujfalusi1-0/+18
With the callback implemented omap-dma can provide information to client drivers regarding to supported address widths, directions, residue granularity, etc. Signed-off-by: Peter Ujfalusi <[email protected]> Acked-by: Joel Fernandes <[email protected]> Reviewed-and-Tested-by: Joel Fernandes <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-04-22dmaengine: edma: Reduce debug print verbosity for non verbose debuggingPeter Ujfalusi1-6/+5
Do not print the paRAM information when verbose debugging is not asked and also reduce the number of lines printed in edma_prep_dma_cyclic() Signed-off-by: Peter Ujfalusi <[email protected]> Acked-by: Joel Fernandes <[email protected]> Reviewed-and-Tested-by: Joel Fernandes <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-04-22dmaengine: edma: Set DMA_CYCLIC capability flagPeter Ujfalusi2-0/+2
Indicate that the edma dmaengine driver has support for cyclic mode. Signed-off-by: Peter Ujfalusi <[email protected]> Acked-by: Joel Fernandes <[email protected]> Reviewed-and-Tested-by: Joel Fernandes <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-04-22dmaengine: edma: Add support for DMA_PAUSE/RESUME operationPeter Ujfalusi1-0/+28
Pause/Resume can be used by the audio stack when the stream is paused/resumed The edma platform code has support for this and the legacy audio stack used this. Signed-off-by: Peter Ujfalusi <[email protected]> Acked-by: Joel Fernandes <[email protected]> Reviewed-and-Tested-by: Joel Fernandes <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-04-22dmaengine: edma: Correct the handling of src/dst_maxburst == 0Peter Ujfalusi1-0/+4
When clients asks for maxburst = 0 it is basically the same case as if they were asking for maxburst = 1 since in both case ASYNC need to be used and the eDMA is expected to write/read one word per DMA request. Signed-off-by: Peter Ujfalusi <[email protected]> Acked-by: Joel Fernandes <[email protected]> Reviewed-and-Tested-by: Joel Fernandes <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
2014-04-22arm: common: edma: Save the number of event queues/TCsPeter Ujfalusi1-0/+3
For later use save the number of queues available for the CC. Signed-off-by: Peter Ujfalusi <[email protected]> Acked-by: Joel Fernandes <[email protected]> Reviewed-and-Tested-by: Joel Fernandes <[email protected]> Signed-off-by: Vinod Koul <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.