remove unused ring includes
[dpdk.git] / drivers / crypto / qat / qat_crypto.c
index 129e96d..b33777c 100644 (file)
@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  *
- *   Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2015-2016 Intel Corporation. All rights reserved.
  *   All rights reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
 #include <rte_lcore.h>
 #include <rte_atomic.h>
 #include <rte_branch_prediction.h>
-#include <rte_ring.h>
 #include <rte_mempool.h>
 #include <rte_mbuf.h>
 #include <rte_string_fns.h>
 #include <rte_spinlock.h>
-#include <rte_mbuf_offload.h>
 #include <rte_hexdump.h>
 
 #include "qat_logs.h"
 #include "qat_crypto.h"
 #include "adf_transport_access_macros.h"
 
+#define BYTE_LENGTH    8
+
+static const struct rte_cryptodev_capabilities qat_pmd_capabilities[] = {
+       {       /* SHA1 HMAC */
+               .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
+               {.sym = {
+                       .xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,
+                       {.auth = {
+                               .algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
+                               .block_size = 64,
+                               .key_size = {
+                                       .min = 64,
+                                       .max = 64,
+                                       .increment = 0
+                               },
+                               .digest_size = {
+                                       .min = 20,
+                                       .max = 20,
+                                       .increment = 0
+                               },
+                               .aad_size = { 0 }
+                       }, }
+               }, }
+       },
+       {       /* SHA256 HMAC */
+               .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
+               {.sym = {
+                       .xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,
+                       {.auth = {
+                               .algo = RTE_CRYPTO_AUTH_SHA256_HMAC,
+                               .block_size = 64,
+                               .key_size = {
+                                       .min = 64,
+                                       .max = 64,
+                                       .increment = 0
+                               },
+                               .digest_size = {
+                                       .min = 32,
+                                       .max = 32,
+                                       .increment = 0
+                               },
+                               .aad_size = { 0 }
+                       }, }
+               }, }
+       },
+       {       /* SHA512 HMAC */
+               .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
+               {.sym = {
+                       .xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,
+                       {.auth = {
+                               .algo = RTE_CRYPTO_AUTH_SHA512_HMAC,
+                               .block_size = 128,
+                               .key_size = {
+                                       .min = 128,
+                                       .max = 128,
+                                       .increment = 0
+                               },
+                               .digest_size = {
+                                       .min = 64,
+                                       .max = 64,
+                                       .increment = 0
+                               },
+                               .aad_size = { 0 }
+                       }, }
+               }, }
+       },
+       {       /* AES XCBC MAC */
+               .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
+               {.sym = {
+                       .xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,
+                       {.auth = {
+                               .algo = RTE_CRYPTO_AUTH_AES_XCBC_MAC,
+                               .block_size = 16,
+                               .key_size = {
+                                       .min = 16,
+                                       .max = 16,
+                                       .increment = 0
+                               },
+                               .digest_size = {
+                                       .min = 16,
+                                       .max = 16,
+                                       .increment = 0
+                               },
+                               .aad_size = { 0 }
+                       }, }
+               }, }
+       },
+       {       /* AES GCM (AUTH) */
+               .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
+               {.sym = {
+                       .xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,
+                       {.auth = {
+                               .algo = RTE_CRYPTO_AUTH_AES_GCM,
+                               .block_size = 16,
+                               .key_size = {
+                                       .min = 16,
+                                       .max = 32,
+                                       .increment = 8
+                               },
+                               .digest_size = {
+                                       .min = 8,
+                                       .max = 16,
+                                       .increment = 4
+                               },
+                               .aad_size = {
+                                       .min = 8,
+                                       .max = 12,
+                                       .increment = 4
+                               }
+                       }, }
+               }, }
+       },
+       {       /* SNOW3G (UIA2) */
+               .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
+               {.sym = {
+                       .xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,
+                       {.auth = {
+                               .algo = RTE_CRYPTO_AUTH_SNOW3G_UIA2,
+                               .block_size = 16,
+                               .key_size = {
+                                       .min = 16,
+                                       .max = 16,
+                                       .increment = 0
+                               },
+                               .digest_size = {
+                                       .min = 4,
+                                       .max = 4,
+                                       .increment = 0
+                               },
+                               .aad_size = {
+                                       .min = 16,
+                                       .max = 16,
+                                       .increment = 0
+                               }
+                       }, }
+               }, }
+       },
+       {       /* AES GCM (CIPHER) */
+               .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
+               {.sym = {
+                       .xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,
+                       {.cipher = {
+                               .algo = RTE_CRYPTO_CIPHER_AES_GCM,
+                               .block_size = 16,
+                               .key_size = {
+                                       .min = 16,
+                                       .max = 32,
+                                       .increment = 8
+                               },
+                               .iv_size = {
+                                       .min = 16,
+                                       .max = 16,
+                                       .increment = 0
+                               }
+                       }, }
+               }, }
+       },
+       {       /* AES CBC */
+               .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
+               {.sym = {
+                       .xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,
+                       {.cipher = {
+                               .algo = RTE_CRYPTO_CIPHER_AES_CBC,
+                               .block_size = 16,
+                               .key_size = {
+                                       .min = 16,
+                                       .max = 32,
+                                       .increment = 8
+                               },
+                               .iv_size = {
+                                       .min = 16,
+                                       .max = 16,
+                                       .increment = 0
+                               }
+                       }, }
+               }, }
+       },
+       {       /* SNOW3G (UEA2) */
+               .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
+               {.sym = {
+                       .xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,
+                       {.cipher = {
+                               .algo = RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
+                               .block_size = 16,
+                               .key_size = {
+                                       .min = 16,
+                                       .max = 16,
+                                       .increment = 0
+                               },
+                               .iv_size = {
+                                       .min = 16,
+                                       .max = 16,
+                                       .increment = 0
+                               }
+                       }, }
+               }, }
+       },
+       {       /* AES CTR */
+               .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
+               {.sym = {
+                       .xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,
+                       {.cipher = {
+                               .algo = RTE_CRYPTO_CIPHER_AES_CTR,
+                               .block_size = 16,
+                               .key_size = {
+                                       .min = 16,
+                                       .max = 32,
+                                       .increment = 8
+                               },
+                               .iv_size = {
+                                       .min = 16,
+                                       .max = 16,
+                                       .increment = 0
+                               }
+                       }, }
+               }, }
+       },
+       RTE_CRYPTODEV_END_OF_CAPABILITIES_LIST()
+};
 
 static inline uint32_t
 adf_modulo(uint32_t data, uint32_t shift);
 
 static inline int
