New upstream version 18.02

[deb_dpdk.git] / drivers / net / virtio / virtio_rxtx.h

diff --git a/drivers/net/virtio/virtio_rxtx.h b/drivers/net/virtio/virtio_rxtx.h
index 28f82d6..685cc4f 100644 (file)
--- a/drivers/net/virtio/virtio_rxtx.h
+++ b/drivers/net/virtio/virtio_rxtx.h
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
- *   All rights reserved.
- *
- *   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 Intel Corporation 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(c) 2010-2015 Intel Corporation
  */
 
 #ifndef _VIRTIO_RXTX_H_
@@ -54,7 +25,7 @@ struct virtnet_rx {
        struct rte_mempool *mpool; /**< mempool for mbuf allocation */
 
        uint16_t queue_id;   /**< DPDK queue index. */
-       uint8_t port_id;     /**< Device port identifier. */
+       uint16_t port_id;     /**< Device port identifier. */
 
        /* Statistics */
        struct virtnet_stats stats;
@@ -66,10 +37,10 @@ struct virtnet_tx {
        struct virtqueue *vq;
        /**< memzone to populate hdr. */
        const struct rte_memzone *virtio_net_hdr_mz;
-       phys_addr_t virtio_net_hdr_mem;  /**< hdr for each xmit packet */
+       rte_iova_t virtio_net_hdr_mem;   /**< hdr for each xmit packet */
 
        uint16_t    queue_id;            /**< DPDK queue index. */
-       uint8_t     port_id;             /**< Device port identifier. */
+       uint16_t    port_id;             /**< Device port identifier. */
 
        /* Statistics */
        struct virtnet_stats stats;
@@ -81,14 +52,12 @@ struct virtnet_ctl {
        struct virtqueue *vq;
        /**< memzone to populate hdr. */
        const struct rte_memzone *virtio_net_hdr_mz;
-       phys_addr_t virtio_net_hdr_mem; /**< hdr for each xmit packet */
-       uint8_t port_id;                /**< Device port identifier. */
-       const struct rte_memzone *mz;   /**< mem zone to populate RX ring. */
+       rte_iova_t virtio_net_hdr_mem;  /**< hdr for each xmit packet */
+       uint16_t port_id;               /**< Device port identifier. */
+       const struct rte_memzone *mz;   /**< mem zone to populate CTL ring. */
+       rte_spinlock_t lock;              /**< spinlock for control queue. */
 };
 
 int virtio_rxq_vec_setup(struct virtnet_rx *rxvq);
 
-int virtqueue_enqueue_recv_refill_simple(struct virtqueue *vq,
-       struct rte_mbuf *m);
-
 #endif /* _VIRTIO_RXTX_H_ */