X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fcrypto%2Fdpaa2_sec%2Fdpaa2_sec_dpseci.c;h=95c3951ed8a3a342d3be14fd214cb77135614f65;hb=76df01ff622fe0ef121ba524ad8bf2dc656d892e;hp=d6c3088c4882eb9575d518d74803d71c6663a0a3;hpb=645bd25ad8f905fcdf06b9c319228af03ff8708e;p=dpdk.git diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c index d6c3088c48..95c3951ed8 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -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, @@ -1705,7 +1707,7 @@ dpaa2_sec_dev_close(struct rte_cryptodev *dev) /*Free the allocated memory for ethernet private data and dpseci*/ priv->hw = NULL; - free(dpseci); + rte_free(dpseci); return 0; } @@ -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" },