openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

crypto: caam - remove deadcode on 32-bit platforms 

When building on a platform with a 32bit DMA address, taking the
upper 32 bits makes no sense.

Signed-off-by: Franck LENORMAND <franck.lenormand@nxp.com>
Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Franck LENORMAND 2020-07-22 15:14:52 +03:00 committed by Herbert Xu
parent f892a21f51
commit 81f2288805
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/crypto/caam/regs.h
View File

@ -173,9 +173,14 @@ static inline u64 rd_reg64(void __iomem *reg)
static inline u64 cpu_to_caam_dma64(dma_addr_t value)
{
if (caam_imx)
return (((u64)cpu_to_caam32(lower_32_bits(value)) << 32) |
(u64)cpu_to_caam32(upper_32_bits(value)));
if (caam_imx) {
u64 ret_val = (u64)cpu_to_caam32(lower_32_bits(value)) << 32;
if (IS_ENABLED(CONFIG_ARCH_DMA_ADDR_T_64BIT))
ret_val |= (u64)cpu_to_caam32(upper_32_bits(value));
return ret_val;
}
return cpu_to_caam64(value);
}