diff mbox

[dpdk-dev] app/test: remove rte_pci_dev_ids.h from pci_autotest

Message ID 1465911981-26372-1-git-send-email-viktorin@rehivetech.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers

Commit Message

Jan Viktorin June 14, 2016, 1:46 p.m. UTC 
  There are 2 new fake devices for testing PCI infra. All the fake devices
are now identified by non-existing vendor and device IDs so there is no
real driver to bind to them. The testing drivers match those IDs.

Signed-off-by: Jan Viktorin <viktorin@rehivetech.com>
Suggested-by: Thomas Monjalon <thomas.monjalon@6wind.com>
---
 app/test/test_pci.c                                     | 17 +++++------------
 .../test_pci_sysfs/bus/pci/devices/0000:01:00.0/device  |  2 +-
 .../bus/pci/devices/0000:01:00.0/subsystem_vendor       |  2 +-
 .../test_pci_sysfs/bus/pci/devices/0000:01:00.0/vendor  |  2 +-
 .../test_pci_sysfs/bus/pci/devices/0000:01:02.0/device  |  1 +
 .../bus/pci/devices/0000:01:02.0/resource               | 13 +++++++++++++
 .../bus/pci/devices/0000:01:02.0/subsystem_device       |  1 +
 .../bus/pci/devices/0000:01:02.0/subsystem_vendor       |  1 +
 .../test_pci_sysfs/bus/pci/devices/0000:01:02.0/vendor  |  1 +
 .../test_pci_sysfs/bus/pci/devices/0000:02:ab.0/device  |  1 +
 .../bus/pci/devices/0000:02:ab.0/resource               | 13 +++++++++++++
 .../bus/pci/devices/0000:02:ab.0/subsystem_device       |  1 +
 .../bus/pci/devices/0000:02:ab.0/subsystem_vendor       |  1 +
 .../test_pci_sysfs/bus/pci/devices/0000:02:ab.0/vendor  |  1 +
 14 files changed, 42 insertions(+), 15 deletions(-)
 create mode 100644 app/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/device
 create mode 100644 app/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/resource
 create mode 100644 app/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/subsystem_device
 create mode 100644 app/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/subsystem_vendor
 create mode 100644 app/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/vendor
 create mode 100644 app/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/device
 create mode 100644 app/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/resource
 create mode 100644 app/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/subsystem_device
 create mode 100644 app/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/subsystem_vendor
 create mode 100644 app/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/vendor

Comments

Thomas Monjalon June 14, 2016, 2:08 p.m. UTC | #1 
2016-06-14 15:46, Jan Viktorin:
> There are 2 new fake devices for testing PCI infra. All the fake devices
> are now identified by non-existing vendor and device IDs so there is no
> real driver to bind to them. The testing drivers match those IDs.

Why not removing the existing sysfs entries faking real devices?
Thanks
Jan Viktorin June 15, 2016, 9:51 a.m. UTC | #2 
On Tue, 14 Jun 2016 16:08:42 +0200
Thomas Monjalon <thomas.monjalon@6wind.com> wrote:

> 2016-06-14 15:46, Jan Viktorin:
> > There are 2 new fake devices for testing PCI infra. All the fake devices

s/All the fake/All 3 fake/

> > are now identified by non-existing vendor and device IDs so there is no
> > real driver to bind to them. The testing drivers match those IDs.  
> 
> Why not removing the existing sysfs entries faking real devices?

There is no reason to remove anything. All 3 devices are fakes. The original
one was changed to have fake IDs.

Is it more clear now?

Jan

> Thanks
Thomas Monjalon June 15, 2016, 1:54 p.m. UTC | #3 
2016-06-15 11:51, Jan Viktorin:
> On Tue, 14 Jun 2016 16:08:42 +0200
> Thomas Monjalon <thomas.monjalon@6wind.com> wrote:
> 
> > 2016-06-14 15:46, Jan Viktorin:
> > > There are 2 new fake devices for testing PCI infra. All the fake devices
> 
> s/All the fake/All 3 fake/
> 
> > > are now identified by non-existing vendor and device IDs so there is no
> > > real driver to bind to them. The testing drivers match those IDs.  
> > 
> > Why not removing the existing sysfs entries faking real devices?
> 
> There is no reason to remove anything. All 3 devices are fakes. The original
> one was changed to have fake IDs.
> 
> Is it more clear now?

Got it.

Applied, thanks
diff mbox

Patch

diff --git a/app/test/test_pci.c b/app/test/test_pci.c
index 8051e53..354a0ad 100644
--- a/app/test/test_pci.c
+++ b/app/test/test_pci.c
@@ -67,21 +67,14 @@  static int my_driver_init(struct rte_pci_driver *dr,
 
 /* 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>
-
-{ .vendor_id = 0, /* sentinel */ },
+	{RTE_PCI_DEVICE(0x0001, 0x1234)},
+	{ .vendor_id = 0, /* sentinel */ },
 };
 
 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)},