-qat_alg_write_mbuf_entry(struct rte_mbuf *mbuf, uint8_t *out_msg);
+qat_write_hw_desc_entry(struct rte_crypto_op *op, uint8_t *out_msg);
 
 void qat_crypto_sym_clear_session(struct rte_cryptodev *dev,
                void *session)
 {
        struct qat_session *sess = session;
-       phys_addr_t cd_paddr = sess->cd_paddr;
+       phys_addr_t cd_paddr;
 
        PMD_INIT_FUNC_TRACE();
        if (session) {
+               cd_paddr = sess->cd_paddr;
                memset(sess, 0, qat_crypto_sym_get_session_private_size(dev));
-
                sess->cd_paddr = cd_paddr;
-       }
+       } else
+               PMD_DRV_LOG(ERR, "NULL session");
 }
 
 static int
-qat_get_cmd_id(const struct rte_crypto_xform *xform)
+qat_get_cmd_id(const struct rte_crypto_sym_xform *xform)
 {
-       if (xform->next == NULL)
-               return -1;
-
        /* Cipher Only */
-       if (xform->type == RTE_CRYPTO_XFORM_CIPHER && xform->next == NULL)
-               return -1; /* return ICP_QAT_FW_LA_CMD_CIPHER; */
+       if (xform->type == RTE_CRYPTO_SYM_XFORM_CIPHER && xform->next == NULL)
+               return ICP_QAT_FW_LA_CMD_CIPHER;
 
        /* Authentication Only */
-       if (xform->type == RTE_CRYPTO_XFORM_AUTH && xform->next == NULL)
-               return -1; /* return ICP_QAT_FW_LA_CMD_AUTH; */
+       if (xform->type == RTE_CRYPTO_SYM_XFORM_AUTH && xform->next == NULL)
+               return ICP_QAT_FW_LA_CMD_AUTH;
+
+       if (xform->next == NULL)
+               return -1;
 
        /* Cipher then Authenticate */
-       if (xform->type == RTE_CRYPTO_XFORM_CIPHER &&
-                       xform->next->type == RTE_CRYPTO_XFORM_AUTH)
+       if (xform->type == RTE_CRYPTO_SYM_XFORM_CIPHER &&
+                       xform->next->type == RTE_CRYPTO_SYM_XFORM_AUTH)
                return ICP_QAT_FW_LA_CMD_CIPHER_HASH;
 
        /* Authenticate then Cipher */
-       if (xform->type == RTE_CRYPTO_XFORM_AUTH &&
-                       xform->next->type == RTE_CRYPTO_XFORM_CIPHER)
+       if (xform->type == RTE_CRYPTO_SYM_XFORM_AUTH &&
+                       xform->next->type == RTE_CRYPTO_SYM_XFORM_CIPHER)
                return ICP_QAT_FW_LA_CMD_HASH_CIPHER;
 
        return -1;
 }
 
 static struct rte_crypto_auth_xform *
