Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75559e0f authored by Gilad Ben-Yossef's avatar Gilad Ben-Yossef Committed by Greg Kroah-Hartman
Browse files

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



commit e0b3f390 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: c6f7f2f4 ("staging: ccree: refactor LLI access macros")
Reported-by: default avatarStuart Yoder <stuart.yoder@arm.com>
Signed-off-by: default avatarGilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 69cf5ab2

drivers/staging/ccree/cc_lli_defs.h

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static inline void cc_lli_set_addr(u32 *lli_p, dma_addr_t addr) 
	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 */

}