Commit 2d809dcd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto fixes from Herbert Xu:
 "This push fixes a build error on 32-bit archs in the hifn driver as
  well as a potential deadlock in the caam driver."

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: caam - fix possible deadlock condition
  crypto: hifn_795x - fix 64bit division and undefined __divdi3 on 32bit archs
parents 62688e5b ce026cb9

drivers/crypto/caam/jr.c

+5 −5
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static void caam_jr_dequeue(unsigned long devarg) 


		head = ACCESS_ONCE(jrp->head);



		spin_lock_bh(&jrp->outlock);

		spin_lock(&jrp->outlock);



		sw_idx = tail = jrp->tail;

		hw_idx = jrp->out_ring_read_index;
@@ -115,7 +115,7 @@ static void caam_jr_dequeue(unsigned long devarg) 
			jrp->tail = tail;

		}



		spin_unlock_bh(&jrp->outlock);

		spin_unlock(&jrp->outlock);



		/* Finally, execute user's callback */

		usercall(dev, userdesc, userstatus, userarg);
@@ -236,14 +236,14 @@ int caam_jr_enqueue(struct device *dev, u32 *desc, 
		return -EIO;

	}



	spin_lock(&jrp->inplock);

	spin_lock_bh(&jrp->inplock);



	head = jrp->head;

	tail = ACCESS_ONCE(jrp->tail);



	if (!rd_reg32(&jrp->rregs->inpring_avail) ||

	    CIRC_SPACE(head, tail, JOBR_DEPTH) <= 0) {

		spin_unlock(&jrp->inplock);

		spin_unlock_bh(&jrp->inplock);

		dma_unmap_single(dev, desc_dma, desc_size, DMA_TO_DEVICE);

		return -EBUSY;

	}
@@ -265,7 +265,7 @@ int caam_jr_enqueue(struct device *dev, u32 *desc, 


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



	spin_unlock(&jrp->inplock);

	spin_unlock_bh(&jrp->inplock);



	return 0;

}

drivers/crypto/hifn_795x.c

+2 −2
Original line number Diff line number Diff line
@@ -821,8 +821,8 @@ static int hifn_register_rng(struct hifn_device *dev) 
	/*

	 * We must wait at least 256 Pk_clk cycles between two reads of the rng.

	 */

	dev->rng_wait_time	= DIV_ROUND_UP(NSEC_PER_SEC, dev->pk_clk_freq) *

				  256;

	dev->rng_wait_time	= DIV_ROUND_UP_ULL(NSEC_PER_SEC,

						   dev->pk_clk_freq) * 256;



	dev->rng.name		= dev->name;

	dev->rng.data_present	= hifn_rng_data_present,

CRA Git | Maintained and supported by SUSTech CRA and CCSE