-qat_get_auth_xform(struct rte_crypto_xform *xform)
+qat_get_auth_xform(struct rte_crypto_sym_xform *xform)
 {
        do {
-               if (xform->type == RTE_CRYPTO_XFORM_AUTH)
+               if (xform->type == RTE_CRYPTO_SYM_XFORM_AUTH)
                        return &xform->auth;
 
                xform = xform->next;
@@ -129,10 +347,10 @@ qat_get_auth_xform(struct rte_crypto_xform *xform)
 }
 
 static struct rte_crypto_cipher_xform *
-qat_get_cipher_xform(struct rte_crypto_xform *xform)
+qat_get_cipher_xform(struct rte_crypto_sym_xform *xform)
 {
        do {
-               if (xform->type == RTE_CRYPTO_XFORM_CIPHER)
+               if (xform->type == RTE_CRYPTO_SYM_XFORM_CIPHER)
                        return &xform->cipher;
 
                xform = xform->next;
@@ -140,31 +358,16 @@ qat_get_cipher_xform(struct rte_crypto_xform *xform)
 
        return NULL;
 }
-
-
 void *
-qat_crypto_sym_configure_session(struct rte_cryptodev *dev,
-               struct rte_crypto_xform *xform, void *session_private)
+qat_crypto_sym_configure_session_cipher(struct rte_cryptodev *dev,
+               struct rte_crypto_sym_xform *xform, void *session_private)
 {
        struct qat_pmd_private *internals = dev->data->dev_private;
 
        struct qat_session *session = session_private;
 
-       struct rte_crypto_auth_xform *auth_xform = NULL;
        struct rte_crypto_cipher_xform *cipher_xform = NULL;
 
-       int qat_cmd_id;
-
-       PMD_INIT_FUNC_TRACE();
-
-       /* Get requested QAT command id */
-       qat_cmd_id = qat_get_cmd_id(xform);
-       if (qat_cmd_id < 0 || qat_cmd_id >= ICP_QAT_FW_LA_CMD_DELIMITER) {
-               PMD_DRV_LOG(ERR, "Unsupported xform chain requested");
-               goto error_out;
-       }
-       session->qat_cmd = (enum icp_qat_fw_la_cmd_id)qat_cmd_id;
-
        /* Get cipher xform from crypto xform chain */
        cipher_xform = qat_get_cipher_xform(xform);
 
@@ -185,11 +388,26 @@ qat_crypto_sym_configure_session(struct rte_cryptodev *dev,
                }
                session->qat_mode = ICP_QAT_HW_CIPHER_CTR_MODE;
                break;
+       case RTE_CRYPTO_CIPHER_AES_CTR:
+               if (qat_alg_validate_aes_key(cipher_xform->key.length,
+                               &session->qat_cipher_alg) != 0) {
+                       PMD_DRV_LOG(ERR, "Invalid AES cipher key size");
+                       goto error_out;
+               }
+               session->qat_mode = ICP_QAT_HW_CIPHER_CTR_MODE;
+               break;
+       case RTE_CRYPTO_CIPHER_SNOW3G_UEA2:
+               if (qat_alg_validate_snow3g_key(cipher_xform->key.length,
+                                       &session->qat_cipher_alg) != 0) {
+                       PMD_DRV_LOG(ERR, "Invalid SNOW3G cipher key size");
+                       goto error_out;
+               }
+               session->qat_mode = ICP_QAT_HW_CIPHER_ECB_MODE;
+               break;
        case RTE_CRYPTO_CIPHER_NULL:
        case RTE_CRYPTO_CIPHER_3DES_ECB:
        case RTE_CRYPTO_CIPHER_3DES_CBC:
        case RTE_CRYPTO_CIPHER_AES_ECB:
-       case RTE_CRYPTO_CIPHER_AES_CTR:
        case RTE_CRYPTO_CIPHER_AES_CCM:
        case RTE_CRYPTO_CIPHER_KASUMI_F8:
                PMD_DRV_LOG(ERR, "Crypto: Unsupported Cipher alg %u",
@@ -206,8 +424,87 @@ qat_crypto_sym_configure_session(struct rte_cryptodev *dev,
        else
                session->qat_dir = ICP_QAT_HW_CIPHER_DECRYPT;
 
+       if (qat_alg_aead_session_create_content_desc_cipher(session,
+                                               cipher_xform->key.data,
+                                               cipher_xform->key.length))
+               goto error_out;
+
+       return session;
+
+error_out:
+       rte_mempool_put(internals->sess_mp, session);
+       return NULL;
+}
+
+
+void *
+qat_crypto_sym_configure_session(struct rte_cryptodev *dev,
+               struct rte_crypto_sym_xform *xform, void *session_private)
+{
+       struct qat_pmd_private *internals = dev->data->dev_private;
+
+       struct qat_session *session = session_private;
+
+       int qat_cmd_id;
+
+       PMD_INIT_FUNC_TRACE();
+
+       /* Get requested QAT command id */
+       qat_cmd_id = qat_get_cmd_id(xform);
+       if (qat_cmd_id < 0 || qat_cmd_id >= ICP_QAT_FW_LA_CMD_DELIMITER) {
+               PMD_DRV_LOG(ERR, "Unsupported xform chain requested");
+               goto error_out;
+       }
+       session->qat_cmd = (enum icp_qat_fw_la_cmd_id)qat_cmd_id;
+       switch (session->qat_cmd) {
+       case ICP_QAT_FW_LA_CMD_CIPHER:
+       session = qat_crypto_sym_configure_session_cipher(dev, xform, session);
+               break;
+       case ICP_QAT_FW_LA_CMD_AUTH:
+       session = qat_crypto_sym_configure_session_auth(dev, xform, session);
+               break;
+       case ICP_QAT_FW_LA_CMD_CIPHER_HASH:
+       session = qat_crypto_sym_configure_session_cipher(dev, xform, session);
+       session = qat_crypto_sym_configure_session_auth(dev, xform, session);
+               break;
+       case ICP_QAT_FW_LA_CMD_HASH_CIPHER:
+       session = qat_crypto_sym_configure_session_auth(dev, xform, session);
+       session = qat_crypto_sym_configure_session_cipher(dev, xform, session);
+               break;
+       case ICP_QAT_FW_LA_CMD_TRNG_GET_RANDOM:
+       case ICP_QAT_FW_LA_CMD_TRNG_TEST:
+       case ICP_QAT_FW_LA_CMD_SSL3_KEY_DERIVE:
+       case ICP_QAT_FW_LA_CMD_TLS_V1_1_KEY_DERIVE:
+       case ICP_QAT_FW_LA_CMD_TLS_V1_2_KEY_DERIVE:
+       case ICP_QAT_FW_LA_CMD_MGF1:
+       case ICP_QAT_FW_LA_CMD_AUTH_PRE_COMP:
+       case ICP_QAT_FW_LA_CMD_CIPHER_PRE_COMP:
+       case ICP_QAT_FW_LA_CMD_DELIMITER:
+       PMD_DRV_LOG(ERR, "Unsupported Service %u",
+               session->qat_cmd);
+               goto error_out;
+       default:
+       PMD_DRV_LOG(ERR, "Unsupported Service %u",
+               session->qat_cmd);
+               goto error_out;
+       }
+       return session;
+
+error_out:
+       rte_mempool_put(internals->sess_mp, session);
+       return NULL;
+}
 
-       /* Get authentication xform from Crypto xform chain */
+struct qat_session *
+qat_crypto_sym_configure_session_auth(struct rte_cryptodev *dev,
+                               struct rte_crypto_sym_xform *xform,
+                               struct qat_session *session_private)
+{
+
+       struct qat_pmd_private *internals = dev->data->dev_private;
+       struct qat_session *session = session_private;
+       struct rte_crypto_auth_xform *auth_xform = NULL;
+       struct rte_crypto_cipher_xform *cipher_xform = NULL;
        auth_xform = qat_get_auth_xform(xform);
 
        switch (auth_xform->algo) {
@@ -224,9 +521,11 @@ qat_crypto_sym_configure_session(struct rte_cryptodev *dev,
                session->qat_hash_alg = ICP_QAT_HW_AUTH_ALGO_AES_XCBC_MAC;
                break;
        case RTE_CRYPTO_AUTH_AES_GCM:
-       case RTE_CRYPTO_AUTH_AES_GMAC:
                session->qat_hash_alg = ICP_QAT_HW_AUTH_ALGO_GALOIS_128;
                break;
+       case RTE_CRYPTO_AUTH_SNOW3G_UIA2:
+               session->qat_hash_alg = ICP_QAT_HW_AUTH_ALGO_SNOW_3G_UIA2;
+               break;
        case RTE_CRYPTO_AUTH_NULL:
        case RTE_CRYPTO_AUTH_SHA1:
        case RTE_CRYPTO_AUTH_SHA256:
@@ -238,8 +537,8 @@ qat_crypto_sym_configure_session(struct rte_cryptodev *dev,
        case RTE_CRYPTO_AUTH_MD5:
        case RTE_CRYPTO_AUTH_MD5_HMAC:
        case RTE_CRYPTO_AUTH_AES_CCM:
+       case RTE_CRYPTO_AUTH_AES_GMAC:
        case RTE_CRYPTO_AUTH_KASUMI_F9:
-       case RTE_CRYPTO_AUTH_SNOW3G_UIA2:
        case RTE_CRYPTO_AUTH_AES_CMAC:
        case RTE_CRYPTO_AUTH_AES_CBC_MAC:
        case RTE_CRYPTO_AUTH_ZUC_EIA3:
@@ -251,17 +550,28 @@ qat_crypto_sym_configure_session(struct rte_cryptodev *dev,
                                auth_xform->algo);
                goto error_out;
        }
+       cipher_xform = qat_get_cipher_xform(xform);
 
-       if (qat_alg_aead_session_create_content_desc(session,
-               cipher_xform->key.data,
-               cipher_xform->key.length,
-               auth_xform->key.data,
-               auth_xform->key.length,
-               auth_xform->add_auth_data_length,
-               auth_xform->digest_length))
-               goto error_out;
-
-       return (struct rte_cryptodev_session *)session;
+       if ((session->qat_hash_alg == ICP_QAT_HW_AUTH_ALGO_GALOIS_128) ||
+                       (session->qat_hash_alg ==
+                               ICP_QAT_HW_AUTH_ALGO_GALOIS_64))  {
+               if (qat_alg_aead_session_create_content_desc_auth(session,
+                               cipher_xform->key.data,
+                               cipher_xform->key.length,
+                               auth_xform->add_auth_data_length,
+                               auth_xform->digest_length,
+                               auth_xform->op))
+                       goto error_out;
+       } else {
+               if (qat_alg_aead_session_create_content_desc_auth(session,
+                               auth_xform->key.data,
+                               auth_xform->key.length,
+                               auth_xform->add_auth_data_length,
+                               auth_xform->digest_length,
+                               auth_xform->op))
+                       goto error_out;
+       }
+       return session;
 
 error_out:
        rte_mempool_put(internals->sess_mp, session);
@@ -275,65 +585,67 @@ unsigned qat_crypto_sym_get_session_private_size(
 }
 
 
-uint16_t qat_crypto_pkt_tx_burst(void *qp, struct rte_mbuf **tx_pkts,
-               uint16_t nb_pkts)
+uint16_t
+qat_pmd_enqueue_op_burst(void *qp, struct rte_crypto_op **ops,
+               uint16_t nb_ops)
 {
        register struct qat_queue *queue;
        struct qat_qp *tmp_qp = (struct qat_qp *)qp;
-       register uint32_t nb_pkts_sent = 0;
-       register struct rte_mbuf **cur_tx_pkt = tx_pkts;
+       register uint32_t nb_ops_sent = 0;
+       register struct rte_crypto_op **cur_op = ops;
        register int ret;
-       uint16_t nb_pkts_possible = nb_pkts;
+       uint16_t nb_ops_possible = nb_ops;
        register uint8_t *base_addr;
        register uint32_t tail;
        int overflow;
 
+       if (unlikely(nb_ops == 0))
+               return 0;
+
        /* read params used a lot in main loop into registers */
        queue = &(tmp_qp->tx_q);
        base_addr = (uint8_t *)queue->base_addr;
        tail = queue->tail;
 
        /* Find how many can actually fit on the ring */
-       overflow = rte_atomic16_add_return(&tmp_qp->inflights16, nb_pkts)
+       overflow = rte_atomic16_add_return(&tmp_qp->inflights16, nb_ops)
                                - queue->max_inflights;
        if (overflow > 0) {
                rte_atomic16_sub(&tmp_qp->inflights16, overflow);
-               nb_pkts_possible = nb_pkts - overflow;
-               if (nb_pkts_possible == 0)
+               nb_ops_possible = nb_ops - overflow;
+               if (nb_ops_possible == 0)
                        return 0;
        }
 
-       while (nb_pkts_sent != nb_pkts_possible) {
-
-               ret = qat_alg_write_mbuf_entry(*cur_tx_pkt,
-                       base_addr + tail);
+       while (nb_ops_sent != nb_ops_possible) {
+               ret = qat_write_hw_desc_entry(*cur_op, base_addr + tail);
                if (ret != 0) {
                        tmp_qp->stats.enqueue_err_count++;
-                       if (nb_pkts_sent == 0)
+                       if (nb_ops_sent == 0)
                                return 0;
                        goto kick_tail;
                }
 
                tail = adf_modulo(tail + queue->msg_size, queue->modulo);
-               nb_pkts_sent++;
-               cur_tx_pkt++;
+               nb_ops_sent++;
+               cur_op++;
        }
 kick_tail:
        WRITE_CSR_RING_TAIL(tmp_qp->mmap_bar_addr, queue->hw_bundle_number,
                        queue->hw_queue_number, tail);
        queue->tail = tail;
-       tmp_qp->stats.enqueued_count += nb_pkts_sent;
-       return nb_pkts_sent;
+       tmp_qp->stats.enqueued_count += nb_ops_sent;
+       return nb_ops_sent;
 }
 
 uint16_t
-qat_crypto_pkt_rx_burst(void *qp, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
+qat_pmd_dequeue_op_burst(void *qp, struct rte_crypto_op **ops,
+               uint16_t nb_ops)
 {
-       struct rte_mbuf_offload *ol;
        struct qat_queue *queue;
        struct qat_qp *tmp_qp = (struct qat_qp *)qp;
        uint32_t msg_counter = 0;
-       struct rte_mbuf *rx_mbuf;
+       struct rte_crypto_op *rx_op;
        struct icp_qat_fw_comn_resp *resp_msg;
 
        queue = &(tmp_qp->rx_q);
@@ -341,16 +653,20 @@ qat_crypto_pkt_rx_burst(void *qp, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
                        ((uint8_t *)queue->base_addr + queue->head);
 
        while (*(uint32_t *)resp_msg != ADF_RING_EMPTY_SIG &&
-                       msg_counter != nb_pkts) {
-               rx_mbuf = (struct rte_mbuf *)(resp_msg->opaque_data);
-               ol = rte_pktmbuf_offload_get(rx_mbuf, RTE_PKTMBUF_OL_CRYPTO);
+                       msg_counter != nb_ops) {
+               rx_op = (struct rte_crypto_op *)(uintptr_t)
+                               (resp_msg->opaque_data);
 
+#ifdef RTE_LIBRTE_PMD_QAT_DEBUG_RX
+               rte_hexdump(stdout, "qat_response:", (uint8_t *)resp_msg,
+                               sizeof(struct icp_qat_fw_comn_resp));
+#endif
                if (ICP_QAT_FW_COMN_STATUS_FLAG_OK !=
                                ICP_QAT_FW_COMN_RESP_CRYPTO_STAT_GET(
                                        resp_msg->comn_hdr.comn_status)) {
-                       ol->op.crypto.status = RTE_CRYPTO_OP_STATUS_AUTH_FAILED;
+                       rx_op->status = RTE_CRYPTO_OP_STATUS_AUTH_FAILED;
                } else {
-                       ol->op.crypto.status = RTE_CRYPTO_OP_STATUS_SUCCESS;
+                       rx_op->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
                }
                *(uint32_t *)resp_msg = ADF_RING_EMPTY_SIG;
                queue->head = adf_modulo(queue->head +
@@ -359,9 +675,8 @@ qat_crypto_pkt_rx_burst(void *qp, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
                resp_msg = (struct icp_qat_fw_comn_resp *)
                                        ((uint8_t *)queue->base_addr +
                                                        queue->head);
-
-               *rx_pkts = rx_mbuf;
-               rx_pkts++;
+               *ops = rx_op;
+               ops++;
                msg_counter++;
        }
        if (msg_counter > 0) {
@@ -375,88 +690,140 @@ qat_crypto_pkt_rx_burst(void *qp, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
 }
 
 static inline int
-qat_alg_write_mbuf_entry(struct rte_mbuf *mbuf, uint8_t *out_msg)
+qat_write_hw_desc_entry(struct rte_crypto_op *op, uint8_t *out_msg)
 {
-       struct rte_mbuf_offload *ol;
-
        struct qat_session *ctx;
        struct icp_qat_fw_la_cipher_req_params *cipher_param;
        struct icp_qat_fw_la_auth_req_params *auth_param;
        register struct icp_qat_fw_la_bulk_req *qat_req;
 
-       ol = rte_pktmbuf_offload_get(mbuf, RTE_PKTMBUF_OL_CRYPTO);
-       if (unlikely(ol == NULL)) {
-               PMD_DRV_LOG(ERR, "No valid crypto off-load operation attached "
-                               "to (%p) mbuf.", mbuf);
+#ifdef RTE_LIBRTE_PMD_QAT_DEBUG_TX
+       if (unlikely(op->type != RTE_CRYPTO_OP_TYPE_SYMMETRIC)) {
+               PMD_DRV_LOG(ERR, "QAT PMD only supports symmetric crypto "
+                               "operation requests, op (%p) is not a "
+                               "symmetric operation.", op);
                return -EINVAL;
        }
-
-       if (unlikely(ol->op.crypto.type == RTE_CRYPTO_OP_SESSIONLESS)) {
+#endif
+       if (unlikely(op->sym->sess_type == RTE_CRYPTO_SYM_OP_SESSIONLESS)) {
                PMD_DRV_LOG(ERR, "QAT PMD only supports session oriented"
-                               " requests mbuf (%p) is sessionless.", mbuf);
+                               " requests, op (%p) is sessionless.", op);
                return -EINVAL;
        }
 
-       if (unlikely(ol->op.crypto.session->type != RTE_CRYPTODEV_QAT_PMD)) {
+       if (unlikely(op->sym->session->dev_type != RTE_CRYPTODEV_QAT_SYM_PMD)) {
                PMD_DRV_LOG(ERR, "Session was not created for this device");
                return -EINVAL;
        }
 
-       ctx = (struct qat_session *)ol->op.crypto.session->_private;
+       ctx = (struct qat_session *)op->sym->session->_private;
        qat_req = (struct icp_qat_fw_la_bulk_req *)out_msg;
        *qat_req = ctx->fw_req;
-       qat_req->comn_mid.opaque_data = (uint64_t)mbuf;
+       qat_req->comn_mid.opaque_data = (uint64_t)(uintptr_t)op;
 
-       /*
-        * The following code assumes:
-        * - single entry buffer.
-        * - always in place.
-        */
        qat_req->comn_mid.dst_length =
-                       qat_req->comn_mid.src_length = mbuf->data_len;
+               qat_req->comn_mid.src_length =
+                               rte_pktmbuf_data_len(op->sym->m_src);
+
        qat_req->comn_mid.dest_data_addr =
-                       qat_req->comn_mid.src_data_addr =
-                                       rte_pktmbuf_mtophys(mbuf);
+               qat_req->comn_mid.src_data_addr =
+                           rte_pktmbuf_mtophys(op->sym->m_src);
+
+       if (unlikely(op->sym->m_dst != NULL)) {
+               qat_req->comn_mid.dest_data_addr =
+                               rte_pktmbuf_mtophys(op->sym->m_dst);
+               qat_req->comn_mid.dst_length =
+                               rte_pktmbuf_data_len(op->sym->m_dst);
+       }
 
        cipher_param = (void *)&qat_req->serv_specif_rqpars;
        auth_param = (void *)((uint8_t *)cipher_param + sizeof(*cipher_param));
 
-       cipher_param->cipher_length = ol->op.crypto.data.to_cipher.length;
-       cipher_param->cipher_offset = ol->op.crypto.data.to_cipher.offset;
-       if (ol->op.crypto.iv.length &&
-               (ol->op.crypto.iv.length <=
-                               sizeof(cipher_param->u.cipher_IV_array))) {
+       cipher_param->cipher_length = op->sym->cipher.data.length;
+       cipher_param->cipher_offset = op->sym->cipher.data.offset;
+       if (ctx->qat_cipher_alg == ICP_QAT_HW_CIPHER_ALGO_SNOW_3G_UEA2) {
+               if (unlikely((cipher_param->cipher_length % BYTE_LENGTH != 0) ||
+                               (cipher_param->cipher_offset
+                                       % BYTE_LENGTH != 0))) {
+                       PMD_DRV_LOG(ERR, " For Snow3g, QAT PMD only "
+                               "supports byte aligned values");
+                       op->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
+                       return -EINVAL;
+               }
+               cipher_param->cipher_length >>= 3;
+               cipher_param->cipher_offset >>= 3;
+       }
+
+       if (op->sym->cipher.iv.length && (op->sym->cipher.iv.length <=
+                       sizeof(cipher_param->u.cipher_IV_array))) {
                rte_memcpy(cipher_param->u.cipher_IV_array,
-                               ol->op.crypto.iv.data, ol->op.crypto.iv.length);
+                               op->sym->cipher.iv.data,
+                               op->sym->cipher.iv.length);
        } else {
                ICP_QAT_FW_LA_CIPH_IV_FLD_FLAG_SET(
                                qat_req->comn_hdr.serv_specif_flags,
                                ICP_QAT_FW_CIPH_IV_64BIT_PTR);
-               cipher_param->u.s.cipher_IV_ptr = ol->op.crypto.iv.phys_addr;
+               cipher_param->u.s.cipher_IV_ptr = op->sym->cipher.iv.phys_addr;
        }
-       if (ol->op.crypto.digest.phys_addr) {
+       if (op->sym->auth.digest.phys_addr) {
                ICP_QAT_FW_LA_DIGEST_IN_BUFFER_SET(
                                qat_req->comn_hdr.serv_specif_flags,
                                ICP_QAT_FW_LA_NO_DIGEST_IN_BUFFER);
-               auth_param->auth_res_addr = ol->op.crypto.digest.phys_addr;
+               auth_param->auth_res_addr = op->sym->auth.digest.phys_addr;
        }
-       auth_param->auth_off = ol->op.crypto.data.to_hash.offset;
-       auth_param->auth_len = ol->op.crypto.data.to_hash.length;
-       auth_param->u1.aad_adr = ol->op.crypto.additional_auth.phys_addr;
-
+       auth_param->auth_off = op->sym->auth.data.offset;
+       auth_param->auth_len = op->sym->auth.data.length;
+       if (ctx->qat_hash_alg == ICP_QAT_HW_AUTH_ALGO_SNOW_3G_UIA2) {
+               if (unlikely((auth_param->auth_off % BYTE_LENGTH != 0) ||
+                               (auth_param->auth_len % BYTE_LENGTH != 0))) {
+                       PMD_DRV_LOG(ERR, " For Snow3g, QAT PMD only "
+                               "supports byte aligned values");
+                       op->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
+                       return -EINVAL;
+               }
+               auth_param->auth_off >>= 3;
+               auth_param->auth_len >>= 3;
+       }
+       auth_param->u1.aad_adr = op->sym->auth.aad.phys_addr;
        /* (GCM) aad length(240 max) will be at this location after precompute */
        if (ctx->qat_hash_alg == ICP_QAT_HW_AUTH_ALGO_GALOIS_128 ||
-               ctx->qat_hash_alg == ICP_QAT_HW_AUTH_ALGO_GALOIS_64) {
-               auth_param->u2.aad_sz =
-               ALIGN_POW2_ROUNDUP(ctx->cd.hash.sha.state1[
+                       ctx->qat_hash_alg == ICP_QAT_HW_AUTH_ALGO_GALOIS_64) {
+               struct icp_qat_hw_auth_algo_blk *hash;
+
+               if (ctx->qat_cmd == ICP_QAT_FW_LA_CMD_HASH_CIPHER)
+                       hash = (struct icp_qat_hw_auth_algo_blk *)((char *)&ctx->cd);
+               else
+                       hash = (struct icp_qat_hw_auth_algo_blk *)((char *)&ctx->cd +
+                               sizeof(struct icp_qat_hw_cipher_algo_blk));
+
+               auth_param->u2.aad_sz = ALIGN_POW2_ROUNDUP(hash->sha.state1[
                                        ICP_QAT_HW_GALOIS_128_STATE1_SZ +
                                        ICP_QAT_HW_GALOIS_H_SZ + 3], 16);
+               if (op->sym->cipher.iv.length == 12) {
+                       /*
+                        * For GCM a 12 bit IV is allowed,
+                        * but we need to inform the f/w
+                        */
+                       ICP_QAT_FW_LA_GCM_IV_LEN_FLAG_SET(
+                               qat_req->comn_hdr.serv_specif_flags,
+                               ICP_QAT_FW_LA_GCM_IV_LEN_12_OCTETS);
+               }
        }
        auth_param->hash_state_sz = (auth_param->u2.aad_sz) >> 3;
 
-#ifdef RTE_LIBRTE_PMD_QAT_DEBUG_DRIVER
+
+#ifdef RTE_LIBRTE_PMD_QAT_DEBUG_TX
        rte_hexdump(stdout, "qat_req:", qat_req,
                        sizeof(struct icp_qat_fw_la_bulk_req));
+       rte_hexdump(stdout, "src_data:",
+                       rte_pktmbuf_mtod(op->sym->m_src, uint8_t*),
+                       rte_pktmbuf_data_len(op->sym->m_src));
+       rte_hexdump(stdout, "iv:", op->sym->cipher.iv.data,
+                       op->sym->cipher.iv.length);
+       rte_hexdump(stdout, "digest:", op->sym->auth.digest.data,
+                       op->sym->auth.digest.length);
+       rte_hexdump(stdout, "aad:", op->sym->auth.aad.data,
+                       op->sym->auth.aad.length);
 #endif
        return 0;
 }
@@ -469,12 +836,15 @@ static inline uint32_t adf_modulo(uint32_t data, uint32_t shift)
        return data - mult;
 }
 
-void qat_crypto_sym_session_init(struct rte_mempool *mp, void *priv_sess)
+void qat_crypto_sym_session_init(struct rte_mempool *mp, void *sym_sess)
 {
-       struct qat_session *s = priv_sess;
+       struct rte_cryptodev_sym_session *sess = sym_sess;
+       struct qat_session *s = (void *)sess->_private;
 
        PMD_INIT_FUNC_TRACE();
-       s->cd_paddr = rte_mempool_virt2phy(mp, &s->cd);
+       s->cd_paddr = rte_mempool_virt2phy(mp, sess) +
+               offsetof(struct qat_session, cd) +
+               offsetof(struct rte_cryptodev_sym_session, _private);
 }
 
 int qat_dev_config(__rte_unused struct rte_cryptodev *dev)
@@ -519,9 +889,10 @@ void qat_dev_info_get(__rte_unused struct rte_cryptodev *dev,
                info->max_nb_queue_pairs =
                                ADF_NUM_SYM_QPS_PER_BUNDLE *
                                ADF_NUM_BUNDLES_PER_DEV;
-
-               info->max_nb_sessions = internals->max_nb_sessions;
-               info->dev_type = RTE_CRYPTODEV_QAT_PMD;
+               info->feature_flags = dev->feature_flags;
+               info->capabilities = qat_pmd_capabilities;
+               info->sym.max_nb_sessions = internals->max_nb_sessions;
+               info->dev_type = RTE_CRYPTODEV_QAT_SYM_PMD;
        }
 }