2015-08-21 15:53:43

by Horia Geantă

Subject: [PATCH] crypto: caam - fix writing to JQCR_MS when using service interface

Most significant part of JQCR (Job Queue Control Register) contains
bits that control endianness: ILE - Immediate Little Endian,
DWS - Double Word Swap.
The bits are automatically set by the Job Queue Controller HW.

Unfortunately these bits are cleared in SW when submitting descriptors
via the register-based service interface.
From LS1021A:
JQCR_MS = 08080100 - before writing: ILE | DWS | SRC (JR0)
JQCR_MS = 30000100 - after writing: WHL | FOUR | SRC (JR0)

This would cause problems on little endian caam for descriptors
containing immediata data or double-word pointers.
Currently there is no problem since the only descriptors ran through
this interface are the ones that (un)instantiate RNG.

Signed-off-by: Horia Geantă <[email protected]>
---

It does not affect current driver, thus not Cc-ing stable.

drivers/crypto/caam/ctrl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index 81b552d1ad91..09c16f5ea97d 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -139,7 +139,7 @@ static inline int run_descriptor_deco0(struct device *ctrldev, u32 *desc,
flags |= DECO_JQCR_FOUR;

/* Instruct the DECO to execute it */
- wr_reg32(&deco->jr_ctl_hi, flags);
+ setbits32(&deco->jr_ctl_hi, flags);

timeout = 10000000;
do {
--
2.4.4

2015-08-24 14:18:04

by Herbert Xu

Subject: Re: [PATCH] crypto: caam - fix writing to JQCR_MS when using service interface

On Fri, Aug 21, 2015 at 06:53:20PM +0300, Horia Geantă wrote:
> Most significant part of JQCR (Job Queue Control Register) contains
> bits that control endianness: ILE - Immediate Little Endian,
> DWS - Double Word Swap.
> The bits are automatically set by the Job Queue Controller HW.
>
> Unfortunately these bits are cleared in SW when submitting descriptors
> via the register-based service interface.
> >From LS1021A:
> JQCR_MS = 08080100 - before writing: ILE | DWS | SRC (JR0)
> JQCR_MS = 30000100 - after writing: WHL | FOUR | SRC (JR0)
>
> This would cause problems on little endian caam for descriptors
> containing immediata data or double-word pointers.
> Currently there is no problem since the only descriptors ran through
> this interface are the ones that (un)instantiate RNG.
>
> Signed-off-by: Horia Geantă <[email protected]>

Applied.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt