Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

+1 -9
+1 -1
drivers/crypto/caam/jr.c
··· 213 213 mb(); 214 214 215 215 /* set done */ 216 - wr_reg32_relaxed(&jrp->rregs->outring_rmvd, 1); 216 + wr_reg32(&jrp->rregs->outring_rmvd, 1); 217 217 218 218 jrp->out_ring_read_index = (jrp->out_ring_read_index + 1) & 219 219 (JOBR_DEPTH - 1);
-8
drivers/crypto/caam/regs.h
··· 96 96 cpu_to_caam(32) 97 97 cpu_to_caam(64) 98 98 99 - static inline void wr_reg32_relaxed(void __iomem *reg, u32 data) 100 - { 101 - if (caam_little_end) 102 - writel_relaxed(data, reg); 103 - else 104 - writel_relaxed(cpu_to_be32(data), reg); 105 - } 106 - 107 99 static inline void wr_reg32(void __iomem *reg, u32 data) 108 100 { 109 101 if (caam_little_end)