log: introduce logtype register macro

[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 8609717..9d0d9f4 100644 (file)
--- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c
+++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c
@@ -15,8 +15,6 @@
 
 #include "aesni_mb_pmd_private.h"
 
-int aesni_mb_logtype_driver;
-
 #define AES_CCM_DIGEST_MIN_LEN 4
 #define AES_CCM_DIGEST_MAX_LEN 16
 #define HMAC_MAX_BLOCK_SIZE 128
@@ -381,6 +379,7 @@ aesni_mb_set_session_cipher_parameters(const MB_MGR *mb_mgr,
 {
        uint8_t is_aes = 0;
        uint8_t is_3DES = 0;
+       uint8_t is_docsis = 0;
 
        if (xform == NULL) {
                sess->cipher.mode = NULL_CIPHER;
@@ -417,7 +416,7 @@ aesni_mb_set_session_cipher_parameters(const MB_MGR *mb_mgr,
                break;
        case RTE_CRYPTO_CIPHER_AES_DOCSISBPI:
                sess->cipher.mode = DOCSIS_SEC_BPI;
-               is_aes = 1;
+               is_docsis = 1;
                break;
        case RTE_CRYPTO_CIPHER_DES_CBC:
                sess->cipher.mode = DES;
@@ -463,6 +462,26 @@ aesni_mb_set_session_cipher_parameters(const MB_MGR *mb_mgr,
                        AESNI_MB_LOG(ERR, "Invalid cipher key length");
                        return -EINVAL;
                }
+       } else if (is_docsis) {
+               switch (xform->cipher.key.length) {
+               case AES_128_BYTES:
+                       sess->cipher.key_length_in_bytes = AES_128_BYTES;
+                       IMB_AES_KEYEXP_128(mb_mgr, xform->cipher.key.data,
+                                       sess->cipher.expanded_aes_keys.encode,
+                                       sess->cipher.expanded_aes_keys.decode);
+                       break;
+#if IMB_VERSION_NUM >= IMB_VERSION(0, 53, 3)
+               case AES_256_BYTES:
+                       sess->cipher.key_length_in_bytes = AES_256_BYTES;
+                       IMB_AES_KEYEXP_256(mb_mgr, xform->cipher.key.data,
+                                       sess->cipher.expanded_aes_keys.encode,
+                                       sess->cipher.expanded_aes_keys.decode);
+                       break;
+#endif
+               default:
+                       AESNI_MB_LOG(ERR, "Invalid cipher key length");
+                       return -EINVAL;
+               }
        } else if (is_3DES) {
                uint64_t *keys[3] = {sess->cipher.exp_3des_keys.key[0],
                                sess->cipher.exp_3des_keys.key[1],
@@ -1178,6 +1197,10 @@ post_process_mb_job(struct aesni_mb_qp *qp, JOB_AES_HMAC *job)
        struct aesni_mb_session *sess = get_sym_session_private_data(
                                                        op->sym->session,
                                                        cryptodev_driver_id);
+       if (unlikely(sess == NULL)) {
+               op->status = RTE_CRYPTO_OP_STATUS_INVALID_SESSION;
+               return op;
+       }
 
        if (likely(op->status == RTE_CRYPTO_OP_STATUS_NOT_PROCESSED)) {
                switch (job->status) {
@@ -1621,7 +1644,8 @@ cryptodev_aesni_mb_create(const char *name,
        dev->feature_flags = RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO |
                        RTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING |
                        RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT |
-                       RTE_CRYPTODEV_FF_SYM_CPU_CRYPTO;
+                       RTE_CRYPTODEV_FF_SYM_CPU_CRYPTO |
+                       RTE_CRYPTODEV_FF_SYM_SESSIONLESS;
 
        /* Check CPU for support for AES instruction set */
        if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AES))
@@ -1718,8 +1742,4 @@ RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_AESNI_MB_PMD,
 RTE_PMD_REGISTER_CRYPTO_DRIVER(aesni_mb_crypto_drv,
                cryptodev_aesni_mb_pmd_drv.driver,
                cryptodev_driver_id);
-
-RTE_INIT(aesni_mb_init_log)
-{
-       aesni_mb_logtype_driver = rte_log_register("pmd.crypto.aesni_mb");
-}
+RTE_LOG_REGISTER(aesni_mb_logtype_driver, pmd.crypto.aesni_mb, NOTICE);