X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_pci.c;h=5530d9974a3c10456192e0ddd94b0be516cb6c0b;hb=1b306359e58cb7b90c7d4130a9e74ab5c340298a;hp=445cf57fb12473fcf98afa6e3febf1e5cfdff3fd;hpb=12204589517e06230e24e0f23396222f2929bd77;p=dpdk.git

diff --git a/app/test/test_pci.c b/app/test/test_pci.c
index 445cf57fb1..5530d9974a 100644
--- a/app/test/test_pci.c
+++ b/app/test/test_pci.c
@@ -1,14 +1,14 @@
 /*-
  *   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
@@ -18,7 +18,7 @@
  *     * 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
@@ -39,10 +39,13 @@
 
 #include <rte_interrupts.h>
 #include <rte_pci.h>
+#include <rte_ethdev.h>
 #include <rte_devargs.h>
 
 #include "test.h"
 
+/* Generic maximum number of drivers to have room to allocate all drivers */
+#define NUM_MAX_DRIVERS 256
 
 /*
  * PCI test
@@ -57,16 +60,10 @@
 
 int test_pci_run = 0; /* value checked by the multiprocess test */
 static unsigned pci_dev_count;
-static unsigned driver_registered = 0;
 
 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[] = {
 
@@ -81,7 +78,6 @@ struct rte_pci_id my_driver_id2[] = {
 /* 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 */ },
@@ -91,7 +87,7 @@ struct rte_pci_driver my_driver = {
 	.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 = {
@@ -143,6 +139,8 @@ static void free_devargs_list(void)
 	while (!TAILQ_EMPTY(&devargs_list)) {
 		devargs = TAILQ_FIRST(&devargs_list);
 		TAILQ_REMOVE(&devargs_list, devargs, next);
+		if (devargs->args)
+			free(devargs->args);
 		free(devargs);
 	}
 }
@@ -151,15 +149,22 @@ 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();
@@ -188,11 +193,19 @@ test_pci(void)
 	}
 
 	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);