ethdev: add namespace
[dpdk.git] / drivers / net / ixgbe / ixgbe_tm.c
index ca4182c..ac89760 100644 (file)
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2017 Intel Corporation. All rights reserved.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #include <rte_malloc.h>
@@ -148,14 +119,14 @@ ixgbe_tc_nb_get(struct rte_eth_dev *dev)
        uint8_t nb_tcs = 0;
 
        eth_conf = &dev->data->dev_conf;
-       if (eth_conf->txmode.mq_mode == ETH_MQ_TX_DCB) {
+       if (eth_conf->txmode.mq_mode == RTE_ETH_MQ_TX_DCB) {
                nb_tcs = eth_conf->tx_adv_conf.dcb_tx_conf.nb_tcs;
-       } else if (eth_conf->txmode.mq_mode == ETH_MQ_TX_VMDQ_DCB) {
+       } else if (eth_conf->txmode.mq_mode == RTE_ETH_MQ_TX_VMDQ_DCB) {
                if (eth_conf->tx_adv_conf.vmdq_dcb_tx_conf.nb_queue_pools ==
-                   ETH_32_POOLS)
-                       nb_tcs = ETH_4_TCS;
+                   RTE_ETH_32_POOLS)
+                       nb_tcs = RTE_ETH_4_TCS;
                else
-                       nb_tcs = ETH_8_TCS;
+                       nb_tcs = RTE_ETH_8_TCS;
        } else {
                nb_tcs = 1;
        }
