Skip to content

Commit f6f4b76

Browse files
PlaidCatPlaidCat
committed
crypto: qat - rename bufferlist functions
jira LE-1907 Rebuild_History Non-Buildable kernel-5.14.0-284.30.1.el9_2 commit-author Giovanni Cabiddu <giovanni.cabiddu@intel.com> commit b0cd997 Rename the functions qat_alg_sgl_to_bufl() and qat_alg_free_bufl() as qat_bl_sgl_to_bufl() and qat_bl_free_bufl() after their relocation into the qat_bl module. This commit does not implement any functional change. Signed-off-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> (cherry picked from commit b0cd997) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent f0c467e commit f6f4b76

File tree

3 files changed

+24
-24
lines changed

3 files changed

+24
-24
lines changed

‎drivers/crypto/qat/qat_common/qat_algs.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ static void qat_aead_alg_callback(struct icp_qat_fw_la_resp *qat_resp,
673673
u8 stat_filed = qat_resp->comn_resp.comn_status;
674674
int res = 0, qat_res = ICP_QAT_FW_COMN_RESP_CRYPTO_STAT_GET(stat_filed);
675675

676-
qat_alg_free_bufl(inst, qat_req);
676+
qat_bl_free_bufl(inst, qat_req);
677677
if (unlikely(qat_res != ICP_QAT_FW_COMN_STATUS_FLAG_OK))
678678
res = -EBADMSG;
679679
areq->base.complete(&areq->base, res);
@@ -743,7 +743,7 @@ static void qat_skcipher_alg_callback(struct icp_qat_fw_la_resp *qat_resp,
743743
u8 stat_filed = qat_resp->comn_resp.comn_status;
744744
int res = 0, qat_res = ICP_QAT_FW_COMN_RESP_CRYPTO_STAT_GET(stat_filed);
745745

746-
qat_alg_free_bufl(inst, qat_req);
746+
qat_bl_free_bufl(inst, qat_req);
747747
if (unlikely(qat_res != ICP_QAT_FW_COMN_STATUS_FLAG_OK))
748748
res = -EINVAL;
749749

@@ -799,7 +799,7 @@ static int qat_alg_aead_dec(struct aead_request *areq)
799799
if (cipher_len % AES_BLOCK_SIZE != 0)
800800
return -EINVAL;
801801

802-
ret = qat_alg_sgl_to_bufl(ctx->inst, areq->src, areq->dst, qat_req, f);
802+
ret = qat_bl_sgl_to_bufl(ctx->inst, areq->src, areq->dst, qat_req, f);
803803
if (unlikely(ret))
804804
return ret;
805805

@@ -821,7 +821,7 @@ static int qat_alg_aead_dec(struct aead_request *areq)
821821

822822
ret = qat_alg_send_sym_message(qat_req, ctx->inst, &areq->base);
823823
if (ret == -ENOSPC)
824-
qat_alg_free_bufl(ctx->inst, qat_req);
824+
qat_bl_free_bufl(ctx->inst, qat_req);
825825

826826
return ret;
827827
}
@@ -842,7 +842,7 @@ static int qat_alg_aead_enc(struct aead_request *areq)
842842
if (areq->cryptlen % AES_BLOCK_SIZE != 0)
843843
return -EINVAL;
844844

845-
ret = qat_alg_sgl_to_bufl(ctx->inst, areq->src, areq->dst, qat_req, f);
845+
ret = qat_bl_sgl_to_bufl(ctx->inst, areq->src, areq->dst, qat_req, f);
846846
if (unlikely(ret))
847847
return ret;
848848

@@ -866,7 +866,7 @@ static int qat_alg_aead_enc(struct aead_request *areq)
866866

867867
ret = qat_alg_send_sym_message(qat_req, ctx->inst, &areq->base);
868868
if (ret == -ENOSPC)
869-
qat_alg_free_bufl(ctx->inst, qat_req);
869+
qat_bl_free_bufl(ctx->inst, qat_req);
870870

871871
return ret;
872872
}
@@ -1027,7 +1027,7 @@ static int qat_alg_skcipher_encrypt(struct skcipher_request *req)
10271027
if (req->cryptlen == 0)
10281028
return 0;
10291029

