New upstream version 18.08

[deb_dpdk.git] / drivers / net / ark / ark_ethdev_tx.c

diff --git a/drivers/net/ark/ark_ethdev_tx.c b/drivers/net/ark/ark_ethdev_tx.c
index 9ae7ae0..57188c2 100644 (file)
--- a/drivers/net/ark/ark_ethdev_tx.c
+++ b/drivers/net/ark/ark_ethdev_tx.c
@@ -1,34 +1,5 @@
-/*-
- * BSD LICENSE
- *
- * Copyright (c) 2015-2017 Atomic Rules LLC
- * 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 copyright holder 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) 2015-2018 Atomic Rules LLC
  */
 
 #include <unistd.h>
@@ -37,7 +8,6 @@
 #include "ark_global.h"
 #include "ark_mpu.h"
 #include "ark_ddm.h"
-#include "ark_ethdev.h"
 #include "ark_logs.h"
 
 #define ARK_TX_META_SIZE   32
@@ -94,7 +64,7 @@ eth_ark_tx_meta_from_mbuf(struct ark_tx_meta *meta,
                          const struct rte_mbuf *mbuf,
                          uint8_t flags)
 {
-       meta->physaddr = rte_mbuf_data_dma_addr(mbuf);
+       meta->physaddr = rte_mbuf_data_iova(mbuf);
        meta->delta_ns = 0;
        meta->data_len = rte_pktmbuf_data_len(mbuf);
        meta->flags = flags;
@@ -311,15 +281,15 @@ eth_ark_tx_queue_setup(struct rte_eth_dev *dev,
 static int
 eth_ark_tx_hw_queue_config(struct ark_tx_queue *queue)
 {
-       phys_addr_t queue_base, ring_base, cons_index_addr;
+       rte_iova_t queue_base, ring_base, cons_index_addr;
        uint32_t write_interval_ns;
 
        /* Verify HW -- MPU */
        if (ark_mpu_verify(queue->mpu, sizeof(struct ark_tx_meta)))
                return -1;
 
-       queue_base = rte_malloc_virt2phy(queue);
-       ring_base = rte_malloc_virt2phy(queue->meta_q);
+       queue_base = rte_malloc_virt2iova(queue);
+       ring_base = rte_malloc_virt2iova(queue->meta_q);
        cons_index_addr =
                queue_base + offsetof(struct ark_tx_queue, cons_index);