@@ -197,12 +168,16 @@ ixgbe_tm_capabilities_get(struct rte_eth_dev *dev,
        cap->shaper_private_rate_min = 0;
        /* 10Gbps -> 1.25GBps */
        cap->shaper_private_rate_max = 1250000000ull;
+       cap->shaper_private_packet_mode_supported = 0;
+       cap->shaper_private_byte_mode_supported = 1;
        cap->shaper_shared_n_max = 0;
        cap->shaper_shared_n_nodes_per_shaper_max = 0;
        cap->shaper_shared_n_shapers_per_node_max = 0;
        cap->shaper_shared_dual_rate_n_max = 0;
        cap->shaper_shared_rate_min = 0;
        cap->shaper_shared_rate_max = 0;
+       cap->shaper_shared_packet_mode_supported = 0;
+       cap->shaper_shared_byte_mode_supported = 0;
        cap->sched_n_children_max = hw->mac.max_tx_queues;
        /**
         * HW supports SP. But no plan to support it now.
@@ -211,6 +186,8 @@ ixgbe_tm_capabilities_get(struct rte_eth_dev *dev,
        cap->sched_sp_n_priorities_max = 1;
        cap->sched_wfq_n_children_per_group_max = 0;
        cap->sched_wfq_n_groups_max = 0;
+       cap->sched_wfq_packet_mode_supported = 0;
+       cap->sched_wfq_byte_mode_supported = 0;
        /**
         * SW only supports fair round robin now.
         * So, all the nodes should have the same weight.
@@ -398,10 +375,10 @@ ixgbe_queue_base_nb_get(struct rte_eth_dev *dev, uint16_t tc_node_no,
        if (vf_num) {
                /* no DCB */
                if (nb_tcs == 1) {
-                       if (vf_num >= ETH_32_POOLS) {
+                       if (vf_num >= RTE_ETH_32_POOLS) {
                                *nb = 2;
                                *base = vf_num * 2;
-                       } else if (vf_num >= ETH_16_POOLS) {
+                       } else if (vf_num >= RTE_ETH_16_POOLS) {
                                *nb = 4;
                                *base = vf_num * 4;
                        } else {
@@ -415,7 +392,7 @@ ixgbe_queue_base_nb_get(struct rte_eth_dev *dev, uint16_t tc_node_no,
                }
        } else {
                /* VT off */
-               if (nb_tcs == ETH_8_TCS) {
+               if (nb_tcs == RTE_ETH_8_TCS) {
                        switch (tc_node_no) {
                        case 0:
                                *base = 0;
@@ -688,7 +665,7 @@ ixgbe_node_add(struct rte_eth_dev *dev, uint32_t node_id,
        }
        /* check level */
        if (level_id != RTE_TM_NODE_LEVEL_ID_ANY &&
-           level_id != parent_node_type + 1) {
+           level_id != (uint32_t)parent_node_type + 1) {
                error->type = RTE_TM_ERROR_TYPE_NODE_PARAMS;
                error->message = "Wrong level";
                return -EINVAL;
@@ -904,7 +881,11 @@ ixgbe_level_capabilities_get(struct rte_eth_dev *dev,
                cap->nonleaf.shaper_private_rate_min = 0;
                /* 10Gbps -> 1.25GBps */
                cap->nonleaf.shaper_private_rate_max = 1250000000ull;
+               cap->nonleaf.shaper_private_packet_mode_supported = 0;
+               cap->nonleaf.shaper_private_byte_mode_supported = 1;
                cap->nonleaf.shaper_shared_n_max = 0;
+               cap->nonleaf.shaper_shared_packet_mode_supported = 0;
+               cap->nonleaf.shaper_shared_byte_mode_supported = 0;
                if (level_id == IXGBE_TM_NODE_TYPE_PORT)
                        cap->nonleaf.sched_n_children_max =
                                IXGBE_DCB_MAX_TRAFFIC_CLASS;
@@ -915,6 +896,8 @@ ixgbe_level_capabilities_get(struct rte_eth_dev *dev,
                cap->nonleaf.sched_wfq_n_children_per_group_max = 0;
                cap->nonleaf.sched_wfq_n_groups_max = 0;
                cap->nonleaf.sched_wfq_weight_max = 1;
+               cap->nonleaf.sched_wfq_packet_mode_supported = 0;
+               cap->nonleaf.sched_wfq_byte_mode_supported = 0;
                cap->nonleaf.stats_mask = 0;
 
                return 0;
@@ -926,7 +909,11 @@ ixgbe_level_capabilities_get(struct rte_eth_dev *dev,
        cap->leaf.shaper_private_rate_min = 0;
        /* 10Gbps -> 1.25GBps */
        cap->leaf.shaper_private_rate_max = 1250000000ull;
+       cap->leaf.shaper_private_packet_mode_supported = 0;
+       cap->leaf.shaper_private_byte_mode_supported = 1;
        cap->leaf.shaper_shared_n_max = 0;
+       cap->leaf.shaper_shared_packet_mode_supported = 0;
+       cap->leaf.shaper_shared_byte_mode_supported = 0;
        cap->leaf.cman_head_drop_supported = false;
        cap->leaf.cman_wred_context_private_supported = true;
        cap->leaf.cman_wred_context_shared_n_max = 0;
@@ -967,7 +954,11 @@ ixgbe_node_capabilities_get(struct rte_eth_dev *dev,
        cap->shaper_private_rate_min = 0;
        /* 10Gbps -> 1.25GBps */
        cap->shaper_private_rate_max = 1250000000ull;
+       cap->shaper_private_packet_mode_supported = 0;
+       cap->shaper_private_byte_mode_supported = 1;
        cap->shaper_shared_n_max = 0;
+       cap->shaper_shared_packet_mode_supported = 0;
+       cap->shaper_shared_byte_mode_supported = 0;
 
        if (node_type == IXGBE_TM_NODE_TYPE_QUEUE) {
                cap->leaf.cman_head_drop_supported = false;
@@ -984,6 +975,8 @@ ixgbe_node_capabilities_get(struct rte_eth_dev *dev,
                cap->nonleaf.sched_wfq_n_children_per_group_max = 0;
                cap->nonleaf.sched_wfq_n_groups_max = 0;
                cap->nonleaf.sched_wfq_weight_max = 1;
+               cap->nonleaf.sched_wfq_packet_mode_supported = 0;
+               cap->nonleaf.sched_wfq_byte_mode_supported = 0;
        }
 
        cap->stats_mask = 0;