1030-
ret = qat_alg_sgl_to_bufl(ctx->inst, req->src, req->dst, qat_req, f);
1030+
ret = qat_bl_sgl_to_bufl(ctx->inst, req->src, req->dst, qat_req, f);
10311031
if (unlikely(ret))
10321032
return ret;
10331033

@@ -1048,7 +1048,7 @@ static int qat_alg_skcipher_encrypt(struct skcipher_request *req)
10481048

10491049
ret = qat_alg_send_sym_message(qat_req, ctx->inst, &req->base);
10501050
if (ret == -ENOSPC)
1051-
qat_alg_free_bufl(ctx->inst, qat_req);
1051+
qat_bl_free_bufl(ctx->inst, qat_req);
10521052

10531053
return ret;
10541054
}
@@ -1093,7 +1093,7 @@ static int qat_alg_skcipher_decrypt(struct skcipher_request *req)
10931093
if (req->cryptlen == 0)
10941094
return 0;
10951095

1096-
ret = qat_alg_sgl_to_bufl(ctx->inst, req->src, req->dst, qat_req, f);
1096+
ret = qat_bl_sgl_to_bufl(ctx->inst, req->src, req->dst, qat_req, f);
10971097
if (unlikely(ret))
10981098
return ret;
10991099

@@ -1115,7 +1115,7 @@ static int qat_alg_skcipher_decrypt(struct skcipher_request *req)
11151115

11161116
ret = qat_alg_send_sym_message(qat_req, ctx->inst, &req->base);
11171117
if (ret == -ENOSPC)
1118-
qat_alg_free_bufl(ctx->inst, qat_req);
1118+
qat_bl_free_bufl(ctx->inst, qat_req);
11191119

11201120
return ret;
11211121
}

‎drivers/crypto/qat/qat_common/qat_bl.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
#include "qat_bl.h"
1111
#include "qat_crypto.h"
1212

13-
void qat_alg_free_bufl(struct qat_crypto_instance *inst,
14-
struct qat_crypto_request *qat_req)
13+
void qat_bl_free_bufl(struct qat_crypto_instance *inst,
14+
struct qat_crypto_request *qat_req)
1515
{
1616
struct device *dev = &GET_DEV(inst->accel_dev);
1717
struct qat_alg_buf_list *bl = qat_req->buf.bl;
@@ -50,11 +50,11 @@ void qat_alg_free_bufl(struct qat_crypto_instance *inst,
5050
}
5151
}
5252

53-
int qat_alg_sgl_to_bufl(struct qat_crypto_instance *inst,
54-
struct scatterlist *sgl,
55-
struct scatterlist *sglout,
56-
struct qat_crypto_request *qat_req,
57-
gfp_t flags)
53+
int qat_bl_sgl_to_bufl(struct qat_crypto_instance *inst,
54+
struct scatterlist *sgl,
55+
struct scatterlist *sglout,
56+
struct qat_crypto_request *qat_req,
57+
gfp_t flags)
5858
{
5959
struct device *dev = &GET_DEV(inst->accel_dev);
6060
int i, sg_nctr = 0;

‎drivers/crypto/qat/qat_common/qat_bl.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
#include <linux/types.h>
77
#include "qat_crypto.h"
88

9-
void qat_alg_free_bufl(struct qat_crypto_instance *inst,
10-
struct qat_crypto_request *qat_req);
11-
int qat_alg_sgl_to_bufl(struct qat_crypto_instance *inst,
12-
struct scatterlist *sgl,
13-
struct scatterlist *sglout,
14-
struct qat_crypto_request *qat_req,
15-
gfp_t flags);
9+
void qat_bl_free_bufl(struct qat_crypto_instance *inst,
10+
struct qat_crypto_request *qat_req);
11+
int qat_bl_sgl_to_bufl(struct qat_crypto_instance *inst,
12+
struct scatterlist *sgl,
13+
struct scatterlist *sglout,
14+
struct qat_crypto_request *qat_req,
15+
gfp_t flags);
1616

1717
#endif

0 commit comments

Comments
 (0)