update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / spdk / dpdk / app / test / test_eventdev.c

diff --git a/ceph/src/spdk/dpdk/app/test/test_eventdev.c b/ceph/src/spdk/dpdk/app/test/test_eventdev.c
index 00d73275c8660dc8738d3f67ce6dd49d25609586..43ccb1ce9788ec802ae8b85b7fae38c57408afb3 100644 (file)
--- a/ceph/src/spdk/dpdk/app/test/test_eventdev.c
+++ b/ceph/src/spdk/dpdk/app/test/test_eventdev.c
@@ -996,7 +996,13 @@ test_eventdev_common(void)
 static int
 test_eventdev_selftest_impl(const char *pmd, const char *opts)
 {
-       rte_vdev_init(pmd, opts);
+       int ret = 0;
+
+       if (rte_event_dev_get_dev_id(pmd) == -ENODEV)
+               ret = rte_vdev_init(pmd, opts);
+       if (ret)
+               return TEST_SKIPPED;
+
        return rte_event_dev_selftest(rte_event_dev_get_dev_id(pmd));
 }
 
@@ -1012,7 +1018,22 @@ test_eventdev_selftest_octeontx(void)
        return test_eventdev_selftest_impl("event_octeontx", "");
 }
 
+static int
+test_eventdev_selftest_octeontx2(void)
+{
+       return test_eventdev_selftest_impl("event_octeontx2", "");
+}
+
+static int
+test_eventdev_selftest_dpaa2(void)
+{
+       return test_eventdev_selftest_impl("event_dpaa2", "");
+}
+
 REGISTER_TEST_COMMAND(eventdev_common_autotest, test_eventdev_common);
 REGISTER_TEST_COMMAND(eventdev_selftest_sw, test_eventdev_selftest_sw);
 REGISTER_TEST_COMMAND(eventdev_selftest_octeontx,
                test_eventdev_selftest_octeontx);
+REGISTER_TEST_COMMAND(eventdev_selftest_octeontx2,
+               test_eventdev_selftest_octeontx2);
+REGISTER_TEST_COMMAND(eventdev_selftest_dpaa2, test_eventdev_selftest_dpaa2);