linux-toradex.git/drivers/dma/k3dma.c, branch v4.9.30

dmaengine: k3dma: use correct format string for debug output

2016-09-07T08:08:43+00:00

The newly added k3_dma_prep_dma_cyclic function has some debug output
that uses incorrect typecasts, some of which cause a warning like:

drivers/dma/k3dma.c: In function 'k3_dma_prep_dma_cyclic':
drivers/dma/k3dma.c:589:671: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]

In general, we have to print 'dma_addr_t' values using special
'%pad' format to get the correct behavior on kernels that have
a 64-bit dma_addr_t type but 32-bit pointers.

Similarly, printing size_t values should be done using the %z
modifier to get the correct behavior on 64-bit kernels.

Signed-off-by: Arnd Bergmann 
Fixes: a7e08fa6cc78 ("k3dma: Add cyclic mode for audio")
Signed-off-by: Vinod Koul

k3dma: Add cyclic mode for audio

2016-08-31T04:39:32+00:00

Currently the k3dma driver doesn't offer the cyclic mode
necessary for handling audio.

This patch adds it.

Cc: Zhangfei Gao 
Cc: Krzysztof Kozlowski 
Cc: Maxime Ripard 
Cc: Vinod Koul 
Cc: Dan Williams 
Cc: Mark Brown 
Cc: Andy Green 
Acked-by: Zhangfei Gao 
Signed-off-by: Andy Green 
[jstultz: Forward ported to mainline, removed a few
 bits of logic that didn't seem to have much effect]
Signed-off-by: John Stultz 
Signed-off-by: Vinod Koul

k3dma: Fix memory handling in preparation for cyclic mode

2016-08-31T04:39:32+00:00

With cyclic mode, the shared virt-dma logic doesn't actually
manage the descriptor state, nor the calling of the descriptor
free callback. This results in leaking a desc structure every
time we start an audio transfer.

Thus we must manage it ourselves. The k3dma driver already keeps
track of the active and finished descriptors via ds_run and ds_done
pointers, so cleanup how we handle those two values, so when we
tear down everything in terminate_all, call free_desc on the ds_run
and ds_done pointers if they are not null.

NOTE: HiKey doesn't use the non-cyclic dma modes, so I'm not been
able to test those modes. But with this patch we no longer leak
the desc structures.

Cc: Zhangfei Gao 
Cc: Krzysztof Kozlowski 
Cc: Maxime Ripard 
Cc: Vinod Koul 
Cc: Dan Williams 
Cc: Mark Brown 
Cc: Andy Green 
Acked-by: Zhangfei Gao 
Signed-off-by: John Stultz 
Signed-off-by: Vinod Koul

k3dma: Fix occasional DMA ERR issue by using proper dma api

2016-08-31T04:39:32+00:00

After lots of debugging on an occasional DMA ERR issue, I realized
that the desc structures which we point the dma hardware are being
allocated out of regular memory. This means when we fill the desc
structures, that data doesn't always get flushed out to memory by
the time we start the dma transfer, resulting in the dma engine getting
some null values, resulting in a DMA ERR on the first irq.

Thus, this patch adopts mechanism similar to the zx296702_dma of
allocating the desc structures from a dma pool, so the memory caching
rules are properly set to avoid this issue.

Cc: Zhangfei Gao 
Cc: Krzysztof Kozlowski 
Cc: Maxime Ripard 
Cc: Vinod Koul 
Cc: Dan Williams 
Cc: Mark Brown 
Cc: Andy Green 
Acked-by: Zhangfei Gao 
Signed-off-by: John Stutlz 
Signed-off-by: Vinod Koul

k3dma: Fix "nobody cared" message seen on any error

2016-08-31T04:39:32+00:00

As it was before, as soon as the DMAC IP felt there was an error
he would return IRQ_NONE since no actual transfer had completed.

After spinning on that for 100K interrupts, Linux yanks the IRQ with
a "nobody cared" error.

This patch lets it handle the interrupt and keep the IRQ alive.

Cc: Zhangfei Gao 
Cc: Krzysztof Kozlowski 
Cc: Maxime Ripard 
Cc: Vinod Koul 
Cc: Dan Williams 
Cc: Mark Brown 
Cc: Andy Green 
Acked-by: Zhangfei Gao 
Signed-off-by: Andy Green 
[jstultz: Forward ported to mainline]
Signed-off-by: John Stultz 
Signed-off-by: Vinod Koul

k3dma: Fix dma err offsets

2016-08-31T04:39:32+00:00

The offsets for ERR1 and ERR2 are wrong actually.
That's why you can never clear an error.

Cc: Zhangfei Gao 
Cc: Krzysztof Kozlowski 
Cc: Maxime Ripard 
Cc: Vinod Koul 
Cc: Dan Williams 
Cc: Mark Brown 
Cc: Andy Green 
Acked-by: Zhangfei Gao 
Signed-off-by: Andy Green 
[jstultz: Forward ported to mainline]
Signed-off-by: John Stultz 
Signed-off-by: Vinod Koul

k3dma: Fix hisi burst clipping

2016-08-31T04:39:32+00:00

Max burst len is a 4-bit field, but at the moment it's clipped with
a 5-bit constant... reduce it to that which can be expressed

Cc: Zhangfei Gao 
Cc: Krzysztof Kozlowski 
Cc: Maxime Ripard 
Cc: Vinod Koul 
Cc: Dan Williams 
Cc: Mark Brown 
Cc: Andy Green 
Acked-by: Zhangfei Gao 
Signed-off-by: Andy Green 
[jstultz: Forward ported to mainline]
Signed-off-by: John Stultz 
Signed-off-by: Vinod Koul

Merge branch 'topic/dmaengine_cleanups' into for-linus

2016-07-28T04:40:37+00:00

dmaengine: k3dma: add missing clk_disable_unprepare() on error in k3_dma_probe()

2016-07-24T06:29:15+00:00

Add the missing clk_disable_unprepare() before return
from k3_dma_probe() in the error handling case.

Signed-off-by: Wei Yongjun 
Signed-off-by: Vinod Koul

dmaengine: k3dma: explicitly freeup irq

2016-07-16T14:49:02+00:00

dmaengine device should explicitly call devm_free_irq() when using
devm_request_irq().

The irq is still ON when devices remove is executed and irq should be
quiesced before remove is completed.

Signed-off-by: Vinod Koul 
Acked-by: Zhangfei Gao