/*-
* BSD LICENSE
- *
+ *
* 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
* 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
* * 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
#include <rte_interrupts.h>
#include <rte_pci.h>
+#include <rte_ethdev.h>
+#include <rte_devargs.h>
#include "test.h"
-
-#define TEST_BLACKLIST_NUM 0x100
+/* Generic maximum number of drivers to have room to allocate all drivers */
+#define NUM_MAX_DRIVERS 256
/*
* 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);
-/*
- * To test cases where RTE_PCI_DRV_NEED_IGB_UIO is set, and isn't set, two
- * drivers are created (one with IGB devices, the other with IXGBE devices).
- */
-
/* IXGBE NICS */
struct rte_pci_id my_driver_id[] = {
/* 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>
{ .vendor_id = 0, /* sentinel */ },
.name = "test_driver",
.devinit = my_driver_init,
.id_table = my_driver_id,
- .drv_flags = RTE_PCI_DRV_NEED_IGB_UIO,
+ .drv_flags = 0,
};
struct rte_pci_driver my_driver2 = {
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);
+}
- rte_eal_pci_set_blacklist(blacklist, idx);
- printf("%u devices blacklisted\n", idx);
+/* clear devargs list that was modified by the test */
+static void free_devargs_list(void)
+{
+ struct rte_devargs *devargs;
+
+ while (!TAILQ_EMPTY(&devargs_list)) {
+ devargs = TAILQ_FIRST(&devargs_list);
+ TAILQ_REMOVE(&devargs_list, devargs, next);
+ if (devargs->args)
+ free(devargs->args);
+ free(devargs);
+ }
}
int
test_pci(void)
{
+ struct rte_devargs_list save_devargs_list;
+ struct rte_pci_driver *dr = NULL;
+ struct rte_pci_driver *save_pci_driver_list[NUM_MAX_DRIVERS];
+ unsigned i, num_drivers = 0;
printf("Dump all devices\n");
- rte_eal_pci_dump();
- if (driver_registered == 0) {
- rte_eal_pci_register(&my_driver);
- rte_eal_pci_register(&my_driver2);
- driver_registered = 1;
+ rte_eal_pci_dump(stdout);
+
+ /* Unregister all previous drivers */
+ TAILQ_FOREACH(dr, &pci_driver_list, next) {
+ rte_eal_pci_unregister(dr);
+ save_pci_driver_list[num_drivers++] = dr;
}
+ rte_eal_pci_register(&my_driver);
+ rte_eal_pci_register(&my_driver2);
+
pci_dev_count = 0;
printf("Scan bus\n");
rte_eal_pci_probe();
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;
- }
+
+ rte_eal_pci_unregister(&my_driver);
+ rte_eal_pci_unregister(&my_driver2);
+
+ /* Restore original driver list */
+ for (i = 0; i < num_drivers; i++)
+ rte_eal_pci_register(save_pci_driver_list[i]);
return 0;
}
+
+static struct test_command pci_cmd = {
+ .command = "pci_autotest",
+ .callback = test_pci,
+};
+REGISTER_TEST_COMMAND(pci_cmd);