From 6c7001480ac6356ff0a4995f3ed495ed9c866061 Mon Sep 17 00:00:00 2001 From: Zhiyong Yang Date: Wed, 10 Jan 2018 10:32:26 +0800 Subject: [PATCH] bus/pci: fix interrupt handler type For virtio legacy device, testpmd startup fails when using uio_pci_generic. The issue is caused by invoking the function pci_ioport_map. The correct value of intr_handle.type is already set before calling it, we should avoid overwriting the default value "RTE_INTR_HANDLE_UNKNOWN" in this function. Besides, the removal has no harm to other cases because it is set to 0 by a memset on the whole struct during allocation in the function pci_scan_one. Such assignments are removed in the meanwhile in pci_uio_map_resource(), pci_vfio_map_resource_primary() and pci_vfio_map_resource_secondary() in order to keep consistencies and avoid future questions. Fixes: 756ce64b1ecd ("eal: introduce PCI ioport API") Cc: stable@dpdk.org Signed-off-by: Zhiyong Yang Reviewed-by: Thomas Monjalon --- drivers/bus/pci/linux/pci.c | 1 - drivers/bus/pci/linux/pci_vfio.c | 2 -- drivers/bus/pci/pci_common_uio.c | 1 - 3 files changed, 4 deletions(-) diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c index 25f907e046..3e97aa48e4 100644 --- a/drivers/bus/pci/linux/pci.c +++ b/drivers/bus/pci/linux/pci.c @@ -694,7 +694,6 @@ pci_ioport_map(struct rte_pci_device *dev, int bar __rte_unused, if (!found) return -1; - dev->intr_handle.type = RTE_INTR_HANDLE_UNKNOWN; p->base = start; RTE_LOG(DEBUG, EAL, "PCI Port IO found start=0x%x\n", start); diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c index be986cbdbf..aeeaa9ed88 100644 --- a/drivers/bus/pci/linux/pci_vfio.c +++ b/drivers/bus/pci/linux/pci_vfio.c @@ -430,7 +430,6 @@ pci_vfio_map_resource_primary(struct rte_pci_device *dev) struct pci_map *maps; dev->intr_handle.fd = -1; - dev->intr_handle.type = RTE_INTR_HANDLE_UNKNOWN; /* store PCI address string */ snprintf(pci_addr, sizeof(pci_addr), PCI_PRI_FMT, @@ -547,7 +546,6 @@ pci_vfio_map_resource_secondary(struct rte_pci_device *dev) struct pci_map *maps; dev->intr_handle.fd = -1; - dev->intr_handle.type = RTE_INTR_HANDLE_UNKNOWN; /* store PCI address string */ snprintf(pci_addr, sizeof(pci_addr), PCI_PRI_FMT, diff --git a/drivers/bus/pci/pci_common_uio.c b/drivers/bus/pci/pci_common_uio.c index dd84ec8bf1..54bc20b59a 100644 --- a/drivers/bus/pci/pci_common_uio.c +++ b/drivers/bus/pci/pci_common_uio.c @@ -90,7 +90,6 @@ pci_uio_map_resource(struct rte_pci_device *dev) dev->intr_handle.fd = -1; dev->intr_handle.uio_cfg_fd = -1; - dev->intr_handle.type = RTE_INTR_HANDLE_UNKNOWN; /* secondary processes - use already recorded details */ if (rte_eal_process_type() != RTE_PROC_PRIMARY) -- 2.20.1