| From e0b3f39092a1cff5548cbaf40096ec25e7721de6 Mon Sep 17 00:00:00 2001 |
| From: Gilad Ben-Yossef <gilad@benyossef.com> |
| Date: Mon, 30 Oct 2017 13:38:03 +0000 |
| Subject: staging: ccree: fix 64 bit scatter/gather DMA ops |
| |
| From: Gilad Ben-Yossef <gilad@benyossef.com> |
| |
| 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") |
| Reported-by: Stuart Yoder <stuart.yoder@arm.com> |
| Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/staging/ccree/cc_lli_defs.h | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/staging/ccree/cc_lli_defs.h |
| +++ b/drivers/staging/ccree/cc_lli_defs.h |
| @@ -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 */ |
| } |
| |
