@@ -84,7 +84,7 @@ struct ccp_crypto_cpu {
static inline bool ccp_crypto_success(int err)
{
- if (err && (err != -EINPROGRESS) && (err != -EBUSY))
+ if (err && (err != -EINPROGRESS) && (err != -EIOCBQUEUED))
return false;
return true;
@@ -148,7 +148,7 @@ static void ccp_crypto_complete(void *data, int err)
if (err == -EINPROGRESS) {
/* Only propagate the -EINPROGRESS if necessary */
- if (crypto_cmd->ret == -EBUSY) {
+ if (crypto_cmd->ret == -EIOCBQUEUED) {
crypto_cmd->ret = -EINPROGRESS;
req->complete(req, -EINPROGRESS);
}
@@ -166,8 +166,8 @@ static void ccp_crypto_complete(void *data, int err)
backlog->req->complete(backlog->req, -EINPROGRESS);
}
- /* Transition the state from -EBUSY to -EINPROGRESS first */
- if (crypto_cmd->ret == -EBUSY)
+ /* Transition the state from -EIOCBQUEUED to -EINPROGRESS first */
+ if (crypto_cmd->ret == -EIOCBQUEUED)
req->complete(req, -EINPROGRESS);
/* Completion callbacks */
@@ -243,7 +243,7 @@ static int ccp_crypto_enqueue_cmd(struct ccp_crypto_cmd *crypto_cmd)
}
if (req_queue.cmd_count >= CCP_CRYPTO_MAX_QLEN) {
- ret = -EBUSY;
+ ret = -EIOCBQUEUED;
if (req_queue.backlog == &req_queue.cmds)
req_queue.backlog = &crypto_cmd->entry;
}
@@ -269,7 +269,7 @@ EXPORT_SYMBOL_GPL(ccp_version);
* Queue a cmd to be processed by the CCP. If queueing the cmd
* would exceed the defined length of the cmd queue the cmd will
* only be queued if the CCP_CMD_MAY_BACKLOG flag is set and will
- * result in a return code of -EBUSY.
+ * result in a return code of -EIOCBQUEUED;
*
* The callback routine specified in the ccp_cmd struct will be
* called to notify the caller of completion (if the cmd was not
@@ -280,7 +280,7 @@ EXPORT_SYMBOL_GPL(ccp_version);
*
* The cmd has been successfully queued if:
* the return code is -EINPROGRESS or
- * the return code is -EBUSY and CCP_CMD_MAY_BACKLOG flag is set
+ * the return code is -EIOCBQUEUED
*/
int ccp_enqueue_cmd(struct ccp_cmd *cmd)
{
@@ -307,8 +307,10 @@ int ccp_enqueue_cmd(struct ccp_cmd *cmd)
if (ccp->cmd_count >= MAX_CMD_QLEN) {
ret = -EBUSY;
- if (cmd->flags & CCP_CMD_MAY_BACKLOG)
+ if (cmd->flags & CCP_CMD_MAY_BACKLOG) {
list_add_tail(&cmd->entry, &ccp->backlog);
+ ret = -EIOCBQUEUED;
+ }
} else {
ret = -EINPROGRESS;
ccp->cmd_count++;
@@ -146,7 +146,7 @@ static int ccp_issue_next_cmd(struct ccp_dma_desc *desc)
desc->tx_desc.cookie, cmd);
ret = ccp_enqueue_cmd(&cmd->ccp_cmd);
- if (!ret || (ret == -EINPROGRESS) || (ret == -EBUSY))
+ if (!ret || (ret == -EINPROGRESS) || (ret == -EIOCBQUEUED))
return 0;
dev_dbg(desc->ccp->dev, "%s - error: ret=%d, tx %d, cmd=%p\n", __func__,
Replace -EBUSY with -EIOCBQUEUED for backlog queueing indication as part of new API Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com> --- This patch should be squashed with the first patch in the series when applied. drivers/crypto/ccp/ccp-crypto-main.c | 10 +++++----- drivers/crypto/ccp/ccp-dev.c | 8 +++++--- drivers/crypto/ccp/ccp-dmaengine.c | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) -- 2.1.4