| Message ID | 1574808866-16764-1-git-send-email-iuliana.prodan@nxp.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Herbert Xu |
| Headers | show |
| Series | [v3] crypto: caam - do not reset pointer size from MCFGR register | expand |
On Wed, Nov 27, 2019 at 12:54:26AM +0200, Iuliana Prodan wrote: > 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> > --- > Changes since v2: > - update description so the referred commit is not split on 2 lines; > - added Reviewed-by. > > drivers/crypto/caam/ctrl.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) Patch applied. Thanks.
diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c index d7c3c38..3e811fc 100644 --- a/drivers/crypto/caam/ctrl.c +++ b/drivers/crypto/caam/ctrl.c @@ -671,11 +671,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);
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> --- Changes since v2: - update description so the referred commit is not split on 2 lines; - added Reviewed-by. drivers/crypto/caam/ctrl.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)