From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from wes1-so2.wedos.net (wes1-so2.wedos.net [46.28.106.16]) by dpdk.org (Postfix) with ESMTP id C86496A5B for ; Tue, 14 Jun 2016 15:51:32 +0200 (CEST) Received: from pcviktorin.fit.vutbr.cz (pcviktorin.fit.vutbr.cz [147.229.13.147]) by wes1-so2.wedos.net (Postfix) with ESMTPSA id 3rTWK04J9qzC65; Tue, 14 Jun 2016 15:51:32 +0200 (CEST) From: Jan Viktorin To: dev@dpdk.org Cc: Jan Viktorin , Thomas Monjalon , david.marchand@6wind.com Date: Tue, 14 Jun 2016 15:46:21 +0200 Message-Id: <1465911981-26372-1-git-send-email-viktorin@rehivetech.com> X-Mailer: git-send-email 2.8.0 Subject: [dpdk-dev] [PATCH] app/test: remove rte_pci_dev_ids.h from pci_autotest X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jun 2016 13:51:33 -0000 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 Suggested-by: Thomas Monjalon --- 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 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 - -{ .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 - -{ .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 -- 2.8.0