cryptodev: rename field in vector struct

[dpdk.git] / drivers / crypto / qat / qat_sym_hw_dp.c

diff --git a/drivers/crypto/qat/qat_sym_hw_dp.c b/drivers/crypto/qat/qat_sym_hw_dp.c
index 4305579..12825e4 100644 (file)
--- a/drivers/crypto/qat/qat_sym_hw_dp.c
+++ b/drivers/crypto/qat/qat_sym_hw_dp.c
@@ -2,7 +2,7 @@
  * Copyright(c) 2020 Intel Corporation
  */
 
-#include <rte_cryptodev_pmd.h>
+#include <cryptodev_pmd.h>
 
 #include "adf_transport_access_macros.h"
 #include "icp_qat_fw.h"
@@ -181,8 +181,9 @@ qat_sym_dp_enqueue_cipher_jobs(void *qp_data, uint8_t *drv_ctx,
                        (uint8_t *)tx_queue->base_addr + tail);
                rte_mov128((uint8_t *)req, (const uint8_t *)&(ctx->fw_req));
 
-               data_len = qat_sym_dp_parse_data_vec(qp, req, vec->sgl[i].vec,
-                       vec->sgl[i].num);
+               data_len = qat_sym_dp_parse_data_vec(qp, req,
+                       vec->src_sgl[i].vec,
+                       vec->src_sgl[i].num);
                if (unlikely(data_len < 0))
                        break;
                req->comn_mid.opaque_data = (uint64_t)(uintptr_t)user_data[i];
@@ -302,8 +303,9 @@ qat_sym_dp_enqueue_auth_jobs(void *qp_data, uint8_t *drv_ctx,
                        (uint8_t *)tx_queue->base_addr + tail);
                rte_mov128((uint8_t *)req, (const uint8_t *)&(ctx->fw_req));
 
-               data_len = qat_sym_dp_parse_data_vec(qp, req, vec->sgl[i].vec,
-                       vec->sgl[i].num);
+               data_len = qat_sym_dp_parse_data_vec(qp, req,
+                       vec->src_sgl[i].vec,
+                       vec->src_sgl[i].num);
                if (unlikely(data_len < 0))
                        break;
                req->comn_mid.opaque_data = (uint64_t)(uintptr_t)user_data[i];
@@ -484,14 +486,16 @@ qat_sym_dp_enqueue_chain_jobs(void *qp_data, uint8_t *drv_ctx,
                        (uint8_t *)tx_queue->base_addr + tail);
                rte_mov128((uint8_t *)req, (const uint8_t *)&(ctx->fw_req));
 
-               data_len = qat_sym_dp_parse_data_vec(qp, req, vec->sgl[i].vec,
-                       vec->sgl[i].num);
+               data_len = qat_sym_dp_parse_data_vec(qp, req,
+                       vec->src_sgl[i].vec,
+                       vec->src_sgl[i].num);
                if (unlikely(data_len < 0))
                        break;
                req->comn_mid.opaque_data = (uint64_t)(uintptr_t)user_data[i];
-               if (unlikely(enqueue_one_chain_job(ctx, req, vec->sgl[i].vec,
-                       vec->sgl[i].num, &vec->iv[i], &vec->digest[i],
-                               &vec->auth_iv[i], ofs, (uint32_t)data_len)))
+               if (unlikely(enqueue_one_chain_job(ctx, req,
+                       vec->src_sgl[i].vec, vec->src_sgl[i].num,
+                       &vec->iv[i], &vec->digest[i],
+                       &vec->auth_iv[i], ofs, (uint32_t)data_len)))
                        break;
 
                tail = (tail + tx_queue->msg_size) & tx_queue->modulo_mask;
@@ -688,8 +692,9 @@ qat_sym_dp_enqueue_aead_jobs(void *qp_data, uint8_t *drv_ctx,
                        (uint8_t *)tx_queue->base_addr + tail);
                rte_mov128((uint8_t *)req, (const uint8_t *)&(ctx->fw_req));
 
-               data_len = qat_sym_dp_parse_data_vec(qp, req, vec->sgl[i].vec,
-                       vec->sgl[i].num);
+               data_len = qat_sym_dp_parse_data_vec(qp, req,
+                       vec->src_sgl[i].vec,
+                       vec->src_sgl[i].num);
                if (unlikely(data_len < 0))
                        break;
                req->comn_mid.opaque_data = (uint64_t)(uintptr_t)user_data[i];
@@ -744,14 +749,6 @@ qat_sym_dp_dequeue_burst(void *qp_data, uint8_t *drv_ctx,
                n = get_dequeue_count(resp_opaque);
                if (unlikely(n == 0))
                        return 0;
-               else if (n > 1) {
-                       head = (head + rx_queue->msg_size * (n - 1)) &
-                               rx_queue->modulo_mask;
-                       resp = (struct icp_qat_fw_comn_resp *)(
-                               (uint8_t *)rx_queue->base_addr + head);
-                       if (*(uint32_t *)resp == ADF_RING_EMPTY_SIG)
-                               return 0;
-               }
        } else {
                if (unlikely(max_nb_to_dequeue == 0))
                        return 0;