Skip to contentSkip to conversation

Patch "dmaengine: mv_xor_v2: set DMA mask to 40 bits" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Jun 12, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

dmaengine: mv_xor_v2: set DMA mask to 40 bits

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:

     dmaengine-mv_xor_v2-set-dma-mask-to-40-bits.patch

and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From b2d3c270f9f2fb82518ac500a9849c3aaf503852 Mon Sep 17 00:00:00 2001

From: Thomas Petazzoni <[email protected]>
Date: Fri, 5 May 2017 11:57:50 +0200
Subject: dmaengine: mv_xor_v2: set DMA mask to 40 bits

From: Thomas Petazzoni <[email protected]>

commit b2d3c270f9f2fb82518ac500a9849c3aaf503852 upstream.

The XORv2 engine on Armada 7K/8K can only access the first 40 bits of the physical address space, so the DMA mask must be set accordingly.

Fixes 19a340b1a820 ("dmaengine: mv_xor_v2: new driver")
---
 drivers/dma/mv_xor_v2.c |    4 ++++
 1 file changed, 4 insertions(+)
drivers/dma/mv_xor_v2.c +4 -0
@@ -693,6 +693,10 @@ static int mv_xor_v2_probe(struct platfo
 
 	platform_set_drvdata(pdev, xor_dev);
 
+	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(40));
+	if (ret)
+		return ret;
+
 	xor_dev->clk = devm_clk_get(&pdev->dev, NULL);
 	if (IS_ERR(xor_dev->clk) && PTR_ERR(xor_dev->clk) == -EPROBE_DEFER)
 		return -EPROBE_DEFER;

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/dmaengine-mv_xor_v2-properly-handle-wrapping-in-the-array-of-hw-descriptors.patch queue-4.9/dmaengine-mv_xor_v2-enable-xor-engine-after-its-configuration.patch queue-4.9/dmaengine-mv_xor_v2-set-dma-mask-to-40-bits.patch queue-4.9/dmaengine-mv_xor_v2-do-not-use-descriptors-not-acked-by-async_tx.patch queue-4.9/dmaengine-mv_xor_v2-handle-mv_xor_v2_prep_sw_desc-error-properly.patch queue-4.9/dmaengine-mv_xor_v2-remove-interrupt-coalescing.patch queue-4.9/dmaengine-mv_xor_v2-fix-tx_submit-implementation.patch