X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_pci.c;h=0ed357e66ed81c7052121da003d9dfe8722a7a60;hb=c7985de0a7f0769d6e4e112b18314aceecf2642c;hp=e834c4d21e97ed9e9fce79b4a4cec530de3ff375;hpb=942405f9e2f2c22aa817be374ccfe939a72df2ce;p=dpdk.git

diff --git a/app/test/test_pci.c b/app/test/test_pci.c
index e834c4d21e..0ed357e66e 100644
--- a/app/test/test_pci.c
+++ b/app/test/test_pci.c
@@ -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_MAPPING 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[] = {
 
@@ -90,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_MAPPING,
+	.drv_flags = 0,
 };
 
 struct rte_pci_driver my_driver2 = {
@@ -142,6 +139,7 @@ static void free_devargs_list(void)
 	while (!TAILQ_EMPTY(&devargs_list)) {
 		devargs = TAILQ_FIRST(&devargs_list);
 		TAILQ_REMOVE(&devargs_list, devargs, next);
+		free(devargs->args);
 		free(devargs);
 	}
 }
@@ -150,15 +148,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(stdout);
-	if (driver_registered == 0) {
-		rte_eal_pci_register(&my_driver);
-		rte_eal_pci_register(&my_driver2);
-		driver_registered = 1;
+
+	/* 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();
@@ -187,11 +192,13 @@ 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;
 }