crypto: ccp - Clean up the LSB slot allocation code (103600ab) · Commits · 戴 / test

drivers/crypto/ccp/ccp-dev-v3.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -404,10 +404,6 @@ static int ccp_init(struct ccp_device *ccp)
		goto e_pool;
		}

		/* Initialize the queues used to wait for KSB space and suspend */
		init_waitqueue_head(&ccp->sb_queue);
		init_waitqueue_head(&ccp->suspend_queue);

		dev_dbg(dev, "Starting threads...\n");
		/* Create a kthread for each queue */
		for (i = 0; i < ccp->cmd_q_count; i++) {

drivers/crypto/ccp/ccp-dev-v5.c

+12 −8

Original line number	Diff line number	Diff line
		@@ -21,6 +21,12 @@

		#include "ccp-dev.h"

		/* Allocate the requested number of contiguous LSB slots
		* from the LSB bitmap. Look in the private range for this
		* queue first; failing that, check the public area.
		* If no space is available, wait around.
		* Return: first slot number
		*/
		static u32 ccp_lsb_alloc(struct ccp_cmd_queue *cmd_q, unsigned int count)
		{
		struct ccp_device *ccp;
		@@ -50,7 +56,7 @@ static u32 ccp_lsb_alloc(struct ccp_cmd_queue *cmd_q, unsigned int count)
		bitmap_set(ccp->lsbmap, start, count);

		mutex_unlock(&ccp->sb_mutex);
		return start * LSB_ITEM_SIZE;
		return start;
		}

		ccp->sb_avail = 0;
		@@ -63,17 +69,18 @@ static u32 ccp_lsb_alloc(struct ccp_cmd_queue *cmd_q, unsigned int count)
		}
		}

		/* Free a number of LSB slots from the bitmap, starting at
		* the indicated starting slot number.
		*/
		static void ccp_lsb_free(struct ccp_cmd_queue *cmd_q, unsigned int start,
		unsigned int count)
		{
		int lsbno = start / LSB_SIZE;

		if (!start)
		return;

		if (cmd_q->lsb == lsbno) {
		if (cmd_q->lsb == start) {
		/* An entry from the private LSB */
		bitmap_clear(cmd_q->lsbmap, start % LSB_SIZE, count);
		bitmap_clear(cmd_q->lsbmap, start, count);
		} else {
		/* From the shared LSBs */
		struct ccp_device *ccp = cmd_q->ccp;
		@@ -751,9 +758,6 @@ static int ccp5_init(struct ccp_device *ccp)
		goto e_pool;
		}

		/* Initialize the queue used to suspend */
		init_waitqueue_head(&ccp->suspend_queue);

		dev_dbg(dev, "Loading LSB map...\n");
		/* Copy the private LSB mask to the public registers */
		status_lo = ioread32(ccp->io_regs + LSB_PRIVATE_MASK_LO_OFFSET);

drivers/crypto/ccp/ccp-dev.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -478,6 +478,10 @@ struct ccp_device ccp_alloc_struct(struct device dev)
		ccp->sb_count = KSB_COUNT;
		ccp->sb_start = 0;

		/* Initialize the wait queues */
		init_waitqueue_head(&ccp->sb_queue);
		init_waitqueue_head(&ccp->suspend_queue);

		ccp->ord = ccp_increment_unit_ordinal();
		snprintf(ccp->name, MAX_CCP_NAME_LEN, "ccp-%u", ccp->ord);
		snprintf(ccp->rngname, MAX_CCP_NAME_LEN, "ccp-%u-rng", ccp->ord);

Admin message