2019-11-26 12:53:17

by Iuliana Prodan

Subject: [PATCH v2] 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 <[email protected]>
Cc: <[email protected]>
Cc: Andrey Smirnov <[email protected]>
Cc: Alison Wang <[email protected]>
---
Changes since v1:
- do not reset MCFGR[PS];
- update description;
- cc-ed authors for Fixes tag.

drivers/crypto/caam/ctrl.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index d7c3c3805693..3e811fcc6b83 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);

--
2.17.1

2019-11-26 17:05:15

by Horia Geanta

Subject: Re: [PATCH v2] crypto: caam - do not reset pointer size from MCFGR register

On 11/26/2019 2:23 PM, Iuliana Prodan wrote:
> In commit 'a1cf573ee95 ("crypto: caam - select DMA address
> size at runtime")' CAAM pointer size (caam_ptr_size) is changed
When quoting a commit, it shouldn't be split across several lines.

> 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 <[email protected]>
> Cc: <[email protected]>
> Cc: Andrey Smirnov <[email protected]>
> Cc: Alison Wang <[email protected]>
Reviewed-by: Horia Geant? <[email protected]>

Thanks,
Horia

2019-11-26 22:26:20

by Iuliana Prodan

Subject: Re: [PATCH v2] crypto: caam - do not reset pointer size from MCFGR register

On 11/26/2019 7:03 PM, Horia Geanta wrote:
> On 11/26/2019 2:23 PM, Iuliana Prodan wrote:
>> In commit 'a1cf573ee95 ("crypto: caam - select DMA address
>> size at runtime")' CAAM pointer size (caam_ptr_size) is changed
> When quoting a commit, it shouldn't be split across several lines.
>
Right, I'll send a v3.

>> 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 <[email protected]>
>> Cc: <[email protected]>
>> Cc: Andrey Smirnov <[email protected]>
>> Cc: Alison Wang <[email protected]>
> Reviewed-by: Horia Geant? <[email protected]>
>
Thanks,
Iulia