From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by dpdk.org (Postfix) with ESMTP id EDD691B1B8 for ; Wed, 24 Jan 2018 16:36:20 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id A17BC22281; Wed, 24 Jan 2018 10:36:20 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute1.internal (MEProxy); Wed, 24 Jan 2018 10:36:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=XXrEUxArfEmNnMGsx g/sPlNooEcQzf8eFoypCv9Dc8M=; b=ljlWOuVcF06qvnfhKbokzAev8bCoK2ytH trPmBuWVlW+QNrOa1Fz7BObqsT+/vwXZGp+ebihqV488TUdNc2OryaDHo6KGT3tC Ut2vzWUCH+lt2+iOmsEpo3wVRkYEA1dFdMvLAT0qfP7keLrev2xT129gC6zdeBG2 qhb9VzCkXixwut7nfKT+gwUwxpS8yX1zSu6dcOwUBbSbpm4gGFg7WvwWVlkdjevh A1ahUSc3xNyH/Zy6juDA5ioWeaXOx/FPUY8I/JaxO+cNrw2UppOkkfKPhG/vIaY2 5EqSaQpXmm6Du/WjPEDK+liwsMBaNZnHUTQLsx2DJVXdcalvI428w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=XXrEUxArfEmNnMGsxg/sPlNooEcQzf8eFoypCv9Dc8M=; b=HRyYrnDb jt2z2JOVlUkkfSv6FofVSp1CKYORXjhxaML9awEq+3MqkDM/mUEMiL1PQIeBVAnW 0XRc28c/vOBRlPWeM54rEiXkZj01Vdq3gfThKxGirVrZjeaWGjWnPhG6mDwxAPSv R3bJeZiZwSD5ytC/RtjAVpczGbiPTErjmJiEdiL+1Upfhe5ZfFbIsuZ6r6Uo1YUh cgtjj4KkRTSWz2eez2Bl2KG/Z+6GDmz7HhPxtfPWrNY6VbUBaIHkaOqjZRLP8bDh +PF4TwBps50vMeG0slXvY3dMUuG81HzlXymjV8RcbEO2h7yjZHF0TNtErNjFrp9P EV4C20Zfuaq8Pw== X-ME-Sender: Received: from localhost.localdomain (unknown [115.150.27.206]) by mail.messagingengine.com (Postfix) with ESMTPA id 871567E1A2; Wed, 24 Jan 2018 10:36:18 -0500 (EST) From: Yuanhan Liu To: Zhiyong Yang Cc: Thomas Monjalon , dpdk stable Date: Wed, 24 Jan 2018 23:31:19 +0800 Message-Id: <1516808026-25523-11-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516808026-25523-1-git-send-email-yliu@fridaylinux.org> References: <1516808026-25523-1-git-send-email-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'bus/pci: fix interrupt handler type' has been queued to LTS release 17.11.1 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, 24 Jan 2018 15:36:21 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 01/26/18. So please shout if anyone has objections. Thanks. --yliu --- >>From 295c63b38533e5053eb78a8d89776a553d7e5802 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 [ upstream commit 6c7001480ac6356ff0a4995f3ed495ed9c866061 ] 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") 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 5da6728..ec31216 100644 --- a/drivers/bus/pci/linux/pci.c +++ b/drivers/bus/pci/linux/pci.c @@ -723,7 +723,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 1f93fa4..e7d7f5d 100644 --- a/drivers/bus/pci/linux/pci_vfio.c +++ b/drivers/bus/pci/linux/pci_vfio.c @@ -459,7 +459,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, @@ -576,7 +575,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 0671131..b75988d 100644 --- a/drivers/bus/pci/pci_common_uio.c +++ b/drivers/bus/pci/pci_common_uio.c @@ -119,7 +119,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.7.4