From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id C5DBA1B00F; Wed, 10 Jan 2018 03:45:42 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Jan 2018 18:45:28 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,337,1511856000"; d="scan'208";a="22789364" Received: from unknown (HELO dpdk5.bj.intel.com) ([172.16.182.198]) by orsmga001.jf.intel.com with ESMTP; 09 Jan 2018 18:45:27 -0800 From: Zhiyong Yang To: dev@dpdk.org Cc: ferruh.yigit@intel.com, thomas@monjalon.net, stable@dpdk.org, Zhiyong Yang Date: Wed, 10 Jan 2018 10:32:26 +0800 Message-Id: <20180110023226.37133-1-zhiyong.yang@intel.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20171229075511.33180-1-zhiyong.yang@intel.com> References: <20171229075511.33180-1-zhiyong.yang@intel.com> Subject: [dpdk-stable] [PATCH v3] bus/pci: fix wrong intr_handle.type with uio_pci_generic X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Jan 2018 02:45:43 -0000 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 --- Changes in V3: 1. Such assignments are removed in order to keep consistencies and avoid future questions. Changes in V2: 1. Reword the commit log. 2. Remove the assignment operation which causes the issue. 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 25f907e04..3e97aa48e 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 be986cbdb..aeeaa9ed8 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 dd84ec8bf..54bc20b59 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.13.3