diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2019-05-09 07:20:48 +0200 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2019-05-09 07:20:48 +0200 |
| commit | cbc22b062106993980df43a7ffa93351d3218844 (patch) | |
| tree | bda0992549538be60cec8e58312e82f43be97d31 /drivers/crypto/caam/jr.c | |
| parent | crypto: caam - fix caam_dump_sg that iterates through scatterlist (diff) | |
| download | linux-cbc22b062106993980df43a7ffa93351d3218844.tar.xz linux-cbc22b062106993980df43a7ffa93351d3218844.zip | |
Revert "crypto: caam/jr - Remove extra memory barrier during job ring dequeue"
This reverts commit bbfcac5ff5f26aafa51935a62eb86b6eacfe8a49.
It caused a crash regression on powerpc:
https://lore.kernel.org/linux-crypto/87pnp2aflz.fsf@concordia.ellerman.id.au/
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto/caam/jr.c')
| -rw-r--r-- | drivers/crypto/caam/jr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/crypto/caam/jr.c b/drivers/crypto/caam/jr.c index 044a69b526f7..1de2562d0982 100644 --- a/drivers/crypto/caam/jr.c +++ b/drivers/crypto/caam/jr.c @@ -213,7 +213,7 @@ static void caam_jr_dequeue(unsigned long devarg) mb(); /* set done */ - wr_reg32_relaxed(&jrp->rregs->outring_rmvd, 1); + wr_reg32(&jrp->rregs->outring_rmvd, 1); jrp->out_ring_read_index = (jrp->out_ring_read_index + 1) & (JOBR_DEPTH - 1); |