bus/fslmc: detect IOMMU mode

[dpdk.git] / lib / librte_ethdev / rte_mtr.h

diff --git a/lib/librte_ethdev/rte_mtr.h b/lib/librte_ethdev/rte_mtr.h
index c4819b2..6ba7d18 100644 (file)
--- a/lib/librte_ethdev/rte_mtr.h
+++ b/lib/librte_ethdev/rte_mtr.h
@@ -76,21 +76,12 @@
 #include <stdint.h>
 #include <rte_compat.h>
 #include <rte_common.h>
+#include <rte_meter.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/**
- * Color
- */
-enum rte_mtr_color {
-       RTE_MTR_GREEN = 0, /**< Green */
-       RTE_MTR_YELLOW, /**< Yellow */
-       RTE_MTR_RED, /**< Red */
-       RTE_MTR_COLORS /**< Number of colors. */
-};
-
 /**
  * Statistics counter type
  */
@@ -125,10 +116,10 @@ enum rte_mtr_stats_type {
  */
 struct rte_mtr_stats {
        /** Number of packets passed by the policer (per color). */
-       uint64_t n_pkts[RTE_MTR_COLORS];
+       uint64_t n_pkts[RTE_COLORS];
 
        /** Number of bytes passed by the policer (per color). */
-       uint64_t n_bytes[RTE_MTR_COLORS];
+       uint64_t n_bytes[RTE_COLORS];
 
        /** Number of packets dropped by the policer. */
        uint64_t n_pkts_dropped;
@@ -260,7 +251,7 @@ struct rte_mtr_params {
         * at least one yellow or red color element, then the color aware mode
         * is configured.
         */
-       enum rte_mtr_color *dscp_table;
+       enum rte_color *dscp_table;
 
        /** Non-zero to enable the meter, zero to disable the meter at the time
         * of MTR object creation. Ignored when the meter profile indicated by
@@ -270,7 +261,7 @@ struct rte_mtr_params {
        int meter_enable;
 
        /** Policer actions (per meter output color). */
-       enum rte_mtr_policer_action action[RTE_MTR_COLORS];
+       enum rte_mtr_policer_action action[RTE_COLORS];
 
        /** Set of stats counters to be enabled.
         * @see enum rte_mtr_stats_type
@@ -447,7 +438,8 @@ struct rte_mtr_error {
  * @return
  *   0 on success, non-zero error code otherwise.
  */
-int __rte_experimental
+__rte_experimental
+int
 rte_mtr_capabilities_get(uint16_t port_id,
        struct rte_mtr_capabilities *cap,
        struct rte_mtr_error *error);
@@ -470,7 +462,8 @@ rte_mtr_capabilities_get(uint16_t port_id,
  * @return
  *   0 on success, non-zero error code otherwise.
  */
-int __rte_experimental
+__rte_experimental
+int
 rte_mtr_meter_profile_add(uint16_t port_id,
        uint32_t meter_profile_id,
        struct rte_mtr_meter_profile *profile,
@@ -491,7 +484,8 @@ rte_mtr_meter_profile_add(uint16_t port_id,
  * @return
  *   0 on success, non-zero error code otherwise.
  */
-int __rte_experimental
+__rte_experimental
+int
 rte_mtr_meter_profile_delete(uint16_t port_id,
        uint32_t meter_profile_id,
        struct rte_mtr_error *error);
@@ -519,7 +513,8 @@ rte_mtr_meter_profile_delete(uint16_t port_id,
  *
  * @see enum rte_flow_action_type::RTE_FLOW_ACTION_TYPE_METER
  */
-int __rte_experimental
+__rte_experimental
+int
 rte_mtr_create(uint16_t port_id,
        uint32_t mtr_id,
        struct rte_mtr_params *params,
@@ -542,7 +537,8 @@ rte_mtr_create(uint16_t port_id,
  * @return
  *   0 on success, non-zero error code otherwise.
  */
-int __rte_experimental
+__rte_experimental
+int
 rte_mtr_destroy(uint16_t port_id,
        uint32_t mtr_id,
        struct rte_mtr_error *error);
@@ -569,7 +565,8 @@ rte_mtr_destroy(uint16_t port_id,
  * @return
  *   0 on success, non-zero error code otherwise.
  */
-int __rte_experimental
+__rte_experimental
+int
 rte_mtr_meter_disable(uint16_t port_id,
        uint32_t mtr_id,
        struct rte_mtr_error *error);
@@ -590,7 +587,8 @@ rte_mtr_meter_disable(uint16_t port_id,
  * @return
  *   0 on success, non-zero error code otherwise.
  */
-int __rte_experimental
+__rte_experimental
+int
 rte_mtr_meter_enable(uint16_t port_id,
        uint32_t mtr_id,
        struct rte_mtr_error *error);
@@ -609,7 +607,8 @@ rte_mtr_meter_enable(uint16_t port_id,
  * @return
  *   0 on success, non-zero error code otherwise.
  */
-int __rte_experimental
+__rte_experimental
+int
 rte_mtr_meter_profile_update(uint16_t port_id,
        uint32_t mtr_id,
        uint32_t meter_profile_id,
@@ -633,10 +632,11 @@ rte_mtr_meter_profile_update(uint16_t port_id,
  * @return
  *   0 on success, non-zero error code otherwise.
  */
-int __rte_experimental
+__rte_experimental
+int
 rte_mtr_meter_dscp_table_update(uint16_t port_id,
        uint32_t mtr_id,
-       enum rte_mtr_color *dscp_table,
+       enum rte_color *dscp_table,
        struct rte_mtr_error *error);
 
 /**
@@ -659,7 +659,8 @@ rte_mtr_meter_dscp_table_update(uint16_t port_id,
  * @return
  *   0 on success, non-zero error code otherwise.
  */
-int __rte_experimental
+__rte_experimental
+int
 rte_mtr_policer_actions_update(uint16_t port_id,
        uint32_t mtr_id,
        uint32_t action_mask,
@@ -684,7 +685,8 @@ rte_mtr_policer_actions_update(uint16_t port_id,
  *
  * @see enum rte_mtr_stats_type
  */
-int __rte_experimental
+__rte_experimental
+int
 rte_mtr_stats_update(uint16_t port_id,
        uint32_t mtr_id,
        uint64_t stats_mask,
@@ -715,7 +717,8 @@ rte_mtr_stats_update(uint16_t port_id,
  *
  * @see enum rte_mtr_stats_type
  */
-int __rte_experimental
+__rte_experimental
+int
 rte_mtr_stats_read(uint16_t port_id,
        uint32_t mtr_id,
        struct rte_mtr_stats *stats,