net/bnxt: support Thor WC TCAM

[dpdk.git] / drivers / net / i40e / i40e_tm.c

diff --git a/drivers/net/i40e/i40e_tm.c b/drivers/net/i40e/i40e_tm.c
index 44316f6..cab296e 100644 (file)
--- a/drivers/net/i40e/i40e_tm.c
+++ b/drivers/net/i40e/i40e_tm.c
@@ -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>
@@ -189,12 +160,16 @@ i40e_tm_capabilities_get(struct rte_eth_dev *dev,
        cap->shaper_private_rate_min = 0;
        /* 40Gbps -> 5GBps */
        cap->shaper_private_rate_max = 5000000000ull;
+       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->func_caps.num_tx_qp;
        /**
         * HW supports SP. But no plan to support it now.
@@ -208,6 +183,8 @@ i40e_tm_capabilities_get(struct rte_eth_dev *dev,
         * So, all the nodes should have the same weight.
         */
        cap->sched_wfq_weight_max = 1;
+       cap->sched_wfq_packet_mode_supported = 0;
+       cap->sched_wfq_byte_mode_supported = 0;
        cap->cman_head_drop_supported = 0;
        cap->dynamic_update_mask = 0;
        cap->shaper_pkt_length_adjust_min = RTE_TM_ETH_FRAMING_OVERHEAD;
@@ -577,7 +554,7 @@ i40e_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;
@@ -783,7 +760,11 @@ i40e_level_capabilities_get(struct rte_eth_dev *dev,
                cap->nonleaf.shaper_private_rate_min = 0;
                /* 40Gbps -> 5GBps */
                cap->nonleaf.shaper_private_rate_max = 5000000000ull;
+               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 == I40E_TM_NODE_TYPE_PORT)
                        cap->nonleaf.sched_n_children_max =
                                I40E_MAX_TRAFFIC_CLASS;
@@ -794,6 +775,8 @@ i40e_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;
@@ -805,7 +788,11 @@ i40e_level_capabilities_get(struct rte_eth_dev *dev,
        cap->leaf.shaper_private_rate_min = 0;
        /* 40Gbps -> 5GBps */
        cap->leaf.shaper_private_rate_max = 5000000000ull;
+       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;
@@ -846,7 +833,11 @@ i40e_node_capabilities_get(struct rte_eth_dev *dev,
        cap->shaper_private_rate_min = 0;
        /* 40Gbps -> 5GBps */
        cap->shaper_private_rate_max = 5000000000ull;
+       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 == I40E_TM_NODE_TYPE_QUEUE) {
                cap->leaf.cman_head_drop_supported = false;
@@ -863,6 +854,8 @@ i40e_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;