diff options
| author |   Damjan Marion <damarion@cisco.com> | 2017-05-15 12:32:15 +0200 |
|---|---|---|
| committer | Damjan Marion <damarion@cisco.com> | 2017-05-15 12:32:15 +0200 |
| commit | 572825df79e27a8baebcfc11d91bdb6f9776c2c7 (patch) | |
| tree | 4dd0125068bc5fddae4e35015fea76b32a9fd3d1 /dpdk/dpdk-17.05_patches | |
| parent | b5c13fdf470da1f4b0cfde151ba106cd84414e6b (diff) | |
dpdk: revert dpdk 17.05 change which causes virtio issues
This patch is causing DPDK to provide bad MAC address
for legacy virtio interfaces.
Change-Id: I526cd35a38164ede80a8ab6decb9e0d1ebfad723
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'dpdk/dpdk-17.05_patches')
| -rw-r--r-- | dpdk/dpdk-17.05_patches/0001-Revert-net-virtio-remove-redundant-MSI-X-detection.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/dpdk/dpdk-17.05_patches/0001-Revert-net-virtio-remove-redundant-MSI-X-detection.patch b/dpdk/dpdk-17.05_patches/0001-Revert-net-virtio-remove-redundant-MSI-X-detection.patch new file mode 100644 index 00000000000..28dc68dd5f0 --- /dev/null +++ b/dpdk/dpdk-17.05_patches/0001-Revert-net-virtio-remove-redundant-MSI-X-detection.patch @@ -0,0 +1,58 @@ +From 3a1470e031ff33ac99da33b41dae0e9082d4da78 Mon Sep 17 00:00:00 2001 +From: Damjan Marion <damarion@cisco.com> +Date: Mon, 15 May 2017 12:27:37 +0200 +Subject: [PATCH] Revert "net/virtio: remove redundant MSI-X detection" + +This reverts commit ee1843bd89076c59e50cadbef5c935613f543765. +--- + drivers/net/virtio/virtio_pci.c | 27 +++++++++++++++++++++++++++ + 1 file changed, 27 insertions(+) + +diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c +index b7b3d6157..127f25791 100644 +--- a/drivers/net/virtio/virtio_pci.c ++++ b/drivers/net/virtio/virtio_pci.c +@@ -274,6 +274,32 @@ legacy_notify_queue(struct virtio_hw *hw, struct virtqueue *vq) + VIRTIO_PCI_QUEUE_NOTIFY); + } + ++#ifdef RTE_EXEC_ENV_LINUXAPP ++static int ++legacy_virtio_has_msix(const struct rte_pci_addr *loc) ++{ ++ DIR *d; ++ char dirname[PATH_MAX]; ++ ++ snprintf(dirname, sizeof(dirname), ++ "%s/" PCI_PRI_FMT "/msi_irqs", pci_get_sysfs_path(), ++ loc->domain, loc->bus, loc->devid, loc->function); ++ ++ d = opendir(dirname); ++ if (d) ++ closedir(d); ++ ++ return d != NULL; ++} ++#else ++static int ++legacy_virtio_has_msix(const struct rte_pci_addr *loc __rte_unused) ++{ ++ /* nic_uio does not enable interrupts, return 0 (false). */ ++ return 0; ++} ++#endif ++ + const struct virtio_pci_ops legacy_ops = { + .read_dev_cfg = legacy_read_dev_config, + .write_dev_cfg = legacy_write_dev_config, +@@ -694,6 +720,7 @@ vtpci_init(struct rte_pci_device *dev, struct virtio_hw *hw) + } + + virtio_hw_internal[hw->port_id].vtpci_ops = &legacy_ops; ++ hw->use_msix = legacy_virtio_has_msix(&dev->addr); + hw->modern = 0; + + return 0; +-- +2.11.0 + |