New upstream version 18.08

[deb_dpdk.git] / drivers / net / mvpp2 / mrvl_qos.h

diff --git a/drivers/net/mrvl/mrvl_qos.h b/drivers/net/mvpp2/mrvl_qos.h
similarity index 53%
rename from drivers/net/mrvl/mrvl_qos.h
rename to drivers/net/mvpp2/mrvl_qos.h
index ae7508c..fa9ddec 100644 (file)
--- a/drivers/net/mrvl/mrvl_qos.h
+++ b/drivers/net/mvpp2/mrvl_qos.h
@@ -1,35 +1,7 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2017 Marvell International Ltd.
- *   Copyright(c) 2017 Semihalf.
- *   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 the copyright holder 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) 2017 Marvell International Ltd.
+ * Copyright(c) 2017 Semihalf.
+ * All rights reserved.
  */
 
 #ifndef _MRVL_QOS_H_
@@ -48,6 +20,8 @@
 /* QoS config. */
 struct mrvl_qos_cfg {
        struct port_cfg {
+               int rate_limit_enable;
+               struct pp2_ppio_rate_limit_params rate_limit_params;
                struct {
                        uint8_t inq[MRVL_PP2_RXQ_MAX];
                        uint8_t dscp[MRVL_CP_PER_TC];
@@ -55,15 +29,21 @@ struct mrvl_qos_cfg {
                        uint8_t inqs;
                        uint8_t dscps;
                        uint8_t pcps;
+                       enum pp2_ppio_color color;
                } tc[MRVL_PP2_TC_MAX];
                struct {
+                       enum pp2_ppio_outq_sched_mode sched_mode;
                        uint8_t weight;
+                       int rate_limit_enable;
+                       struct pp2_ppio_rate_limit_params rate_limit_params;
                } outq[MRVL_PP2_RXQ_MAX];
                enum pp2_cls_qos_tbl_type mapping_priority;
                uint16_t inqs;
                uint16_t outqs;
                uint8_t default_tc;
                uint8_t use_global_defaults;
+               struct pp2_cls_plcr_params policer_params;
+               uint8_t policer_enable;
        } port[RTE_MAX_ETHPORTS];
 };
 
@@ -98,6 +78,20 @@ int
 mrvl_configure_rxqs(struct mrvl_priv *priv, uint16_t portid,
                    uint16_t max_queues);
 
+/**
+ * Configure TX Queues in a given port.
+ *
+ * Sets up TX queues egress scheduler and limiter.
+ *
+ * @param priv Port's private data
+ * @param portid DPDK port ID
+ * @param max_queues Maximum number of queues to configure.
+ * @returns 0 in case of success, negative value otherwise.
+ */
+int
+mrvl_configure_txqs(struct mrvl_priv *priv, uint16_t portid,
+                   uint16_t max_queues);
+
 /**
  * Start QoS mapping.
  *