From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9F072A0C45 for ; Thu, 10 Jun 2021 14:07:22 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 98CC14067C; Thu, 10 Jun 2021 14:07:22 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id BDBC44003C for ; Thu, 10 Jun 2021 14:07:21 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lrJSz-00005v-JJ; Thu, 10 Jun 2021 12:07:21 +0000 From: Christian Ehrhardt To: Chengwen Feng Cc: Min Hu , dpdk stable Date: Thu, 10 Jun 2021 14:06:04 +0200 Message-Id: <20210610120641.885862-16-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210610120641.885862-1-christian.ehrhardt@canonical.com> References: <20210610120641.885862-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/hns3: return error on PCI config write failure' has been queued to stable release 19.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/12/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/041ad333d3172f7508afa64b168b4ce555bc15f4 Thanks. Christian Ehrhardt --- >From 041ad333d3172f7508afa64b168b4ce555bc15f4 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Fri, 7 May 2021 17:08:14 +0800 Subject: [PATCH] net/hns3: return error on PCI config write failure [ upstream commit d9fb708a000d4935af253ad93f917ed7a8be208e ] This patch returns error code when calling rte_pci_write_config() API. Fixes: 6dd32ded17d8 ("net/hns3: check PCI config space write") Signed-off-by: Chengwen Feng Signed-off-by: Min Hu (Connor) --- drivers/net/hns3/hns3_ethdev_vf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c index 17ed526d70..a7b6188eea 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c @@ -172,9 +172,12 @@ hns3vf_enable_msix(const struct rte_pci_device *device, bool op) if (ret < 0) { PMD_INIT_LOG(ERR, "failed to write PCI offset 0x%x", (pos + PCI_MSIX_FLAGS)); + return -ENXIO; } + return 0; } + return -1; } -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-10 14:04:58.828711046 +0200 +++ 0016-net-hns3-return-error-on-PCI-config-write-failure.patch 2021-06-10 14:04:58.034024406 +0200 @@ -1 +1 @@ -From d9fb708a000d4935af253ad93f917ed7a8be208e Mon Sep 17 00:00:00 2001 +From 041ad333d3172f7508afa64b168b4ce555bc15f4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d9fb708a000d4935af253ad93f917ed7a8be208e ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 6aa8a9b6ed..71f3f95877 100644 +index 17ed526d70..a7b6188eea 100644 @@ -21 +22 @@ -@@ -156,9 +156,12 @@ hns3vf_enable_msix(const struct rte_pci_device *device, bool op) +@@ -172,9 +172,12 @@ hns3vf_enable_msix(const struct rte_pci_device *device, bool op) @@ -31 +32 @@ - return -ENXIO; + return -1;