/*-
* BSD LICENSE
*
- * Copyright(c) 2010-2012 Intel Corporation. All rights reserved.
+ * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2014 6WIND S.A.
* All rights reserved.
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
+ * 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
+ * * 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
+ * * 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
+ * * 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
+ * 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.
- *
*/
#include <stdio.h>
#include <stdint.h>
#include <sys/queue.h>
-#include <cmdline_parse.h>
-
#include <rte_interrupts.h>
#include <rte_pci.h>
+#include <rte_devargs.h>
#include "test.h"
-#define RTE_PCI_DEV_ID_DECL(vend, dev) {RTE_PCI_DEVICE(vend, dev)},
-
-#define TEST_BLACKLIST_NUM 0x100
/*
* PCI test
int test_pci_run = 0; /* value checked by the multiprocess test */
static unsigned pci_dev_count;
static unsigned driver_registered = 0;
-static struct rte_pci_addr blacklist[TEST_BLACKLIST_NUM];
static int my_driver_init(struct rte_pci_driver *dr,
struct rte_pci_device *dev);
* drivers are created (one with IGB devices, the other with IXGBE devices).
*/
-/* IXGBE NICS + e1000 used for Qemu */
-#define RTE_LIBRTE_IXGBE_PMD 1
-#undef RTE_LIBRTE_IGB_PMD
+/* IXGBE NICS */
struct rte_pci_id my_driver_id[] = {
+#define RTE_PCI_DEV_ID_DECL_IXGBE(vend, dev) {RTE_PCI_DEVICE(vend, dev)},
#include <rte_pci_dev_ids.h>
-/* this device is the e1000 of qemu for testing */
-{RTE_PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x100E)},
-
{ .vendor_id = 0, /* sentinel */ },
};
struct rte_pci_id my_driver_id2[] = {
-/* IGB NICS */
-#undef RTE_LIBRTE_IXGBE_PMD
-#define RTE_LIBRTE_IGB_PMD 1
+/* IGB & EM NICS */
+#define RTE_PCI_DEV_ID_DECL_EM(vend, dev) {RTE_PCI_DEVICE(vend, dev)},
+#define RTE_PCI_DEV_ID_DECL_IGB(vend, dev) {RTE_PCI_DEVICE(vend, dev)},
#define RTE_PCI_DEV_USE_82575EB_COPPER
#include <rte_pci_dev_ids.h>
return 0;
}
-static void
-blacklist_clear(void)
-{
- rte_eal_pci_set_blacklist(NULL, 0);
-}
-
-
-
static void
blacklist_all_devices(void)
{
struct rte_pci_device *dev = NULL;
- unsigned idx = 0;
-
- memset(blacklist, 0, sizeof (blacklist));
-
- TAILQ_FOREACH(dev, &device_list, next) {
- if (idx >= sizeof (blacklist) / sizeof (blacklist[0])) {
- printf("Error: too many devices to blacklist");
+ unsigned i = 0;
+ char pci_addr_str[16];
+
+ TAILQ_FOREACH(dev, &pci_device_list, next) {
+ snprintf(pci_addr_str, sizeof(pci_addr_str), PCI_PRI_FMT,
+ dev->addr.domain, dev->addr.bus, dev->addr.devid,
+ dev->addr.function);
+ if (rte_eal_devargs_add(RTE_DEVTYPE_BLACKLISTED_PCI,
+ pci_addr_str) < 0) {
+ printf("Error: cannot blacklist <%s>", pci_addr_str);
break;
}
- blacklist[idx] = dev->addr;
- ++idx;
+ i++;
}
+ printf("%u devices blacklisted\n", i);
+}
+
+/* clear devargs list that was modified by the test */
+static void free_devargs_list(void)
+{
+ struct rte_devargs *devargs;
- rte_eal_pci_set_blacklist(blacklist, idx);
- printf("%u devices blacklisted\n", idx);
+ while (!TAILQ_EMPTY(&devargs_list)) {
+ devargs = TAILQ_FIRST(&devargs_list);
+ TAILQ_REMOVE(&devargs_list, devargs, next);
+ free(devargs);
+ }
}
int
test_pci(void)
{
+ struct rte_devargs_list save_devargs_list;
printf("Dump all devices\n");
- rte_eal_pci_dump();
+ rte_eal_pci_dump(stdout);
if (driver_registered == 0) {
rte_eal_pci_register(&my_driver);
rte_eal_pci_register(&my_driver2);
return -1;
}
+ /* save the real devargs_list */
+ save_devargs_list = devargs_list;
+ TAILQ_INIT(&devargs_list);
+
blacklist_all_devices();
pci_dev_count = 0;
printf("Scan bus with all devices blacklisted\n");
rte_eal_pci_probe();
- blacklist_clear();
+ free_devargs_list();
+ devargs_list = save_devargs_list;
if (pci_dev_count != 0) {
printf("not all devices are blacklisted\n");
}
test_pci_run = 1;
+ if (driver_registered == 1) {
+ rte_eal_pci_unregister(&my_driver);
+ rte_eal_pci_unregister(&my_driver2);
+ driver_registered = 0;
+ }
+
return 0;
}