Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbc22b06 authored May 09, 2019 by Herbert Xu

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

This reverts commit bbfcac5f.

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>

parent 8c65d354

drivers/crypto/caam/jr.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

drivers/crypto/caam/regs.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -96,14 +96,6 @@ cpu_to_caam(16)
		cpu_to_caam(32)
		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)
		{
		if (caam_little_end)