diff options
| author |  Vakul Garg <vakul.garg@nxp.com>
| 2019-04-09 06:38:08 +0000 |
|---|---|---|
| committer |  Herbert Xu <herbert@gondor.apana.org.au>
| 2019-04-18 22:14:58 +0800 |
| commit | bbfcac5ff5f26aafa51935a62eb86b6eacfe8a49 (patch) | |
| tree | f38607a783b0d1fcd81673fe8d3b5ef0312fa9fa | |
| parent | crypto: ccp - Do not free psp_master when PLATFORM_INIT fails (diff) | |
| download | linux-bbfcac5ff5f26aafa51935a62eb86b6eacfe8a49.tar.gz linux-bbfcac5ff5f26aafa51935a62eb86b6eacfe8a49.tar.bz2 linux-bbfcac5ff5f26aafa51935a62eb86b6eacfe8a49.zip | |
crypto: caam/jr - Remove extra memory barrier during job ring dequeue
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>
| -rw-r--r-- | drivers/crypto/caam/jr.c | 2 | ||||
| -rw-r--r-- | drivers/crypto/caam/regs.h | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/drivers/crypto/caam/jr.c b/drivers/crypto/caam/jr.c index 1de2562d0982..044a69b526f7 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(&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); diff --git a/drivers/crypto/caam/regs.h b/drivers/crypto/caam/regs.h index 3cd0822ea819..9e912c722e33 100644 --- a/drivers/crypto/caam/regs.h +++ b/drivers/crypto/caam/regs.h @@ -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) |