From 8d53e9f3c6001dcb2865f6e894da5b54e1418f88 Mon Sep 17 00:00:00 2001 From: Christian Ehrhardt Date: Thu, 4 Jul 2019 10:40:06 +0200 Subject: New upstream version 18.11.2 Change-Id: I23eb4f9179abf1f9c659891f8fddb27ee68ad26b Signed-off-by: Christian Ehrhardt --- drivers/compress/isal/isal_compress_pmd.c | 5 +---- drivers/compress/isal/isal_compress_pmd_ops.c | 16 ++++++++++++---- drivers/compress/qat/qat_comp_pmd.c | 9 +++++---- 3 files changed, 18 insertions(+), 12 deletions(-) (limited to 'drivers/compress') diff --git a/drivers/compress/isal/isal_compress_pmd.c b/drivers/compress/isal/isal_compress_pmd.c index 9f1e9688..f208b650 100644 --- a/drivers/compress/isal/isal_compress_pmd.c +++ b/drivers/compress/isal/isal_compress_pmd.c @@ -372,7 +372,7 @@ process_isal_deflate(struct rte_comp_op *op, struct isal_comp_qp *qp, uint8_t *temp_level_buf = qp->stream->level_buf; /* Initialize compression stream */ - isal_deflate_stateless_init(qp->stream); + isal_deflate_init(qp->stream); qp->stream->level_buf = temp_level_buf; @@ -461,8 +461,6 @@ process_isal_deflate(struct rte_comp_op *op, struct isal_comp_qp *qp, } op->consumed = qp->stream->total_in; op->produced = qp->stream->total_out; - isal_deflate_reset(qp->stream); - return ret; } @@ -538,7 +536,6 @@ process_isal_inflate(struct rte_comp_op *op, struct isal_comp_qp *qp) op->consumed = op->src.length - qp->state->avail_in; } op->produced = qp->state->total_out; - isal_inflate_reset(qp->state); return ret; } diff --git a/drivers/compress/isal/isal_compress_pmd_ops.c b/drivers/compress/isal/isal_compress_pmd_ops.c index 41cade87..472e54e8 100644 --- a/drivers/compress/isal/isal_compress_pmd_ops.c +++ b/drivers/compress/isal/isal_compress_pmd_ops.c @@ -133,10 +133,18 @@ isal_comp_pmd_info_get(struct rte_compressdev *dev __rte_unused, { if (dev_info != NULL) { dev_info->capabilities = isal_pmd_capabilities; - dev_info->feature_flags = RTE_COMPDEV_FF_CPU_AVX512 | - RTE_COMPDEV_FF_CPU_AVX2 | - RTE_COMPDEV_FF_CPU_AVX | - RTE_COMPDEV_FF_CPU_SSE; + + /* Check CPU for supported vector instruction and set + * feature_flags + */ + if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512F)) + dev_info->feature_flags |= RTE_COMPDEV_FF_CPU_AVX512; + else if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX2)) + dev_info->feature_flags |= RTE_COMPDEV_FF_CPU_AVX2; + else if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX)) + dev_info->feature_flags |= RTE_COMPDEV_FF_CPU_AVX; + else + dev_info->feature_flags |= RTE_COMPDEV_FF_CPU_SSE; } } diff --git a/drivers/compress/qat/qat_comp_pmd.c b/drivers/compress/qat/qat_comp_pmd.c index ea930772..139298ef 100644 --- a/drivers/compress/qat/qat_comp_pmd.c +++ b/drivers/compress/qat/qat_comp_pmd.c @@ -185,7 +185,7 @@ qat_comp_setup_inter_buffers(struct qat_comp_dev_private *comp_dev, memzone = rte_memzone_reserve_aligned(inter_buff_mz_name, full_size, comp_dev->compressdev->data->socket_id, - RTE_MEMZONE_2MB, QAT_64_BYTE_ALIGN); + RTE_MEMZONE_IOVA_CONTIG, QAT_64_BYTE_ALIGN); if (memzone == NULL) { QAT_LOG(ERR, "Can't allocate intermediate buffers" " for device %s", comp_dev->qat_dev->name); @@ -239,7 +239,8 @@ qat_comp_setup_inter_buffers(struct qat_comp_dev_private *comp_dev, static struct rte_mempool * qat_comp_create_xform_pool(struct qat_comp_dev_private *comp_dev, - uint32_t num_elements) + struct rte_compressdev_config *config, + uint32_t num_elements) { char xform_pool_name[RTE_MEMPOOL_NAMESIZE]; struct rte_mempool *mp; @@ -264,7 +265,7 @@ qat_comp_create_xform_pool(struct qat_comp_dev_private *comp_dev, mp = rte_mempool_create(xform_pool_name, num_elements, qat_comp_xform_size(), 0, 0, - NULL, NULL, NULL, NULL, rte_socket_id(), + NULL, NULL, NULL, NULL, config->socket_id, 0); if (mp == NULL) { QAT_LOG(ERR, "Err creating mempool %s w %d elements of size %d", @@ -320,7 +321,7 @@ qat_comp_dev_config(struct rte_compressdev *dev, } } - comp_dev->xformpool = qat_comp_create_xform_pool(comp_dev, + comp_dev->xformpool = qat_comp_create_xform_pool(comp_dev, config, config->max_nb_priv_xforms); if (comp_dev->xformpool == NULL) { -- cgit 1.2.3-korg