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

Commit 14a8e29c authored by Kim Phillips's avatar Kim Phillips Committed by Herbert Xu
Browse files

crypto: caam - consolidate memory barriers from job ring en/dequeue 



Memory barriers are implied by the i/o register write implementation
(at least on Power).  So we can remove the redundant wmb() in
caam_jr_enqueue, and, in dequeue(), hoist the h/w done notification
write up to before we need to increment the head of the ring, and
save an smp_mb.

Signed-off-by: default avatarKim Phillips <kim.phillips@freescale.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent a8ea07c2

drivers/crypto/caam/jr.c

+2 −6
Original line number Diff line number Diff line
@@ -94,7 +94,8 @@ static void caam_jr_dequeue(unsigned long devarg) 
		userdesc = jrp->entinfo[sw_idx].desc_addr_virt;

		userstatus = jrp->outring[hw_idx].jrstatus;



		smp_mb();

		/* set done */

		wr_reg32(&jrp->rregs->outring_rmvd, 1);



		jrp->out_ring_read_index = (jrp->out_ring_read_index + 1) &

					   (JOBR_DEPTH - 1);
@@ -114,9 +115,6 @@ static void caam_jr_dequeue(unsigned long devarg) 
			jrp->tail = tail;

		}



		/* set done */

		wr_reg32(&jrp->rregs->outring_rmvd, 1);



		spin_unlock_bh(&jrp->outlock);



		/* Finally, execute user's callback */
@@ -265,8 +263,6 @@ int caam_jr_enqueue(struct device *dev, u32 *desc, 
				    (JOBR_DEPTH - 1);

	jrp->head = (head + 1) & (JOBR_DEPTH - 1);



	wmb();



	wr_reg32(&jrp->rregs->inpring_jobadd, 1);



	spin_unlock(&jrp->inplock);