git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mbuf: update Tx VLAN and QinQ flags documentation
[dpdk.git]
/
drivers
/
crypto
/
caam_jr
/
caam_jr.c
diff --git
a/drivers/crypto/caam_jr/caam_jr.c
b/drivers/crypto/caam_jr/caam_jr.c
index
45b2813
..
5028bd2
100644
(file)
--- a/
drivers/crypto/caam_jr/caam_jr.c
+++ b/
drivers/crypto/caam_jr/caam_jr.c
@@
-1,5
+1,5
@@
/* SPDX-License-Identifier: BSD-3-Clause
/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright 2017-201
8
NXP
+ * Copyright 2017-201
9
NXP
*/
#include <fcntl.h>
*/
#include <fcntl.h>
@@
-311,7
+311,7
@@
caam_jr_prep_cdb(struct caam_jr_session *ses)
int32_t shared_desc_len = 0;
struct sec_cdb *cdb;
int err;
int32_t shared_desc_len = 0;
struct sec_cdb *cdb;
int err;
-#if
RTE_BYTE_ORDER == RTE_BIG_ENDIAN
+#if
CAAM_BYTE_ORDER == CORE_BYTE_ORDER
int swap = false;
#else
int swap = true;
int swap = false;
#else
int swap = true;
@@
-346,7
+346,7
@@
caam_jr_prep_cdb(struct caam_jr_session *ses)
shared_desc_len = cnstr_shdsc_blkcipher(
cdb->sh_desc, true,
shared_desc_len = cnstr_shdsc_blkcipher(
cdb->sh_desc, true,
- swap, &alginfo_c,
+ swap,
SHR_NEVER,
&alginfo_c,
NULL,
ses->iv.length,
ses->dir);
NULL,
ses->iv.length,
ses->dir);
@@
-364,7
+364,7
@@
caam_jr_prep_cdb(struct caam_jr_session *ses)
alginfo_a.key_type = RTA_DATA_IMM;
shared_desc_len = cnstr_shdsc_hmac(cdb->sh_desc, true,
alginfo_a.key_type = RTA_DATA_IMM;
shared_desc_len = cnstr_shdsc_hmac(cdb->sh_desc, true,
- swap, &alginfo_a,
+ swap,
SHR_NEVER,
&alginfo_a,
!ses->dir,
ses->digest_length);
} else if (is_aead(ses)) {
!ses->dir,
ses->digest_length);
} else if (is_aead(ses)) {
@@
-382,13
+382,13
@@
caam_jr_prep_cdb(struct caam_jr_session *ses)
if (ses->dir == DIR_ENC)
shared_desc_len = cnstr_shdsc_gcm_encap(
cdb->sh_desc, true, swap,
if (ses->dir == DIR_ENC)
shared_desc_len = cnstr_shdsc_gcm_encap(
cdb->sh_desc, true, swap,
- &alginfo,
+
SHR_NEVER,
&alginfo,
ses->iv.length,
ses->digest_length);
else
shared_desc_len = cnstr_shdsc_gcm_decap(
cdb->sh_desc, true, swap,
ses->iv.length,
ses->digest_length);
else
shared_desc_len = cnstr_shdsc_gcm_decap(
cdb->sh_desc, true, swap,
- &alginfo,
+
SHR_NEVER,
&alginfo,
ses->iv.length,
ses->digest_length);
} else {
ses->iv.length,
ses->digest_length);
} else {
@@
-465,7
+465,8
@@
caam_jr_prep_cdb(struct caam_jr_session *ses)
* overwritten in fd for each packet.
*/
shared_desc_len = cnstr_shdsc_authenc(cdb->sh_desc,
* overwritten in fd for each packet.
*/
shared_desc_len = cnstr_shdsc_authenc(cdb->sh_desc,
- true, swap, &alginfo_c, &alginfo_a,
+ true, swap, SHR_SERIAL,
+ &alginfo_c, &alginfo_a,
ses->iv.length, 0,
ses->digest_length, ses->dir);
}
ses->iv.length, 0,
ses->digest_length, ses->dir);
}
@@
-798,7
+799,7
@@
build_auth_only_sg(struct rte_crypto_op *op, struct caam_jr_session *ses)
sg->len = cpu_to_caam32(ses->digest_length);
length += ses->digest_length;
} else {
sg->len = cpu_to_caam32(ses->digest_length);
length += ses->digest_length;
} else {
-
length
-= ses->digest_length;
+
sg->len
-= ses->digest_length;
}
/* last element*/
}
/* last element*/
@@
-2011,7
+2012,7
@@
caam_jr_dev_configure(struct rte_cryptodev *dev,
PMD_INIT_FUNC_TRACE();
internals = dev->data->dev_private;
PMD_INIT_FUNC_TRACE();
internals = dev->data->dev_private;
- s
printf(str
, "ctx_pool_%d", dev->data->dev_id);
+ s
nprintf(str, sizeof(str)
, "ctx_pool_%d", dev->data->dev_id);
if (!internals->ctx_pool) {
internals->ctx_pool = rte_mempool_create((const char *)str,
CTX_POOL_NUM_BUFS,
if (!internals->ctx_pool) {
internals->ctx_pool = rte_mempool_create((const char *)str,
CTX_POOL_NUM_BUFS,