crypto/aesni_mb: remove check for SSE4

[dpdk.git] / drivers / crypto / aesni_mb / rte_aesni_mb_pmd.c

diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c
index 096a947..a033889 100644 (file)
--- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c
+++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c
@@ -34,14 +34,15 @@
 #include <rte_hexdump.h>
 #include <rte_cryptodev.h>
 #include <rte_cryptodev_pmd.h>
+#include <rte_cryptodev_vdev.h>
 #include <rte_vdev.h>
 #include <rte_malloc.h>
 #include <rte_cpuflags.h>
 
 #include "rte_aesni_mb_pmd_private.h"
 
-typedef void (*hash_one_block_t)(void *data, void *digest);
-typedef void (*aes_keyexp_t)(void *key, void *enc_exp_keys, void *dec_exp_keys);
+typedef void (*hash_one_block_t)(const void *data, void *digest);
+typedef void (*aes_keyexp_t)(const void *key, void *enc_exp_keys, void *dec_exp_keys);
 
 /**
  * Calculate the authentication pre-computes
@@ -218,6 +219,9 @@ aesni_mb_set_session_cipher_parameters(const struct aesni_mb_op_fns *mb_ops,
        case RTE_CRYPTO_CIPHER_AES_CTR:
                sess->cipher.mode = CNTR;
                break;
+       case RTE_CRYPTO_CIPHER_AES_DOCSISBPI:
+               sess->cipher.mode = DOCSIS_SEC_BPI;
+               break;
        default:
                MB_LOG_ERR("Unsupported cipher mode parameter");
                return -1;
@@ -491,8 +495,6 @@ static inline void
 verify_digest(JOB_AES_HMAC *job, struct rte_crypto_op *op) {
        struct rte_mbuf *m_dst = (struct rte_mbuf *)job->user_data2;
 
-       RTE_ASSERT(m_dst == NULL);
-
        /* Verify digest if required */
        if (memcmp(job->auth_tag_output, op->sym->auth.digest.data,
                        job->auth_tag_output_len_in_bytes) != 0)
@@ -519,8 +521,6 @@ post_process_mb_job(struct aesni_mb_qp *qp, JOB_AES_HMAC *job)
 
        struct aesni_mb_session *sess;
 
-       RTE_ASSERT(op == NULL);
-
        if (unlikely(op->status == RTE_CRYPTO_OP_STATUS_ENQUEUED)) {
                switch (job->status) {
                case STS_COMPLETED:
@@ -666,25 +666,20 @@ aesni_mb_pmd_dequeue_burst(void *queue_pair, struct rte_crypto_op **ops,
        return processed_jobs;
 }
 
-static int cryptodev_aesni_mb_remove(const char *name);
+static int cryptodev_aesni_mb_remove(struct rte_vdev_device *vdev);
 
 static int
-cryptodev_aesni_mb_create(struct rte_crypto_vdev_init_params *init_params)
+cryptodev_aesni_mb_create(const char *name,
+                       struct rte_vdev_device *vdev,
+                       struct rte_crypto_vdev_init_params *init_params)
 {
        struct rte_cryptodev *dev;
        struct aesni_mb_private *internals;
        enum aesni_mb_vector_mode vector_mode;
 
-       if (init_params->name[0] == '\0') {
-               int ret = rte_cryptodev_pmd_create_dev_name(
-                               init_params->name,
-                               RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD));
-
-               if (ret < 0) {
-                       MB_LOG_ERR("failed to create unique name");
-                       return ret;
-               }
-       }
+       if (init_params->name[0] == '\0')
+               snprintf(init_params->name, sizeof(init_params->name),
+                               "%s", name);
 
        /* Check CPU for supported vector instruction set */
        if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512F))
@@ -693,15 +688,12 @@ cryptodev_aesni_mb_create(struct rte_crypto_vdev_init_params *init_params)
                vector_mode = RTE_AESNI_MB_AVX2;
        else if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX))
                vector_mode = RTE_AESNI_MB_AVX;
-       else if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_SSE4_1))
+       else
                vector_mode = RTE_AESNI_MB_SSE;
-       else {
-               MB_LOG_ERR("Vector instructions are not supported by CPU");
-               return -EFAULT;
-       }
 
-       dev = rte_cryptodev_pmd_virtual_dev_init(init_params->name,
-                       sizeof(struct aesni_mb_private), init_params->socket_id);
+       dev = rte_cryptodev_vdev_pmd_init(init_params->name,
+                       sizeof(struct aesni_mb_private), init_params->socket_id,
+                       vdev);
        if (dev == NULL) {
                MB_LOG_ERR("failed to create cryptodev vdev");
                goto init_error;
@@ -747,13 +739,12 @@ init_error:
        MB_LOG_ERR("driver %s: cryptodev_aesni_create failed",
                        init_params->name);
 
-       cryptodev_aesni_mb_remove(init_params->name);
+       cryptodev_aesni_mb_remove(vdev);
        return -EFAULT;
 }
 
 static int
-cryptodev_aesni_mb_probe(const char *name,
-               const char *input_args)
+cryptodev_aesni_mb_probe(struct rte_vdev_device *vdev)
 {
        struct rte_crypto_vdev_init_params init_params = {
                RTE_CRYPTODEV_VDEV_DEFAULT_MAX_NB_QUEUE_PAIRS,
@@ -761,8 +752,14 @@ cryptodev_aesni_mb_probe(const char *name,
                rte_socket_id(),
                ""
        };
+       const char *name;
+       const char *input_args;
 
-       rte_cryptodev_parse_vdev_init_params(&init_params, input_args);
+       name = rte_vdev_device_name(vdev);
+       if (name == NULL)
+               return -EINVAL;
+       input_args = rte_vdev_device_args(vdev);
+       rte_cryptodev_vdev_parse_init_params(&init_params, input_args);
 
        RTE_LOG(INFO, PMD, "Initialising %s on NUMA node %d\n", name,
                        init_params.socket_id);
@@ -774,12 +771,15 @@ cryptodev_aesni_mb_probe(const char *name,
        RTE_LOG(INFO, PMD, "  Max number of sessions = %d\n",
                        init_params.max_nb_sessions);
 
-       return cryptodev_aesni_mb_create(&init_params);
+       return cryptodev_aesni_mb_create(name, vdev, &init_params);
 }
 
 static int
-cryptodev_aesni_mb_remove(const char *name)
+cryptodev_aesni_mb_remove(struct rte_vdev_device *vdev)
 {
+       const char *name;
+
+       name = rte_vdev_device_name(vdev);
        if (name == NULL)
                return -EINVAL;