net/virtio: allocate vrings on device NUMA node

[dpdk.git] / drivers / net / mlx4 / mlx4_intr.c

diff --git a/drivers/net/mlx4/mlx4_intr.c b/drivers/net/mlx4/mlx4_intr.c
index e522949..eeb982a 100644 (file)
--- a/drivers/net/mlx4/mlx4_intr.c
+++ b/drivers/net/mlx4/mlx4_intr.c
@@ -1,34 +1,6 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright 2017 6WIND S.A.
- *   Copyright 2017 Mellanox
- *
- *   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 6WIND S.A. 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 2017 6WIND S.A.
+ * Copyright 2017 Mellanox Technologies, Ltd
  */
 
 /**
@@ -57,6 +29,7 @@
 #include <rte_interrupts.h>
 
 #include "mlx4.h"
+#include "mlx4_glue.h"
 #include "mlx4_rxtx.h"
 #include "mlx4_utils.h"
 
@@ -216,7 +189,7 @@ mlx4_interrupt_handler(struct priv *priv)
        unsigned int i;
 
        /* Read all message and acknowledge them. */
-       while (!ibv_get_async_event(priv->ctx, &event)) {
+       while (!mlx4_glue->get_async_event(priv->ctx, &event)) {
                switch (event.event_type) {
                case IBV_EVENT_PORT_ACTIVE:
                case IBV_EVENT_PORT_ERR:
@@ -231,7 +204,7 @@ mlx4_interrupt_handler(struct priv *priv)
                        DEBUG("event type %d on physical port %d not handled",
                              event.event_type, event.element.port_num);
                }
-               ibv_ack_async_event(&event);
+               mlx4_glue->ack_async_event(&event);
        }
        for (i = 0; i != RTE_DIM(caught); ++i)
                if (caught[i])
@@ -352,7 +325,8 @@ mlx4_rx_intr_disable(struct rte_eth_dev *dev, uint16_t idx)
        if (!rxq || !rxq->channel) {
                ret = EINVAL;
        } else {
-               ret = ibv_get_cq_event(rxq->cq->channel, &ev_cq, &ev_ctx);
+               ret = mlx4_glue->get_cq_event(rxq->cq->channel, &ev_cq,
+                                             &ev_ctx);
                if (ret || ev_cq != rxq->cq)
                        ret = EINVAL;
        }
@@ -362,7 +336,7 @@ mlx4_rx_intr_disable(struct rte_eth_dev *dev, uint16_t idx)
                     idx);
        } else {
                rxq->mcq.arm_sn++;
-               ibv_ack_cq_events(rxq->cq, 1);
+               mlx4_glue->ack_cq_events(rxq->cq, 1);
        }
        return -ret;
 }