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

Commit 9f6d555f authored by Iuliana Prodan's avatar Iuliana Prodan Committed by Greg Kroah-Hartman
Browse files

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



commit 7278fa25aa0ebcc0e62c39b12071069df13f7e77 upstream.

In commit 'a1cf573e ("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: a1cf573e ("crypto: caam - select DMA address size at runtime")
Signed-off-by: default avatarIuliana 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: default avatarHoria Geantă <horia.geanta@nxp.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3b52ada5

drivers/crypto/caam/ctrl.c

+2 −4
Original line number Diff line number Diff line
@@ -685,11 +685,9 @@ static int caam_probe(struct platform_device *pdev) 
	of_node_put(np);



	if (!ctrlpriv->mc_en)

		clrsetbits_32(&ctrl->mcr, MCFGR_AWCACHE_MASK | MCFGR_LONG_PTR,

		clrsetbits_32(&ctrl->mcr, MCFGR_AWCACHE_MASK,

			      MCFGR_AWCACHE_CACH | MCFGR_AWCACHE_BUFF |

			      MCFGR_WDENABLE | MCFGR_LARGE_BURST |

			      (sizeof(dma_addr_t) == sizeof(u64) ?

			       MCFGR_LONG_PTR : 0));

			      MCFGR_WDENABLE | MCFGR_LARGE_BURST);



	handle_imx6_err005766(&ctrl->mcr);