From 3f292f4946d376f52420239a86b0a842afc7422b Mon Sep 17 00:00:00 2001 From: Jinliang Zheng Date: Thu, 25 Apr 2024 16:21:44 +0800 Subject: [PATCH] Revert "crypto: hisilicon - Kunpeng916 crypto driver don't sleep when in softirq" This reverts commit cf411bcc657b5f754406d41ffcb4311efef77cb4. Revert to facilitate integration of higher version drivers: 1.3.11 Signed-off-by: Jinliang Zheng Reviewed-by: Chun Liu Signed-off-by: Jianping Liu --- drivers/crypto/hisilicon/sec/sec_algs.c | 14 +++++++------- drivers/crypto/hisilicon/sec/sec_drv.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/crypto/hisilicon/sec/sec_algs.c b/drivers/crypto/hisilicon/sec/sec_algs.c index 2402941a7f2f..4ad4ffd90cee 100644 --- a/drivers/crypto/hisilicon/sec/sec_algs.c +++ b/drivers/crypto/hisilicon/sec/sec_algs.c @@ -449,7 +449,7 @@ static void sec_skcipher_alg_callback(struct sec_bd_info *sec_resp, */ } - spin_lock_bh(&ctx->queue->queuelock); + mutex_lock(&ctx->queue->queuelock); /* Put the IV in place for chained cases */ switch (ctx->cipher_alg) { case SEC_C_AES_CBC_128: @@ -509,7 +509,7 @@ static void sec_skcipher_alg_callback(struct sec_bd_info *sec_resp, list_del(&backlog_req->backlog_head); } } - spin_unlock_bh(&ctx->queue->queuelock); + mutex_unlock(&ctx->queue->queuelock); mutex_lock(&sec_req->lock); list_del(&sec_req_el->head); @@ -798,7 +798,7 @@ static int sec_alg_skcipher_crypto(struct skcipher_request *skreq, */ /* Grab a big lock for a long time to avoid concurrency issues */ - spin_lock_bh(&queue->queuelock); + mutex_lock(&queue->queuelock); /* * Can go on to queue if we have space in either: @@ -814,15 +814,15 @@ static int sec_alg_skcipher_crypto(struct skcipher_request *skreq, ret = -EBUSY; if ((skreq->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG)) { list_add_tail(&sec_req->backlog_head, &ctx->backlog); - spin_unlock_bh(&queue->queuelock); + mutex_unlock(&queue->queuelock); goto out; } - spin_unlock_bh(&queue->queuelock); + mutex_unlock(&queue->queuelock); goto err_free_elements; } ret = sec_send_request(sec_req, queue); - spin_unlock_bh(&queue->queuelock); + mutex_unlock(&queue->queuelock); if (ret) goto err_free_elements; @@ -881,7 +881,7 @@ static int sec_alg_skcipher_init(struct crypto_skcipher *tfm) if (IS_ERR(ctx->queue)) return PTR_ERR(ctx->queue); - spin_lock_init(&ctx->queue->queuelock); + mutex_init(&ctx->queue->queuelock); ctx->queue->havesoftqueue = false; return 0; diff --git a/drivers/crypto/hisilicon/sec/sec_drv.h b/drivers/crypto/hisilicon/sec/sec_drv.h index 0bf4d7c3856c..4d9063a8b10b 100644 --- a/drivers/crypto/hisilicon/sec/sec_drv.h +++ b/drivers/crypto/hisilicon/sec/sec_drv.h @@ -347,7 +347,7 @@ struct sec_queue { DECLARE_BITMAP(unprocessed, SEC_QUEUE_LEN); DECLARE_KFIFO_PTR(softqueue, typeof(struct sec_request_el *)); bool havesoftqueue; - spinlock_t queuelock; + struct mutex queuelock; void *shadow[SEC_QUEUE_LEN]; };