Skip to contentSkip to conversation

Patch "staging: ccree: fix 64 bit scatter/gather DMA ops" has been added to the 4.13-stable tree

PATCH [email protected] 1 participant 1 message Nov 19, 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

staging: ccree: fix 64 bit scatter/gather DMA ops

to the 4.13-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:
staging-ccree-fix-64-bit-scatter-gather-dma-ops.patch
and it can be found in the queue-4.13 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 e0b3f39092a1cff5548cbaf40096ec25e7721de6 Mon Sep 17 00:00:00 2001

From: Gilad Ben-Yossef <[email protected]>
Date: Mon, 30 Oct 2017 13:38:03 +0000
Subject: staging: ccree: fix 64 bit scatter/gather DMA ops

From: Gilad Ben-Yossef <[email protected]>

commit e0b3f39092a1cff5548cbaf40096ec25e7721de6 upstream.

Fix a wrong offset used in splitting a 64 DMA address to MSB/LSB parts needed for scatter/gather HW descriptors causing operations relying on them to fail on 64 bit platforms.

Fixes c6f7f2f4591f ("staging: ccree: refactor LLI access macros")
---
 drivers/staging/ccree/cc_lli_defs.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/ccree/cc_lli_defs.h +1 -1
@@ -59,7 +59,7 @@ static inline void cc_lli_set_addr(u32 *
 	lli_p[LLI_WORD0_OFFSET] = (addr & U32_MAX);
 #ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT
 	lli_p[LLI_WORD1_OFFSET] &= ~LLI_HADDR_MASK;
-	lli_p[LLI_WORD1_OFFSET] |= FIELD_PREP(LLI_HADDR_MASK, (addr >> 16));
+	lli_p[LLI_WORD1_OFFSET] |= FIELD_PREP(LLI_HADDR_MASK, (addr >> 32));
 #endif /* CONFIG_ARCH_DMA_ADDR_T_64BIT */
 }
 

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

queue-4.13/staging-ccree-fix-64-bit-scatter-gather-dma-ops.patch