[dpdk-stable] patch 'net/hns3: return error on PCI config write failure' has been queued to stable release 20.11.2
Xueming Li
xuemingl at nvidia.com
Sat Jun 12 01:03:32 CEST 2021
Hi,
FYI, your patch has been queued to stable release 20.11.2
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/14/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/steevenlee/dpdk
This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/9e15a154c5a5de90d23d99be9a13d8cf769dffef
Thanks.
Xueming Li <xuemingl at nvidia.com>
---
>From 9e15a154c5a5de90d23d99be9a13d8cf769dffef Mon Sep 17 00:00:00 2001
From: Chengwen Feng <fengchengwen at huawei.com>
Date: Fri, 7 May 2021 17:08:14 +0800
Subject: [PATCH] net/hns3: return error on PCI config write failure
Cc: Luca Boccassi <bluca at debian.org>
[ 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 <fengchengwen at huawei.com>
Signed-off-by: Min Hu (Connor) <humin29 at huawei.com>
---
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 7f83e85203..235beea14d 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -153,9 +153,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 -ENXIO;
}
--
2.25.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2021-06-12 06:53:59.620033200 +0800
+++ 0118-net-hns3-return-error-on-PCI-config-write-failure.patch 2021-06-12 06:53:56.510000000 +0800
@@ -1 +1 @@
-From d9fb708a000d4935af253ad93f917ed7a8be208e Mon Sep 17 00:00:00 2001
+From 9e15a154c5a5de90d23d99be9a13d8cf769dffef Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Luca Boccassi <bluca at debian.org>
+
+[ upstream commit d9fb708a000d4935af253ad93f917ed7a8be208e ]
@@ -9 +11,0 @@
-Cc: stable at dpdk.org
@@ -18 +20 @@
-index 6aa8a9b6ed..71f3f95877 100644
+index 7f83e85203..235beea14d 100644
@@ -21 +23 @@
-@@ -156,9 +156,12 @@ hns3vf_enable_msix(const struct rte_pci_device *device, bool op)
+@@ -153,9 +153,12 @@ hns3vf_enable_msix(const struct rte_pci_device *device, bool op)
More information about the stable
mailing list