aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHoria Geant? <horia.geanta@freescale.com>2015-08-21 18:53:20 +0300
committerHerbert Xu <herbert@gondor.apana.org.au>2015-08-24 22:07:38 +0800
commit9f587fa29f7e8ed6b8885cff51a51ace3ad85152 (patch)
treeaa4db25708fc827a2159d9f7c4e8e8dd2ed691c3
parentcrypto: hash - Add AHASH_REQUEST_ON_STACK (diff)
downloadlinux-dev-9f587fa29f7e8ed6b8885cff51a51ace3ad85152.tar.xz
linux-dev-9f587fa29f7e8ed6b8885cff51a51ace3ad85152.zip
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? <horia.geanta@freescale.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--drivers/crypto/caam/ctrl.c2
1 files changed, 1 insertions, 1 deletions
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 {