net/mlx5: fix UAR lock sharing for multiport devices

[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 e4e7c44..4fc4e8f 100644 (file)
--- a/drivers/event/octeontx/ssovf_evdev.c
+++ b/drivers/event/octeontx/ssovf_evdev.c
@@ -20,15 +20,9 @@
 #include "ssovf_evdev.h"
 #include "timvf_evdev.h"
 
-int otx_logtype_ssovf;
 static uint8_t timvf_enable_stats;
 
-RTE_INIT(otx_ssovf_init_log)
-{
-       otx_logtype_ssovf = rte_log_register("pmd.event.octeontx");
-       if (otx_logtype_ssovf >= 0)
-               rte_log_set_level(otx_logtype_ssovf, RTE_LOG_NOTICE);
-}
+RTE_LOG_REGISTER(otx_logtype_ssovf, pmd.event.octeontx, NOTICE);
 
 /* SSOPF Mailbox messages */
 
@@ -77,6 +71,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;
@@ -95,6 +90,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 */
@@ -135,26 +131,6 @@ ssovf_mbox_timeout_ticks(uint64_t ns, uint64_t *tmo_ticks)
        return 0;
 }
 
-static void
-ssovf_fastpath_fns_set(struct rte_eventdev *dev)
-{
-       struct ssovf_evdev *edev = ssovf_pmd_priv(dev);
-
-       dev->enqueue       = ssows_enq;
-       dev->enqueue_burst = ssows_enq_burst;
-       dev->enqueue_new_burst = ssows_enq_new_burst;
-       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;
-               dev->dequeue_burst = ssows_deq_timeout_burst;
-       }
-}
-
 static void
 ssovf_info_get(struct rte_eventdev *dev, struct rte_event_dev_info *dev_info)
 {
@@ -290,6 +266,7 @@ ssovf_port_setup(struct rte_eventdev *dev, uint8_t port_id,
        reg_off |= 1 << 16; /* Wait */
        ws->getwork = ws->base + reg_off;
        ws->port = port_id;
+       ws->lookup_mem = octeontx_fastpath_lookup_mem_get();
 
        for (q = 0; q < edev->nb_event_queues; q++) {
                ws->grps[q] = ssovf_bar(OCTEONTX_SSO_GROUP, q, 2);
@@ -409,6 +386,7 @@ ssovf_eth_rx_adapter_queue_add(const struct rte_eventdev *dev,
 {
        int ret = 0;
        const struct octeontx_nic *nic = eth_dev->data->dev_private;
+       struct ssovf_evdev *edev = ssovf_pmd_priv(dev);
        pki_mod_qos_t pki_qos;
        RTE_SET_USED(dev);
 
@@ -433,7 +411,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;
@@ -445,6 +423,8 @@ ssovf_eth_rx_adapter_queue_add(const struct rte_eventdev *dev,
                ssovf_log_err("failed to modify QOS, port=%d, q=%d",
                                nic->port_id, queue_conf->ev.queue_id);
 
+       edev->rx_offload_flags = nic->rx_offload_flags;
+       edev->tx_offload_flags = nic->tx_offload_flags;
        return ret;
 }
 
@@ -780,6 +760,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);