net/ice/base: cleanup filter list on error

[dpdk.git] / drivers / event / dlb / dlb.c

diff --git a/drivers/event/dlb/dlb.c b/drivers/event/dlb/dlb.c
index 2bb270d..8b26d1d 100644 (file)
--- a/drivers/event/dlb/dlb.c
+++ b/drivers/event/dlb/dlb.c
@@ -31,7 +31,7 @@
 #include <rte_string_fns.h>
 
 #include <rte_eventdev.h>
-#include <rte_eventdev_pmd.h>
+#include <eventdev_pmd.h>
 
 #include "dlb_priv.h"
 #include "dlb_iface.h"
@@ -1000,7 +1000,6 @@ dlb_hw_create_ldb_port(struct dlb_eventdev *dlb,
        /* The credit window is one high water mark of QEs */
        qm_port->dir_pushcount_at_credit_expiry = 0;
        qm_port->cached_dir_credits = cfg.dir_credit_high_watermark;
-       qm_port->cq_depth = cfg.cq_depth;
        /* CQs with depth < 8 use an 8-entry queue, but withhold credits so
         * the effective depth is smaller.
         */
@@ -1848,7 +1847,7 @@ dlb_hw_create_dir_queue(struct dlb_eventdev *dlb, int32_t qm_port_id)
 {
        struct dlb_hw_dev *handle = &dlb->qm_instance;
        struct dlb_create_dir_queue_args cfg;
-       struct dlb_cmd_response response;
+       struct dlb_cmd_response response = {0};
        int32_t ret;
 
        cfg.response = (uintptr_t)&response;
@@ -3162,6 +3161,7 @@ dlb_dequeue_wait(struct dlb_eventdev *dlb,
                /* Interrupts not supported by PF PMD */
                return 1;
        } else if (dlb->umwait_allowed) {
+               struct rte_power_monitor_cond pmc;
                volatile struct dlb_dequeue_qe *cq_base;
                union {
                        uint64_t raw_qe[2];
@@ -3182,9 +3182,12 @@ dlb_dequeue_wait(struct dlb_eventdev *dlb,
                else
                        expected_value = 0;
 
-               rte_power_monitor(monitor_addr, expected_value,
-                                 qe_mask.raw_qe[1], timeout + start_ticks,
-                                 sizeof(uint64_t));
+               pmc.addr = monitor_addr;
+               pmc.val = expected_value;
+               pmc.mask = qe_mask.raw_qe[1];
+               pmc.size = sizeof(uint64_t);
+
+               rte_power_monitor(&pmc, timeout + start_ticks);
 
                DLB_INC_STAT(ev_port->stats.traffic.rx_umonitor_umwait, 1);
        } else {
@@ -3570,7 +3573,7 @@ dlb_get_ldb_queue_depth(struct dlb_eventdev *dlb,
 {
        struct dlb_hw_dev *handle = &dlb->qm_instance;
        struct dlb_get_ldb_queue_depth_args cfg;
-       struct dlb_cmd_response response;
+       struct dlb_cmd_response response = {0};
        int ret;
 
        cfg.queue_id = queue->qm_queue.id;
@@ -3592,7 +3595,7 @@ dlb_get_dir_queue_depth(struct dlb_eventdev *dlb,
 {
        struct dlb_hw_dev *handle = &dlb->qm_instance;
        struct dlb_get_dir_queue_depth_args cfg;
-       struct dlb_cmd_response response;
+       struct dlb_cmd_response response = {0};
        int ret;
 
        cfg.queue_id = queue->qm_queue.id;