cryptodev: allocate driver structure statically

[dpdk.git] / drivers / crypto / dpaa2_sec / dpaa2_sec_dpseci.c

diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
index 9f2c0d9..672cacf 100644 (file)
--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
@@ -634,7 +634,7 @@ dpaa2_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops,
                }
                loop = 0;
                while (loop < frames_to_send) {
-                       loop += qbman_swp_send_multiple(swp, &eqdesc,
+                       loop += qbman_swp_enqueue_multiple(swp, &eqdesc,
                                                        &fd_arr[loop],
                                                        frames_to_send - loop);
                }
@@ -747,13 +747,13 @@ dpaa2_sec_dequeue_burst(void *qp, struct rte_crypto_op **ops,
                 * Also seems like the SWP is shared between the Ethernet Driver
                 * and the SEC driver.
                 */
-               while (!qbman_check_command_complete(swp, dq_storage))
+               while (!qbman_check_command_complete(dq_storage))
                        ;
 
                /* Loop until the dq_storage is updated with
                 * new token by QBMAN
                 */
-               while (!qbman_result_has_new_result(swp, dq_storage))
+               while (!qbman_check_new_result(dq_storage))
                        ;
                /* Check whether Last Pull command is Expired and
                 * setting Condition for Loop termination
@@ -1193,7 +1193,7 @@ dpaa2_sec_aead_init(struct rte_cryptodev *dev,
 
        session->digest_length = aead_xform->digest_length;
        session->aead_key.length = aead_xform->key.length;
-       ctxt->auth_only_len = aead_xform->add_auth_data_length;
+       ctxt->auth_only_len = aead_xform->aad_length;
 
        aeaddata.key = (uint64_t)session->aead_key.data;
        aeaddata.keylen = session->aead_key.length;
@@ -1540,7 +1540,7 @@ dpaa2_sec_set_session_parameters(struct rte_cryptodev *dev,
 
        } else {
                RTE_LOG(ERR, PMD, "Invalid crypto type\n");
-               return -1;
+               return -EINVAL;
        }
 
        return 0;
@@ -1553,20 +1553,22 @@ dpaa2_sec_session_configure(struct rte_cryptodev *dev,
                struct rte_mempool *mempool)
 {
        void *sess_private_data;
+       int ret;
 
        if (rte_mempool_get(mempool, &sess_private_data)) {
                CDEV_LOG_ERR(
                        "Couldn't get object from session mempool");
-               return -1;
+               return -ENOMEM;
        }
 
-       if (dpaa2_sec_set_session_parameters(dev, xform, sess_private_data) != 0) {
+       ret = dpaa2_sec_set_session_parameters(dev, xform, sess_private_data);
+       if (ret != 0) {
                PMD_DRV_LOG(ERR, "DPAA2 PMD: failed to configure "
                                "session parameters");
 
                /* Return session to mempool */
                rte_mempool_put(mempool, sess_private_data);
-               return -1;
+               return ret;
        }
 
        set_session_private_data(sess, dev->driver_id,
@@ -1912,9 +1914,7 @@ dpaa2_sec_dev_init(struct rte_cryptodev *cryptodev)
        if (!internals->fle_pool) {
                RTE_LOG(ERR, PMD, "%s create failed\n", str);
                goto init_error;
-       } else
-               RTE_LOG(INFO, PMD, "%s created: %p\n", str,
-                               internals->fle_pool);
+       }
 
        PMD_INIT_LOG(DEBUG, "driver %s: created\n", cryptodev->data->name);
        return 0;
@@ -2000,7 +2000,7 @@ cryptodev_dpaa2_sec_remove(struct rte_dpaa2_device *dpaa2_dev)
 }
 
 static struct rte_dpaa2_driver rte_dpaa2_sec_driver = {
-       .drv_type = DPAA2_MC_DPSECI_DEVID,
+       .drv_type = DPAA2_CRYPTO,
        .driver = {
                .name = "DPAA2 SEC PMD"
        },
@@ -2008,5 +2008,8 @@ static struct rte_dpaa2_driver rte_dpaa2_sec_driver = {
        .remove = cryptodev_dpaa2_sec_remove,
 };
 
+static struct cryptodev_driver dpaa2_sec_crypto_drv;
+
 RTE_PMD_REGISTER_DPAA2(CRYPTODEV_NAME_DPAA2_SEC_PMD, rte_dpaa2_sec_driver);
-RTE_PMD_REGISTER_CRYPTO_DRIVER(rte_dpaa2_sec_driver, cryptodev_driver_id);
+RTE_PMD_REGISTER_CRYPTO_DRIVER(dpaa2_sec_crypto_drv, rte_dpaa2_sec_driver,
+               cryptodev_driver_id);