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
drivers/crypto: invoke probing finish function
[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
caf2386
..
8c56610
100644
(file)
--- a/
drivers/crypto/caam_jr/caam_jr.c
+++ b/
drivers/crypto/caam_jr/caam_jr.c
@@
-9,7
+9,7
@@
#include <rte_byteorder.h>
#include <rte_common.h>
#include <rte_byteorder.h>
#include <rte_common.h>
-#include <
rte_
cryptodev_pmd.h>
+#include <cryptodev_pmd.h>
#include <rte_crypto.h>
#include <rte_cryptodev.h>
#include <rte_bus_vdev.h>
#include <rte_crypto.h>
#include <rte_cryptodev.h>
#include <rte_bus_vdev.h>
@@
-35,7
+35,6
@@
#endif
#define CRYPTODEV_NAME_CAAM_JR_PMD crypto_caam_jr
static uint8_t cryptodev_driver_id;
#endif
#define CRYPTODEV_NAME_CAAM_JR_PMD crypto_caam_jr
static uint8_t cryptodev_driver_id;
-int caam_jr_logtype;
/* Lists the states possible for the SEC user space driver. */
enum sec_driver_state_e {
/* Lists the states possible for the SEC user space driver. */
enum sec_driver_state_e {
@@
-1351,6
+1350,9
@@
caam_jr_enqueue_op(struct rte_crypto_op *op, struct caam_jr_qp *qp)
struct caam_jr_session *ses;
struct caam_jr_op_ctx *ctx = NULL;
struct sec_job_descriptor_t *jobdescr __rte_unused;
struct caam_jr_session *ses;
struct caam_jr_op_ctx *ctx = NULL;
struct sec_job_descriptor_t *jobdescr __rte_unused;
+#if CAAM_JR_DBG
+ int i;
+#endif
switch (op->sess_type) {
case RTE_CRYPTO_OP_WITH_SESSION:
switch (op->sess_type) {
case RTE_CRYPTO_OP_WITH_SESSION:
@@
-1413,7
+1415,7
@@
err1:
rte_pktmbuf_data_len(op->sym->m_src));
printf("\n JD before conversion\n");
rte_pktmbuf_data_len(op->sym->m_src));
printf("\n JD before conversion\n");
- for (i
nt i
= 0; i < 12; i++)
+ for (i = 0; i < 12; i++)
printf("\n 0x%08x", ctx->jobdes.desc[i]);
#endif
printf("\n 0x%08x", ctx->jobdes.desc[i]);
#endif
@@
-2366,6
+2368,8
@@
caam_jr_dev_init(const char *name,
security_instance->sess_cnt = 0;
dev->security_ctx = security_instance;
security_instance->sess_cnt = 0;
dev->security_ctx = security_instance;
+ rte_cryptodev_pmd_probing_finish(dev);
+
RTE_LOG(INFO, PMD, "%s cryptodev init\n", dev->data->name);
return 0;
RTE_LOG(INFO, PMD, "%s cryptodev init\n", dev->data->name);
return 0;
@@
-2386,6
+2390,8
@@
init_error:
static int
cryptodev_caam_jr_probe(struct rte_vdev_device *vdev)
{
static int
cryptodev_caam_jr_probe(struct rte_vdev_device *vdev)
{
+ int ret;
+
struct rte_cryptodev_pmd_init_params init_params = {
"",
sizeof(struct sec_job_ring_t),
struct rte_cryptodev_pmd_init_params init_params = {
"",
sizeof(struct sec_job_ring_t),
@@
-2402,6
+2408,12
@@
cryptodev_caam_jr_probe(struct rte_vdev_device *vdev)
input_args = rte_vdev_device_args(vdev);
rte_cryptodev_pmd_parse_input_args(&init_params, input_args);
input_args = rte_vdev_device_args(vdev);
rte_cryptodev_pmd_parse_input_args(&init_params, input_args);
+ ret = of_init();
+ if (ret) {
+ RTE_LOG(ERR, PMD,
+ "of_init failed\n");
+ return -EINVAL;
+ }
/* if sec device version is not configured */
if (!rta_get_sec_era()) {
const struct device_node *caam_node;
/* if sec device version is not configured */
if (!rta_get_sec_era()) {
const struct device_node *caam_node;
@@
-2412,7
+2424,7
@@
cryptodev_caam_jr_probe(struct rte_vdev_device *vdev)
NULL);
if (prop) {
rta_set_sec_era(
NULL);
if (prop) {
rta_set_sec_era(
- INTL_SEC_ERA(
cpu_to_caam
32(*prop)));
+ INTL_SEC_ERA(
rte_be_to_cpu_
32(*prop)));
break;
}
}
break;
}
}
@@
-2477,9
+2489,4
@@
RTE_INIT(caam_jr_init)
sec_job_rings_init();
}
sec_job_rings_init();
}
-RTE_INIT(caam_jr_init_log)
-{
- caam_jr_logtype = rte_log_register("pmd.crypto.caam");
- if (caam_jr_logtype >= 0)
- rte_log_set_level(caam_jr_logtype, RTE_LOG_NOTICE);
-}
+RTE_LOG_REGISTER(caam_jr_logtype, pmd.crypto.caam, NOTICE);