iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crypto: ccp - Clean up the LSB slot allocation code

Browse Source 
Fix a few problems revealed by testing: verify consistent
units, especially in public slot allocation. Percolate
some common initialization code up to a common routine.
Add some comments.

Signed-off-by: Gary R Hook <gary.hook@amd.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Gary R Hook 2016-10-18 17:33:37 -05:00 committed by Herbert Xu
parent ec9b70df75
commit 103600ab96
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/crypto/ccp/ccp-dev-v3.c
View File

@ -404,10 +404,6 @@ static int ccp_init(struct ccp_device *ccp)
goto e_pool; 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"); dev_dbg(dev, "Starting threads...\n");
/* Create a kthread for each queue */ /* Create a kthread for each queue */
for (i = 0; i < ccp->cmd_q_count; i++) { for (i = 0; i < ccp->cmd_q_count; i++) {

20
drivers/crypto/ccp/ccp-dev-v5.c
View File

@ -21,6 +21,12 @@
#include "ccp-dev.h" #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) static u32 ccp_lsb_alloc(struct ccp_cmd_queue *cmd_q, unsigned int count)
{ {
struct ccp_device *ccp; 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); bitmap_set(ccp->lsbmap, start, count);
mutex_unlock(&ccp->sb_mutex); mutex_unlock(&ccp->sb_mutex);
return start * LSB_ITEM_SIZE; return start;
} }
ccp->sb_avail = 0; 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, static void ccp_lsb_free(struct ccp_cmd_queue *cmd_q, unsigned int start,
unsigned int count) unsigned int count)
{ {
int lsbno = start / LSB_SIZE;
if (!start) if (!start)
return; return;
if (cmd_q->lsb == lsbno) { if (cmd_q->lsb == start) {
/* An entry from the private LSB */ /* An entry from the private LSB */
bitmap_clear(cmd_q->lsbmap, start % LSB_SIZE, count); bitmap_clear(cmd_q->lsbmap, start, count);
} else { } else {
/* From the shared LSBs */ /* From the shared LSBs */
struct ccp_device *ccp = cmd_q->ccp; struct ccp_device *ccp = cmd_q->ccp;
@ -751,9 +758,6 @@ static int ccp5_init(struct ccp_device *ccp)
goto e_pool; goto e_pool;
} }
/* Initialize the queue used to suspend */
init_waitqueue_head(&ccp->suspend_queue);
dev_dbg(dev, "Loading LSB map...\n"); dev_dbg(dev, "Loading LSB map...\n");
/* Copy the private LSB mask to the public registers */ /* Copy the private LSB mask to the public registers */
status_lo = ioread32(ccp->io_regs + LSB_PRIVATE_MASK_LO_OFFSET); status_lo = ioread32(ccp->io_regs + LSB_PRIVATE_MASK_LO_OFFSET);

4
drivers/crypto/ccp/ccp-dev.c
View File

@ -478,6 +478,10 @@ struct ccp_device *ccp_alloc_struct(struct device *dev)
ccp->sb_count = KSB_COUNT; ccp->sb_count = KSB_COUNT;
ccp->sb_start = 0; 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(); ccp->ord = ccp_increment_unit_ordinal();
snprintf(ccp->name, MAX_CCP_NAME_LEN, "ccp-%u", ccp->ord); snprintf(ccp->name, MAX_CCP_NAME_LEN, "ccp-%u", ccp->ord);
snprintf(ccp->rngname, MAX_CCP_NAME_LEN, "ccp-%u-rng", ccp->ord); snprintf(ccp->rngname, MAX_CCP_NAME_LEN, "ccp-%u-rng", ccp->ord);