From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by dpdk.org (Postfix) with ESMTP id C84541B2C3 for ; Fri, 26 Jan 2018 14:14:08 +0100 (CET) Received: by mail-wr0-f195.google.com with SMTP id e41so500424wre.9 for ; Fri, 26 Jan 2018 05:14:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rV+k7FR4gglKn40jAOHn/BatLw425NtP4Q0f7V44Vu0=; b=cVUhpoO/AbBOlaqHtM1Jd+9ZpFGkpU8tXoqcjEAH7/+oY3x9P41VBPG3EuAJ6QJtbX 09LyE+Smo5DZhurlwgQLwN6P2NqZqXlwu2++UNrmwjN8peTdtuTx/sweG2SaduLReKRE ckwfU+3pAhwWeeF6ONKXj8PKpjy1La8Jn7Ij4QLinw05fnf2y4nq0Q/aZ0kjM0Oy9lWg +v5Cv8evYe6OiIrsXiePhODBlyWhP5PwDd7HORPK10jmdK7YBLEKeupHG5c/128tJ0pi PY4W5cXWrUSF2zhp3YO/lpiDjLezFcuoZedSTwy/HDbthBkv0G/Hjh8qng4vUnP3sib0 rfyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rV+k7FR4gglKn40jAOHn/BatLw425NtP4Q0f7V44Vu0=; b=Yd/mE8wjRZHopvehKhp8Tjmo2uBs7Lvzyc+tEcIVPA936rRaq51mMAT2o7LAaTgx4V skfThTuLHqlDvDCIfjLTpWfZ7ctXZuAz2dB6K0v+kj6oAUlhjWbyDWUNiKMnHBHq1yya dz0UEuF8Q/yF3tzD0XI469GnGhyOnoc9GKL3mpW4PkYKoX5vKFNmuJ4GxnVDEoBfROyh oKqvGnReDpxO3U5/0azv1TtbuP9kwfufpjlt9Abwsr49Si3YXF54qjx1G5rg2NmJMNc6 4zzzsnZmDvianm/ztlMCHKIsulX+p0CaqIClCwp/39LDwUXxtwgWjuoJa3aWVL6KZGOy E/9w== X-Gm-Message-State: AKwxytegeetAYp+LFOzczWDtZMk3Y88uJJrbkpTXZyOybAezFrMHOgWw CpGKBEXT3/CWcXz3TWr8qxycSI5K X-Google-Smtp-Source: AH8x2278bNK2xOu2waMKUd3r53Ndskhtze5txGXTG1QdbLGnzVonG2YJnVf15DIdE5Ln5G316Wjeww== X-Received: by 10.223.186.148 with SMTP id p20mr12549276wrg.259.1516972448512; Fri, 26 Jan 2018 05:14:08 -0800 (PST) Received: from localhost ([2a00:23c5:bef3:400:9531:588b:44ae:bec4]) by smtp.gmail.com with ESMTPSA id 44sm10886959wrv.0.2018.01.26.05.14.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 26 Jan 2018 05:14:07 -0800 (PST) From: luca.boccassi@gmail.com To: Zhiyong Yang Cc: Thomas Monjalon , dpdk stable Date: Fri, 26 Jan 2018 13:12:37 +0000 Message-Id: <20180126131332.15346-7-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180126131332.15346-1-luca.boccassi@gmail.com> References: <20180126131332.15346-1-luca.boccassi@gmail.com> Subject: [dpdk-stable] patch 'bus/pci: fix interrupt handler type' has been queued to LTS release 16.11.5 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: Fri, 26 Jan 2018 13:14:08 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.5 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/28/18. So please shout if anyone has objections. Thanks. Luca Boccassi --- >>From e947b95e7cc956147f76ec2dcd2d20b90a694725 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 --- lib/librte_eal/common/eal_common_pci_uio.c | 1 - lib/librte_eal/linuxapp/eal/eal_pci.c | 1 - 2 files changed, 2 deletions(-) diff --git a/lib/librte_eal/common/eal_common_pci_uio.c b/lib/librte_eal/common/eal_common_pci_uio.c index 367a6816d..6f91ff9c3 100644 --- a/lib/librte_eal/common/eal_common_pci_uio.c +++ b/lib/librte_eal/common/eal_common_pci_uio.c @@ -117,7 +117,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) diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c index 876ba3819..b0d0c3c61 100644 --- a/lib/librte_eal/linuxapp/eal/eal_pci.c +++ b/lib/librte_eal/linuxapp/eal/eal_pci.c @@ -623,7 +623,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); -- 2.14.2