hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "crypto: caam/jr - Remove extra memory barrier during job ring dequeue" 

This reverts commit bbfcac5ff5.

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>
This commit is contained in:
Herbert Xu 2019-05-09 13:20:48 +08:00
parent 8c65d35435
commit cbc22b0621
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/crypto/caam/jr.c
View File

@ -213,7 +213,7 @@ static void caam_jr_dequeue(unsigned long devarg)
mb(); mb();
/* set done */ /* 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) & jrp->out_ring_read_index = (jrp->out_ring_read_index + 1) &
(JOBR_DEPTH - 1); (JOBR_DEPTH - 1);

8
drivers/crypto/caam/regs.h
View File

@ -96,14 +96,6 @@ cpu_to_caam(16)
cpu_to_caam(32) cpu_to_caam(32)
cpu_to_caam(64) cpu_to_caam(64)
static inline void wr_reg32_relaxed(void __iomem *reg, u32 data)
{
if (caam_little_end)
writel_relaxed(data, reg);
else
writel_relaxed(cpu_to_be32(data), reg);
}
static inline void wr_reg32(void __iomem *reg, u32 data) static inline void wr_reg32(void __iomem *reg, u32 data)
{ {
if (caam_little_end) if (caam_little_end)