Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

crypto: caam - do not reset pointer size from MCFGR register

In commit 'a1cf573ee95 ("crypto: caam - select DMA address size at runtime")'
CAAM pointer size (caam_ptr_size) is changed from
sizeof(dma_addr_t) to runtime value computed from MCFGR register.
Therefore, do not reset MCFGR[PS].

Fixes: a1cf573ee95 ("crypto: caam - select DMA address size at runtime")
Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com>
Cc: <stable@vger.kernel.org>
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: Alison Wang <alison.wang@nxp.com>
Reviewed-by: Horia Geantă <horia.geanta@nxp.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

authored by

Iuliana Prodan and committed by
Herbert Xu
7278fa25 bbefa1dd

+2 -4
+2 -4
drivers/crypto/caam/ctrl.c
··· 671 671 of_node_put(np); 672 672 673 673 if (!ctrlpriv->mc_en) 674 - clrsetbits_32(&ctrl->mcr, MCFGR_AWCACHE_MASK | MCFGR_LONG_PTR, 674 + clrsetbits_32(&ctrl->mcr, MCFGR_AWCACHE_MASK, 675 675 MCFGR_AWCACHE_CACH | MCFGR_AWCACHE_BUFF | 676 - MCFGR_WDENABLE | MCFGR_LARGE_BURST | 677 - (sizeof(dma_addr_t) == sizeof(u64) ? 678 - MCFGR_LONG_PTR : 0)); 676 + MCFGR_WDENABLE | MCFGR_LARGE_BURST); 679 677 680 678 handle_imx6_err005766(&ctrl->mcr); 681 679