net/mlx5: fix meter policy flow match item

[dpdk.git] / drivers / baseband / fpga_lte_fec / fpga_lte_fec.c

diff --git a/drivers/baseband/fpga_lte_fec/fpga_lte_fec.c b/drivers/baseband/fpga_lte_fec/fpga_lte_fec.c
index 6be9131..350c424 100644 (file)
--- a/drivers/baseband/fpga_lte_fec/fpga_lte_fec.c
+++ b/drivers/baseband/fpga_lte_fec/fpga_lte_fec.c
@@ -23,9 +23,9 @@
 #include "fpga_lte_fec.h"
 
 #ifdef RTE_LIBRTE_BBDEV_DEBUG
-RTE_LOG_REGISTER(fpga_lte_fec_logtype, pmd.bb.fpga_lte_fec, DEBUG);
+RTE_LOG_REGISTER_DEFAULT(fpga_lte_fec_logtype, DEBUG);
 #else
-RTE_LOG_REGISTER(fpga_lte_fec_logtype, pmd.bb.fpga_lte_fec, NOTICE);
+RTE_LOG_REGISTER_DEFAULT(fpga_lte_fec_logtype, NOTICE);
 #endif
 
 /* Helper macro for logging */
@@ -1251,14 +1251,14 @@ fpga_dma_desc_te_fill(struct rte_bbdev_enc_op *op,
        desc->offset = desc_offset;
        /* Set inbound data buffer address */
        desc->in_addr_hi = (uint32_t)(
-                       rte_pktmbuf_mtophys_offset(input, in_offset) >> 32);
+                       rte_pktmbuf_iova_offset(input, in_offset) >> 32);
        desc->in_addr_lw = (uint32_t)(
-                       rte_pktmbuf_mtophys_offset(input, in_offset));
+                       rte_pktmbuf_iova_offset(input, in_offset));
 
        desc->out_addr_hi = (uint32_t)(
-                       rte_pktmbuf_mtophys_offset(output, out_offset) >> 32);
+                       rte_pktmbuf_iova_offset(output, out_offset) >> 32);
        desc->out_addr_lw = (uint32_t)(
-                       rte_pktmbuf_mtophys_offset(output, out_offset));
+                       rte_pktmbuf_iova_offset(output, out_offset));
 
        /* Save software context needed for dequeue */
        desc->op_addr = op;
@@ -1302,23 +1302,23 @@ fpga_dma_desc_td_fill(struct rte_bbdev_dec_op *op,
        desc->done = 0;
        /* Set inbound data buffer address */
        desc->in_addr_hi = (uint32_t)(
-                       rte_pktmbuf_mtophys_offset(input, in_offset) >> 32);
+                       rte_pktmbuf_iova_offset(input, in_offset) >> 32);
        desc->in_addr_lw = (uint32_t)(
-                       rte_pktmbuf_mtophys_offset(input, in_offset));
+                       rte_pktmbuf_iova_offset(input, in_offset));
        desc->in_len = in_length;
        desc->k = k;
        desc->crc_type = !check_bit(op->turbo_dec.op_flags,
                        RTE_BBDEV_TURBO_CRC_TYPE_24B);
-       if ((op->turbo_dec.code_block_mode == 0)
+       if ((op->turbo_dec.code_block_mode == RTE_BBDEV_TRANSPORT_BLOCK)
                && !check_bit(op->turbo_dec.op_flags,
                RTE_BBDEV_TURBO_DEC_TB_CRC_24B_KEEP))
                desc->drop_crc = 1;
        desc->max_iter = op->turbo_dec.iter_max * 2;
        desc->offset = desc_offset;
        desc->out_addr_hi = (uint32_t)(
-                       rte_pktmbuf_mtophys_offset(output, out_offset) >> 32);
+                       rte_pktmbuf_iova_offset(output, out_offset) >> 32);
        desc->out_addr_lw = (uint32_t)(
-                       rte_pktmbuf_mtophys_offset(output, out_offset));
+                       rte_pktmbuf_iova_offset(output, out_offset));
 
        /* Save software context needed for dequeue */
        desc->op_addr = op;
@@ -1366,15 +1366,15 @@ validate_enc_op(struct rte_bbdev_enc_op *op)
                                turbo_enc->rv_index);
                return -1;
        }
-       if (turbo_enc->code_block_mode != 0 &&
-                       turbo_enc->code_block_mode != 1) {
+       if (turbo_enc->code_block_mode != RTE_BBDEV_TRANSPORT_BLOCK &&
+                       turbo_enc->code_block_mode != RTE_BBDEV_CODE_BLOCK) {
                rte_bbdev_log(ERR,
                                "code_block_mode (%u) is out of range 0 <= value <= 1",
                                turbo_enc->code_block_mode);
                return -1;
        }
 
-       if (turbo_enc->code_block_mode == 0) {
+       if (turbo_enc->code_block_mode == RTE_BBDEV_TRANSPORT_BLOCK) {
                tb = &turbo_enc->tb_params;
                if ((tb->k_neg < RTE_BBDEV_TURBO_MIN_CB_SIZE
                                || tb->k_neg > RTE_BBDEV_TURBO_MAX_CB_SIZE)
@@ -1698,15 +1698,15 @@ validate_dec_op(struct rte_bbdev_dec_op *op)
                                turbo_dec->iter_min, turbo_dec->iter_max);
                return -1;
        }
-       if (turbo_dec->code_block_mode != 0 &&
-                       turbo_dec->code_block_mode != 1) {
+       if (turbo_dec->code_block_mode != RTE_BBDEV_TRANSPORT_BLOCK &&
+                       turbo_dec->code_block_mode != RTE_BBDEV_CODE_BLOCK) {
                rte_bbdev_log(ERR,
                                "code_block_mode (%u) is out of range 0 <= value <= 1",
                                turbo_dec->code_block_mode);
                return -1;
        }
 
-       if (turbo_dec->code_block_mode == 0) {
+       if (turbo_dec->code_block_mode == RTE_BBDEV_TRANSPORT_BLOCK) {
 
                if ((turbo_dec->op_flags &
                        RTE_BBDEV_TURBO_DEC_TB_CRC_24B_KEEP) &&
@@ -1957,7 +1957,8 @@ fpga_enqueue_enc(struct rte_bbdev_queue_data *q_data,
                q->ring_ctrl_reg.ring_size + q->head_free_desc - q->tail - 1;
 
        for (i = 0; i < num; ++i) {
-               if (ops[i]->turbo_enc.code_block_mode == 0) {
+               if (ops[i]->turbo_enc.code_block_mode ==
+                               RTE_BBDEV_TRANSPORT_BLOCK) {
                        cbs_in_op = get_num_cbs_in_op_enc(&ops[i]->turbo_enc);
                        /* Check if there is available space for further
                         * processing
@@ -2026,7 +2027,8 @@ fpga_enqueue_dec(struct rte_bbdev_queue_data *q_data,
                q->ring_ctrl_reg.ring_size + q->head_free_desc - q->tail - 1;
 
        for (i = 0; i < num; ++i) {
-               if (ops[i]->turbo_dec.code_block_mode == 0) {
+               if (ops[i]->turbo_dec.code_block_mode ==
+                               RTE_BBDEV_TRANSPORT_BLOCK) {
                        cbs_in_op = get_num_cbs_in_op_dec(&ops[i]->turbo_dec);
                        /* Check if there is available space for further
                         * processing
@@ -2246,7 +2248,7 @@ fpga_dequeue_enc(struct rte_bbdev_queue_data *q_data,
        for (i = 0; (i < num) && (dequeued_cbs < avail); ++i) {
                op = (q->ring_addr + ((q->head_free_desc + dequeued_cbs)
                        & q->sw_ring_wrap_mask))->enc_req.op_addr;
-               if (op->turbo_enc.code_block_mode == 0)
+               if (op->turbo_enc.code_block_mode == RTE_BBDEV_TRANSPORT_BLOCK)
                        ret = dequeue_enc_one_op_tb(q, &ops[i], dequeued_cbs);
                else
                        ret = dequeue_enc_one_op_cb(q, &ops[i], dequeued_cbs);
@@ -2284,7 +2286,7 @@ fpga_dequeue_dec(struct rte_bbdev_queue_data *q_data,
        for (i = 0; (i < num) && (dequeued_cbs < avail); ++i) {
                op = (q->ring_addr + ((q->head_free_desc + dequeued_cbs)
                        & q->sw_ring_wrap_mask))->dec_req.op_addr;
-               if (op->turbo_dec.code_block_mode == 0)
+               if (op->turbo_dec.code_block_mode == RTE_BBDEV_TRANSPORT_BLOCK)
                        ret = dequeue_dec_one_op_tb(q, &ops[i], dequeued_cbs);
                else
                        ret = dequeue_dec_one_op_cb(q, &ops[i], dequeued_cbs);
@@ -2328,7 +2330,7 @@ fpga_lte_fec_init(struct rte_bbdev *dev, struct rte_pci_driver *drv)
 
        rte_bbdev_log_debug(
                        "Init device %s [%s] @ virtaddr %p phyaddr %#"PRIx64,
-                       dev->device->driver->name, dev->data->name,
+                       drv->driver.name, dev->data->name,
                        (void *)pci_dev->mem_resource[0].addr,
                        pci_dev->mem_resource[0].phys_addr);
 }
@@ -2383,7 +2385,7 @@ fpga_lte_fec_probe(struct rte_pci_driver *pci_drv,
                ((uint16_t)(version_id >> 16)), ((uint16_t)version_id));
 
 #ifdef RTE_LIBRTE_BBDEV_DEBUG
-       if (!strcmp(bbdev->device->driver->name,
+       if (!strcmp(pci_drv->driver.name,
                        RTE_STR(FPGA_LTE_FEC_PF_DRIVER_NAME)))
                print_static_reg_debug_info(d->mmio_base);
 #endif
@@ -2432,10 +2434,10 @@ fpga_lte_fec_remove(struct rte_pci_device *pci_dev)
 }
 
 static inline void
-set_default_fpga_conf(struct fpga_lte_fec_conf *def_conf)
+set_default_fpga_conf(struct rte_fpga_lte_fec_conf *def_conf)
 {
        /* clear default configuration before initialization */
-       memset(def_conf, 0, sizeof(struct fpga_lte_fec_conf));
+       memset(def_conf, 0, sizeof(struct rte_fpga_lte_fec_conf));
        /* Set pf mode to true */
        def_conf->pf_mode_en = true;
 
@@ -2450,15 +2452,15 @@ set_default_fpga_conf(struct fpga_lte_fec_conf *def_conf)
 
 /* Initial configuration of FPGA LTE FEC device */
 int
-fpga_lte_fec_configure(const char *dev_name,
-               const struct fpga_lte_fec_conf *conf)
+rte_fpga_lte_fec_configure(const char *dev_name,
+               const struct rte_fpga_lte_fec_conf *conf)
 {
        uint32_t payload_32, address;
        uint16_t payload_16;
        uint8_t payload_8;
        uint16_t q_id, vf_id, total_q_id, total_ul_q_id, total_dl_q_id;
        struct rte_bbdev *bbdev = rte_bbdev_get_named_dev(dev_name);
-       struct fpga_lte_fec_conf def_conf;
+       struct rte_fpga_lte_fec_conf def_conf;
 
        if (bbdev == NULL) {
                rte_bbdev_log(ERR,