New upstream version 18.08

[deb_dpdk.git] / test / test / test_cryptodev.h

diff --git a/test/test/test_cryptodev.h b/test/test/test_cryptodev.h
index 4509a09..1bd44dc 100644 (file)
--- a/test/test/test_cryptodev.h
+++ b/test/test/test_cryptodev.h
@@ -1,33 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2015-2017 Intel Corporation. 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) 2015-2017 Intel Corporation
  */
 #ifndef TEST_CRYPTODEV_H_
 #define TEST_CRYPTODEV_H_
@@ -86,8 +58,12 @@
 #define CRYPTODEV_NAME_KASUMI_PMD      crypto_kasumi
 #define CRYPTODEV_NAME_ZUC_PMD         crypto_zuc
 #define CRYPTODEV_NAME_ARMV8_PMD       crypto_armv8
+#define CRYPTODEV_NAME_DPAA_SEC_PMD    crypto_dpaa_sec
 #define CRYPTODEV_NAME_DPAA2_SEC_PMD   crypto_dpaa2_sec
 #define CRYPTODEV_NAME_SCHEDULER_PMD   crypto_scheduler
+#define CRYPTODEV_NAME_MVSAM_PMD               crypto_mvsam
+#define CRYPTODEV_NAME_CCP_PMD         crypto_ccp
+#define CRYPTODEV_NAME_VIRTIO_PMD      crypto_virtio
 
 /**
  * Write (spread) data from buffer to mbuf data
@@ -152,18 +128,18 @@ pktmbuf_mtod_offset(struct rte_mbuf *mbuf, int offset) {
        return rte_pktmbuf_mtod_offset(m, uint8_t *, offset);
 }
 
-static inline phys_addr_t
-pktmbuf_mtophys_offset(struct rte_mbuf *mbuf, int offset) {
+static inline rte_iova_t
+pktmbuf_iova_offset(struct rte_mbuf *mbuf, int offset) {
        struct rte_mbuf *m;
 
        for (m = mbuf; (m != NULL) && (offset > m->data_len); m = m->next)
                offset -= m->data_len;
 
        if (m == NULL) {
-               printf("pktmbuf_mtophys_offset: offset out of buffer\n");
+               printf("pktmbuf_iova_offset: offset out of buffer\n");
                return 0;
        }
-       return rte_pktmbuf_mtophys_offset(m, offset);
+       return rte_pktmbuf_iova_offset(m, offset);
 }
 
 static inline struct rte_mbuf *