common/octeontx: update mbox to version 1.1.3

[dpdk.git] / drivers / event / octeontx / ssovf_evdev.c

diff --git a/drivers/event/octeontx/ssovf_evdev.c b/drivers/event/octeontx/ssovf_evdev.c
index 34496f1..f9e9324 100644 (file)
--- a/drivers/event/octeontx/ssovf_evdev.c
+++ b/drivers/event/octeontx/ssovf_evdev.c
@@ -21,10 +21,9 @@
 #include "timvf_evdev.h"
 
 int otx_logtype_ssovf;
+static uint8_t timvf_enable_stats;
 
-RTE_INIT(otx_ssovf_init_log);
-static void
-otx_ssovf_init_log(void)
+RTE_INIT(otx_ssovf_init_log)
 {
        otx_logtype_ssovf = rte_log_register("pmd.event.octeontx");
        if (otx_logtype_ssovf >= 0)
@@ -78,6 +77,7 @@ ssovf_mbox_getwork_tmo_set(uint32_t timeout_ns)
 }
 
 struct ssovf_mbox_grp_pri {
+       uint8_t vhgrp_id;
        uint8_t wgt_left; /* Read only */
        uint8_t weight;
        uint8_t affinity;
@@ -96,6 +96,7 @@ ssovf_mbox_priority_set(uint8_t queue, uint8_t prio)
        hdr.msg = SSO_GRP_SET_PRIORITY;
        hdr.vfid = queue;
 
+       grp.vhgrp_id = queue;
        grp.weight = 0xff;
        grp.affinity = 0xff;
        grp.priority = prio / 32; /* Normalize to 0 to 7 */
@@ -147,6 +148,8 @@ ssovf_fastpath_fns_set(struct rte_eventdev *dev)
        dev->enqueue_forward_burst = ssows_enq_fwd_burst;
        dev->dequeue       = ssows_deq;
        dev->dequeue_burst = ssows_deq_burst;
+       dev->txa_enqueue = sso_event_tx_adapter_enqueue;
+       dev->txa_enqueue_same_dest = dev->txa_enqueue;
 
        if (edev->is_timeout_deq) {
                dev->dequeue       = ssows_deq_timeout;
@@ -432,7 +435,7 @@ ssovf_eth_rx_adapter_queue_add(const struct rte_eventdev *dev,
        pki_qos.mmask.f_grptag_ok = 1;
        pki_qos.mmask.f_grptag_bad = 1;
 
-       pki_qos.tag_type = queue_conf->ev.sched_type;
+       pki_qos.qos_entry.tag_type = queue_conf->ev.sched_type;
        pki_qos.qos_entry.port_add = 0;
        pki_qos.qos_entry.ggrp_ok = queue_conf->ev.queue_id;
        pki_qos.qos_entry.ggrp_bad = queue_conf->ev.queue_id;
@@ -455,7 +458,6 @@ ssovf_eth_rx_adapter_queue_del(const struct rte_eventdev *dev,
        const struct octeontx_nic *nic = eth_dev->data->dev_private;
        pki_del_qos_t pki_qos;
        RTE_SET_USED(dev);
-       RTE_SET_USED(rx_queue_id);
 
        ret = strncmp(eth_dev->data->name, "eth_octeontx", 12);
        if (ret)
@@ -467,7 +469,7 @@ ssovf_eth_rx_adapter_queue_del(const struct rte_eventdev *dev,
        ret = octeontx_pki_port_delete_qos(nic->port_id, &pki_qos);
        if (ret < 0)
                ssovf_log_err("Failed to delete QOS port=%d, q=%d",
-                               nic->port_id, queue_conf->ev.queue_id);
+                               nic->port_id, rx_queue_id);
        return ret;
 }
 
@@ -475,14 +477,9 @@ static int
 ssovf_eth_rx_adapter_start(const struct rte_eventdev *dev,
                                        const struct rte_eth_dev *eth_dev)
 {
-       int ret;
-       const struct octeontx_nic *nic = eth_dev->data->dev_private;
        RTE_SET_USED(dev);
+       RTE_SET_USED(eth_dev);
 
-       ret = strncmp(eth_dev->data->name, "eth_octeontx", 12);
-       if (ret)
-               return 0;
-       octeontx_pki_port_start(nic->port_id);
        return 0;
 }
 
@@ -490,18 +487,84 @@ ssovf_eth_rx_adapter_start(const struct rte_eventdev *dev,
 static int
 ssovf_eth_rx_adapter_stop(const struct rte_eventdev *dev,
                const struct rte_eth_dev *eth_dev)
+{
+       RTE_SET_USED(dev);
+       RTE_SET_USED(eth_dev);
+
+       return 0;
+}
+
+static int
+ssovf_eth_tx_adapter_caps_get(const struct rte_eventdev *dev,
+               const struct rte_eth_dev *eth_dev, uint32_t *caps)
 {
        int ret;
-       const struct octeontx_nic *nic = eth_dev->data->dev_private;
        RTE_SET_USED(dev);
 
        ret = strncmp(eth_dev->data->name, "eth_octeontx", 12);
        if (ret)
-               return 0;
-       octeontx_pki_port_stop(nic->port_id);
+               *caps = 0;
+       else
+               *caps = RTE_EVENT_ETH_TX_ADAPTER_CAP_INTERNAL_PORT;
+
+       return 0;
+}
+
+static int
+ssovf_eth_tx_adapter_create(uint8_t id, const struct rte_eventdev *dev)
+{
+       RTE_SET_USED(id);
+       RTE_SET_USED(dev);
+       return 0;
+}
+
+static int
+ssovf_eth_tx_adapter_free(uint8_t id, const struct rte_eventdev *dev)
+{
+       RTE_SET_USED(id);
+       RTE_SET_USED(dev);
        return 0;
 }
 
+static int
+ssovf_eth_tx_adapter_queue_add(uint8_t id, const struct rte_eventdev *dev,
+               const struct rte_eth_dev *eth_dev, int32_t tx_queue_id)
+{
+       RTE_SET_USED(id);
+       RTE_SET_USED(dev);
+       RTE_SET_USED(eth_dev);
+       RTE_SET_USED(tx_queue_id);
+       return 0;
+}
+
+static int
+ssovf_eth_tx_adapter_queue_del(uint8_t id, const struct rte_eventdev *dev,
+               const struct rte_eth_dev *eth_dev, int32_t tx_queue_id)
+{
+       RTE_SET_USED(id);
+       RTE_SET_USED(dev);
+       RTE_SET_USED(eth_dev);
+       RTE_SET_USED(tx_queue_id);
+       return 0;
+}
+
+static int
+ssovf_eth_tx_adapter_start(uint8_t id, const struct rte_eventdev *dev)
+{
+       RTE_SET_USED(id);
+       RTE_SET_USED(dev);
+       return 0;
+}
+
+static int
+ssovf_eth_tx_adapter_stop(uint8_t id, const struct rte_eventdev *dev)
+{
+       RTE_SET_USED(id);
+       RTE_SET_USED(dev);
+       return 0;
+}
+
+
 static void
 ssovf_dump(struct rte_eventdev *dev, FILE *f)
 {
@@ -606,7 +669,8 @@ static int
 ssovf_timvf_caps_get(const struct rte_eventdev *dev, uint64_t flags,
                uint32_t *caps, const struct rte_event_timer_adapter_ops **ops)
 {
-       return timvf_timer_adapter_caps_get(dev, flags, caps, ops, 0);
+       return timvf_timer_adapter_caps_get(dev, flags, caps, ops,
+                       timvf_enable_stats);
 }
 
 /* Initialize and register event driver with DPDK Application */
@@ -629,6 +693,14 @@ static struct rte_eventdev_ops ssovf_ops = {
        .eth_rx_adapter_start = ssovf_eth_rx_adapter_start,
        .eth_rx_adapter_stop = ssovf_eth_rx_adapter_stop,
 
+       .eth_tx_adapter_caps_get = ssovf_eth_tx_adapter_caps_get,
+       .eth_tx_adapter_create = ssovf_eth_tx_adapter_create,
+       .eth_tx_adapter_free = ssovf_eth_tx_adapter_free,
+       .eth_tx_adapter_queue_add = ssovf_eth_tx_adapter_queue_add,
+       .eth_tx_adapter_queue_del = ssovf_eth_tx_adapter_queue_del,
+       .eth_tx_adapter_start = ssovf_eth_tx_adapter_start,
+       .eth_tx_adapter_stop = ssovf_eth_tx_adapter_stop,
+
        .timer_adapter_caps_get = ssovf_timvf_caps_get,
 
        .dev_selftest = test_eventdev_octeontx,
@@ -654,6 +726,7 @@ ssovf_vdev_probe(struct rte_vdev_device *vdev)
 
        static const char *const args[] = {
                SSOVF_SELFTEST_ARG,
+               TIMVF_ENABLE_STATS_ARG,
                NULL
        };
 
@@ -681,6 +754,15 @@ ssovf_vdev_probe(struct rte_vdev_device *vdev)
                                rte_kvargs_free(kvlist);
                                return ret;
                        }
+
+                       ret = rte_kvargs_process(kvlist,
+                                       TIMVF_ENABLE_STATS_ARG,
+                                       ssovf_selftest, &timvf_enable_stats);
+                       if (ret != 0) {
+                               ssovf_log_err("%s: Error in timvf stats", name);
+                               rte_kvargs_free(kvlist);
+                               return ret;
+                       }
                }
 
                rte_kvargs_free(kvlist);
@@ -700,6 +782,7 @@ ssovf_vdev_probe(struct rte_vdev_device *vdev)
                return 0;
        }
 
+       octeontx_mbox_init();
        ret = ssovf_info(&oinfo);
        if (ret) {
                ssovf_log_err("Failed to probe and validate ssovfs %d", ret);