diff options
| author | Gilad Ben-Yossef <gilad@benyossef.com> | 2017-10-30 13:38:03 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-11-21 09:49:24 +0100 |
| commit | 75559e0f485432202fdf3c960229d75b77069076 (patch) | |
| tree | d6df869ae7b64658c2f8abec4111ee9bfaef3335 | |
| parent | 69cf5ab217d23429056f978c70a206c1596e03be (diff) | |
| download | linux-stable-75559e0f485432202fdf3c960229d75b77069076.tar.gz linux-stable-75559e0f485432202fdf3c960229d75b77069076.tar.bz2 linux-stable-75559e0f485432202fdf3c960229d75b77069076.zip | |
staging: ccree: fix 64 bit scatter/gather DMA ops
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>
| -rw-r--r-- | drivers/staging/ccree/cc_lli_defs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/ccree/cc_lli_defs.h b/drivers/staging/ccree/cc_lli_defs.h index 851d3907167e..a9c417b07b04 100644 --- 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, 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 */ } |