net/hns3: fix setting default MAC address in bonding of VF

[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 77fa6ff..3fb3fe0 100644 (file)
--- a/drivers/crypto/caam_jr/caam_jr.c
+++ b/drivers/crypto/caam_jr/caam_jr.c
@@ -35,7 +35,6 @@
 #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 {
@@ -2389,6 +2388,8 @@ init_error:
 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),
@@ -2405,6 +2406,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);
 
+       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;
@@ -2415,7 +2422,7 @@ cryptodev_caam_jr_probe(struct rte_vdev_device *vdev)
                                        NULL);
                        if (prop) {
                                rta_set_sec_era(
-                                       INTL_SEC_ERA(cpu_to_caam32(*prop)));
+                                       INTL_SEC_ERA(rte_be_to_cpu_32(*prop)));
                                break;
                        }
                }
@@ -2480,9 +2487,4 @@ RTE_INIT(caam_jr_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);