event/opdl: fix atomic queue race condition

[dpdk.git] / drivers / event / opdl / opdl_evdev_init.c

diff --git a/drivers/event/opdl/opdl_evdev_init.c b/drivers/event/opdl/opdl_evdev_init.c
index c37d8bc..582ad69 100644 (file)
--- a/drivers/event/opdl/opdl_evdev_init.c
+++ b/drivers/event/opdl/opdl_evdev_init.c
@@ -1,6 +1,5 @@
-/*-
- * SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2014 Intel Corporation
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2017 Intel Corporation
  */
 
 #include <inttypes.h>
@@ -314,8 +313,8 @@ static int opdl_add_deps(struct opdl_evdev *device,
                                             "Stages and dependents"
                                             " are not for same opdl ring",
                                             opdl_pmd_dev_id(device));
-                               for (uint32_t k = 0;
-                                               k < device->nb_opdls; k++) {
+                               uint32_t k;
+                               for (k = 0; k < device->nb_opdls; k++) {
                                        opdl_ring_dump(device->opdl[k],
                                                        stdout);
                                }
@@ -505,8 +504,9 @@ void
 destroy_queues_and_rings(struct rte_eventdev *dev)
 {
        struct opdl_evdev *device = opdl_pmd_priv(dev);
+       uint32_t i;
 
-       for (uint32_t i = 0; i < device->nb_opdls; i++) {
+       for (i = 0; i < device->nb_opdls; i++) {
                if (device->opdl[i])
                        opdl_ring_free(device->opdl[i]);
        }
@@ -639,7 +639,8 @@ create_queues_and_rings(struct rte_eventdev *dev)
                                 OPDL_Q_POS_START,
                                 -1);
 
-               for (uint32_t i = 0; i < device->nb_q_md; i++) {
+               uint32_t i;
+               for (i = 0; i < device->nb_q_md; i++) {
 
                        /* Check */
                        if (!device->q_md[i].setup) {
@@ -702,7 +703,8 @@ initialise_all_other_ports(struct rte_eventdev *dev)
 
        struct opdl_evdev *device = opdl_pmd_priv(dev);
 
-       for (uint32_t i = 0; i < device->nb_ports; i++) {
+       uint32_t i;
+       for (i = 0; i < device->nb_ports; i++) {
                struct opdl_port *port = &device->ports[i];
                struct opdl_queue *queue = &device->queue[port->queue_id];
 
@@ -731,6 +733,9 @@ initialise_all_other_ports(struct rte_eventdev *dev)
                                queue->ports[queue->nb_ports] = port;
                                port->instance_id = queue->nb_ports;
                                queue->nb_ports++;
+                               opdl_stage_set_queue_id(stage_inst,
+                                               port->queue_id);
+
                        } else if (queue->q_pos == OPDL_Q_POS_END) {
 
                                /* tx port  */
@@ -827,7 +832,7 @@ initialise_all_other_ports(struct rte_eventdev *dev)
         * setup the last bit of stage md
         */
        if (!err) {
-               for (uint32_t i = 0; i < device->nb_ports; i++) {
+               for (i = 0; i < device->nb_ports; i++) {
                        struct opdl_port *port = &device->ports[i];
                        struct opdl_queue *queue =
                                &device->queue[port->queue_id];
@@ -872,7 +877,8 @@ initialise_queue_zero_ports(struct rte_eventdev *dev)
        struct opdl_evdev *device = opdl_pmd_priv(dev);
 
        /* Assign queue zero and figure out how many Q0 ports we have */
-       for (uint32_t i = 0; i < device->nb_ports; i++) {
+       uint32_t i;
+       for (i = 0; i < device->nb_ports; i++) {
                struct opdl_port *port = &device->ports[i];
                if (port->queue_id == OPDL_INVALID_QID) {
                        port->queue_id = 0;
@@ -889,7 +895,7 @@ initialise_queue_zero_ports(struct rte_eventdev *dev)
        if (stage_inst) {
 
                /* Assign the new created input stage to all relevant ports */
-               for (uint32_t i = 0; i < device->nb_ports; i++) {
+               for (i = 0; i < device->nb_ports; i++) {
                        struct opdl_port *port = &device->ports[i];
                        if (port->queue_id == 0) {
                                queue = &device->queue[port->queue_id];
@@ -914,8 +920,9 @@ assign_internal_queue_ids(struct rte_eventdev *dev)
 {
        int err = 0;
        struct opdl_evdev *device = opdl_pmd_priv(dev);
+       uint32_t i;
 
-       for (uint32_t i = 0; i < device->nb_ports; i++) {
+       for (i = 0; i < device->nb_ports; i++) {
                struct opdl_port *port = &device->ports[i];
                if (port->external_qid != OPDL_INVALID_QID) {
                        port->queue_id =