-#include <rte_pci_dev_ids.h>
-
-{ .vendor_id = 0, /* sentinel */ },
+	{RTE_PCI_DEVICE(0x0001, 0x4444)},
+	{RTE_PCI_DEVICE(0x0002, 0xabcd)},
+	{ .vendor_id = 0, /* sentinel */ },
 };
 
 struct rte_pci_driver my_driver = {
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/device b/app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/device
index 9e4789e..48a6290 100644
--- a/app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/device
+++ b/app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/device
@@ -1 +1 @@ 
-0x10fb
+0x1234
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/subsystem_vendor b/app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/subsystem_vendor
index ce6dc4d..446afb4 100644
--- a/app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/subsystem_vendor
+++ b/app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/subsystem_vendor
@@ -1 +1 @@ 
-0x8086
+0x0001
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/vendor b/app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/vendor
index ce6dc4d..446afb4 100644
--- a/app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/vendor
+++ b/app/test/test_pci_sysfs/bus/pci/devices/0000:01:00.0/vendor
@@ -1 +1 @@ 
-0x8086
+0x0001
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/device b/app/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/device
new file mode 100644
index 0000000..f61bbe6
--- /dev/null
+++ b/app/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/device
@@ -0,0 +1 @@ 
+0xabcd
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/resource b/app/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/resource
new file mode 100644
index 0000000..f388929
--- /dev/null
+++ b/app/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/resource
@@ -0,0 +1,13 @@ 
+0x00000000d0080000 0x00000000d00fffff 0x000000000014220c
+0x0000000000000000 0x0000000000000000 0x0000000000000000
+0x000000000000e020 0x000000000000e03f 0x0000000000040101
+0x0000000000000000 0x0000000000000000 0x0000000000000000
+0x00000000d0104000 0x00000000d0107fff 0x000000000014220c
+0x0000000000000000 0x0000000000000000 0x0000000000000000
+0x0000000000000000 0x0000000000000000 0x0000000000000000
+0x00000000ab000000 0x00000000ab0fffff 0x0000000000140204
+0x0000000000000000 0x0000000000000000 0x0000000000000000
+0x0000000000000000 0x0000000000000000 0x0000000000000000
+0x00000000ab100000 0x00000000ab1fffff 0x0000000000140204
+0x0000000000000000 0x0000000000000000 0x0000000000000000
+0x0000000000000000 0x0000000000000000 0x0000000000000000
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/subsystem_device b/app/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/subsystem_device
new file mode 100644
index 0000000..f61bbe6
--- /dev/null
+++ b/app/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/subsystem_device
@@ -0,0 +1 @@ 
+0xabcd
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/subsystem_vendor b/app/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/subsystem_vendor
new file mode 100644
index 0000000..4321b81
--- /dev/null
+++ b/app/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/subsystem_vendor
@@ -0,0 +1 @@ 
+0x0002
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/vendor b/app/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/vendor
new file mode 100644
index 0000000..4321b81
--- /dev/null
+++ b/app/test/test_pci_sysfs/bus/pci/devices/0000:01:02.0/vendor
@@ -0,0 +1 @@ 
+0x0002
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/device b/app/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/device
new file mode 100644
index 0000000..ccaa498
--- /dev/null
+++ b/app/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/device
@@ -0,0 +1 @@ 
+0x4444
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/resource b/app/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/resource
new file mode 100644
index 0000000..f388929
--- /dev/null
+++ b/app/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/resource
@@ -0,0 +1,13 @@ 
+0x00000000d0080000 0x00000000d00fffff 0x000000000014220c
+0x0000000000000000 0x0000000000000000 0x0000000000000000
+0x000000000000e020 0x000000000000e03f 0x0000000000040101
+0x0000000000000000 0x0000000000000000 0x0000000000000000
+0x00000000d0104000 0x00000000d0107fff 0x000000000014220c
+0x0000000000000000 0x0000000000000000 0x0000000000000000
+0x0000000000000000 0x0000000000000000 0x0000000000000000
+0x00000000ab000000 0x00000000ab0fffff 0x0000000000140204
+0x0000000000000000 0x0000000000000000 0x0000000000000000
+0x0000000000000000 0x0000000000000000 0x0000000000000000
+0x00000000ab100000 0x00000000ab1fffff 0x0000000000140204
+0x0000000000000000 0x0000000000000000 0x0000000000000000
+0x0000000000000000 0x0000000000000000 0x0000000000000000
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/subsystem_device b/app/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/subsystem_device
new file mode 100644
index 0000000..ccaa498
--- /dev/null
+++ b/app/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/subsystem_device
@@ -0,0 +1 @@ 
+0x4444
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/subsystem_vendor b/app/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/subsystem_vendor
new file mode 100644
index 0000000..446afb4
--- /dev/null
+++ b/app/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/subsystem_vendor
@@ -0,0 +1 @@ 
+0x0001
diff --git a/app/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/vendor b/app/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/vendor
new file mode 100644
index 0000000..446afb4
--- /dev/null
+++ b/app/test/test_pci_sysfs/bus/pci/devices/0000:02:ab.0/vendor
@@ -0,0 +1 @@ 
+0x0001