net/mlx5: workaround drop action with old kernel

[dpdk.git] / drivers / net / ipn3ke / ipn3ke_tm.c

diff --git a/drivers/net/ipn3ke/ipn3ke_tm.c b/drivers/net/ipn3ke/ipn3ke_tm.c
index 10828fc..6a9b98f 100644 (file)
--- a/drivers/net/ipn3ke/ipn3ke_tm.c
+++ b/drivers/net/ipn3ke/ipn3ke_tm.c
@@ -14,7 +14,7 @@
 
 #include <rte_mbuf.h>
 #include <rte_sched.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 
 #include <rte_io.h>
 #include <rte_rawdev.h>
@@ -440,6 +440,8 @@ ipn3ke_tm_capabilities_get(__rte_unused struct rte_eth_dev *dev,
        cap->shaper_private_dual_rate_n_max = 0;
        cap->shaper_private_rate_min = 1;
        cap->shaper_private_rate_max = 1 + IPN3KE_TM_VT_NODE_NUM;
+       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;
@@ -447,6 +449,8 @@ ipn3ke_tm_capabilities_get(__rte_unused struct rte_eth_dev *dev,
        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->shaper_pkt_length_adjust_min = RTE_TM_ETH_FRAMING_OVERHEAD_FCS;
        cap->shaper_pkt_length_adjust_max = RTE_TM_ETH_FRAMING_OVERHEAD_FCS;
@@ -456,6 +460,8 @@ ipn3ke_tm_capabilities_get(__rte_unused struct rte_eth_dev *dev,
        cap->sched_wfq_n_children_per_group_max = UINT32_MAX;
        cap->sched_wfq_n_groups_max = 1;
        cap->sched_wfq_weight_max = UINT32_MAX;
+       cap->sched_wfq_packet_mode_supported = 0;
+       cap->sched_wfq_byte_mode_supported = 1;
 
        cap->cman_wred_packet_mode_supported = 0;
        cap->cman_wred_byte_mode_supported = 0;
@@ -517,13 +523,19 @@ ipn3ke_tm_level_capabilities_get(struct rte_eth_dev *dev,
                cap->nonleaf.shaper_private_dual_rate_supported = 0;
                cap->nonleaf.shaper_private_rate_min = 1;
                cap->nonleaf.shaper_private_rate_max = UINT32_MAX;
+               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;
 
                cap->nonleaf.sched_n_children_max = IPN3KE_TM_VT_NODE_NUM;
                cap->nonleaf.sched_sp_n_priorities_max = 1;
                cap->nonleaf.sched_wfq_n_children_per_group_max = 0;
                cap->nonleaf.sched_wfq_n_groups_max = 0;
                cap->nonleaf.sched_wfq_weight_max = 0;
+               cap->nonleaf.sched_wfq_packet_mode_supported = 0;
+               cap->nonleaf.sched_wfq_byte_mode_supported = 0;
 
                cap->nonleaf.stats_mask = STATS_MASK_DEFAULT;
                break;
@@ -539,13 +551,19 @@ ipn3ke_tm_level_capabilities_get(struct rte_eth_dev *dev,
                cap->nonleaf.shaper_private_dual_rate_supported = 0;
                cap->nonleaf.shaper_private_rate_min = 1;
                cap->nonleaf.shaper_private_rate_max = UINT32_MAX;
+               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;
 
                cap->nonleaf.sched_n_children_max = IPN3KE_TM_COS_NODE_NUM;
                cap->nonleaf.sched_sp_n_priorities_max = 1;
                cap->nonleaf.sched_wfq_n_children_per_group_max = 0;
                cap->nonleaf.sched_wfq_n_groups_max = 0;
                cap->nonleaf.sched_wfq_weight_max = 0;
+               cap->nonleaf.sched_wfq_packet_mode_supported = 0;
+               cap->nonleaf.sched_wfq_byte_mode_supported = 0;
 
                cap->nonleaf.stats_mask = STATS_MASK_DEFAULT;
                break;
@@ -561,7 +579,11 @@ ipn3ke_tm_level_capabilities_get(struct rte_eth_dev *dev,
                cap->leaf.shaper_private_dual_rate_supported = 0;
                cap->leaf.shaper_private_rate_min = 0;
                cap->leaf.shaper_private_rate_max = 0;
+               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 = 0;
                cap->leaf.cman_wred_packet_mode_supported = WRED_SUPPORTED;
@@ -632,7 +654,11 @@ ipn3ke_tm_node_capabilities_get(struct rte_eth_dev *dev,
                cap->shaper_private_dual_rate_supported = 0;
                cap->shaper_private_rate_min = 1;
                cap->shaper_private_rate_max = UINT32_MAX;
+               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;
 
                cap->nonleaf.sched_n_children_max = IPN3KE_TM_VT_NODE_NUM;
                cap->nonleaf.sched_sp_n_priorities_max = 1;
@@ -640,6 +666,8 @@ ipn3ke_tm_node_capabilities_get(struct rte_eth_dev *dev,
                        IPN3KE_TM_VT_NODE_NUM;
                cap->nonleaf.sched_wfq_n_groups_max = 1;
                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 = STATS_MASK_DEFAULT;
                break;
@@ -649,7 +677,11 @@ ipn3ke_tm_node_capabilities_get(struct rte_eth_dev *dev,
                cap->shaper_private_dual_rate_supported = 0;
                cap->shaper_private_rate_min = 1;
                cap->shaper_private_rate_max = UINT32_MAX;
+               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;
 
                cap->nonleaf.sched_n_children_max = IPN3KE_TM_COS_NODE_NUM;
                cap->nonleaf.sched_sp_n_priorities_max = 1;
@@ -657,6 +689,8 @@ ipn3ke_tm_node_capabilities_get(struct rte_eth_dev *dev,
                        IPN3KE_TM_COS_NODE_NUM;
                cap->nonleaf.sched_wfq_n_groups_max = 1;
                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 = STATS_MASK_DEFAULT;
                break;
@@ -666,7 +700,11 @@ ipn3ke_tm_node_capabilities_get(struct rte_eth_dev *dev,
                cap->shaper_private_dual_rate_supported = 0;
                cap->shaper_private_rate_min = 0;
                cap->shaper_private_rate_max = 0;
+               cap->shaper_private_packet_mode_supported = 0;
+               cap->shaper_private_byte_mode_supported = 0;
                cap->shaper_shared_n_max = 0;
+               cap->shaper_shared_packet_mode_supported = 0;
+               cap->shaper_shared_byte_mode_supported = 0;
 
                cap->leaf.cman_head_drop_supported = 0;
                cap->leaf.cman_wred_packet_mode_supported = WRED_SUPPORTED;
@@ -1087,7 +1125,6 @@ ipn3ke_tm_node_add_check_mount(uint32_t tm_id,
        uint32_t node_id, uint32_t parent_node_id, uint32_t level_id,
        struct rte_tm_error *error)
 {
-       /*struct ipn3ke_tm_internals *tm = IPN3KE_DEV_PRIVATE_TO_TM(dev);*/
        uint32_t node_index;
        uint32_t parent_index;
        uint32_t parent_index1;
@@ -1510,12 +1547,6 @@ ipn3ke_tm_hierarchy_commit_check(struct rte_eth_dev *dev,
                                                RTE_TM_ERROR_TYPE_UNSPECIFIED,
                                                NULL,
                                                rte_strerror(EINVAL));
-                       } else {
-                               return -rte_tm_error_set(error,
-                                               EINVAL,
-                                               RTE_TM_ERROR_TYPE_UNSPECIFIED,
-                                               NULL,
-                                               rte_strerror(EINVAL));
                        }
                }
        }
@@ -2060,4 +2091,3 @@ ipn3ke_tm_ops_get(struct rte_eth_dev *ethdev,
 
        return 0;
 }
-