Skip to content

Commit

Permalink
crypto: caam/jr - Remove extra memory barrier during job ring dequeue
Browse files Browse the repository at this point in the history
In function caam_jr_dequeue(), a full memory barrier is used before
writing response job ring's register to signal removal of the completed
job. Therefore for writing the register, we do not need another write
memory barrier. Hence it is removed by replacing the call to wr_reg32()
with a newly defined function wr_reg32_relaxed().

Signed-off-by: Vakul Garg <vakul.garg@nxp.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  • Loading branch information
Vakul Garg authored and Herbert Xu committed Apr 18, 2019
1 parent f5a2aeb commit bbfcac5
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/crypto/caam/jr.c
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ static void caam_jr_dequeue(unsigned long devarg)
mb();

/* set done */
wr_reg32(&jrp->rregs->outring_rmvd, 1);
wr_reg32_relaxed(&jrp->rregs->outring_rmvd, 1);

jrp->out_ring_read_index = (jrp->out_ring_read_index + 1) &
(JOBR_DEPTH - 1);
Expand Down
8 changes: 8 additions & 0 deletions drivers/crypto/caam/regs.h
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,14 @@ 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)
Expand Down

0 comments on commit bbfcac5

Please sign in to comment.