diff options
| author |   Damjan Marion <damarion@cisco.com> | 2016-05-12 22:11:03 +0200 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2016-05-18 13:13:27 +0000 |
| commit | 5a206eafdbf9370fead2dd26fcab09e7ff5544c4 (patch) | |
| tree | 847c6322c640fafd3a1c40e691bc8b21a7f07009 /vnet | |
| parent | a2a48305df2dbcf3a930c2cd266754e2519d038e (diff) | |
Rework of the old PCI code
* adds support for VPP native PCI drivers using
standard uio_pci_generic kernel driver
* adds generic PCI interrupt callback
* splits code to generic PCI handling and linux specific
* adds new debug cli 'show pci [all]'
Change-Id: I447c2285e319e9725d70688c1b70c9dedda51fdc
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'vnet')
| -rw-r--r-- | vnet/vnet/devices/dpdk/init.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/vnet/vnet/devices/dpdk/init.c b/vnet/vnet/devices/dpdk/init.c index 121b2ce635c..63fa4c07e5f 100644 --- a/vnet/vnet/devices/dpdk/init.c +++ b/vnet/vnet/devices/dpdk/init.c @@ -22,7 +22,6 @@ #include <vnet/devices/dpdk/dpdk.h> #include <vlib/unix/physmem.h> #include <vlib/pci/pci.h> -#include <vlib/unix/pci.h> #include <stdio.h> #include <stdlib.h> @@ -744,7 +743,7 @@ dpdk_lib_init (dpdk_main_t * dm) static void dpdk_bind_devices_to_uio (dpdk_main_t * dm) { - linux_pci_main_t * pm = &linux_pci_main; + vlib_pci_main_t * pm = &pci_main; clib_error_t * error; vlib_pci_device_t * d; pci_config_header_t * c; @@ -1050,7 +1049,7 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) page_size = 1024; pages_avail = 0; s = format (s, path, page_size * 1024, 0); - read_sys_fs ((char *) s, "%u", &pages_avail); + vlib_sysfs_read ((char *) s, "%u", &pages_avail); vec_reset_length (s); if (page_size * pages_avail < mem) @@ -1059,7 +1058,7 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) page_size = 2; pages_avail = 0; s = format (s, path, page_size * 1024, 0); - read_sys_fs ((char *) s, "%u", &pages_avail); + vlib_sysfs_read ((char *) s, "%u", &pages_avail); vec_reset_length (s); if (page_size * pages_avail < mem) |