patch 'net/enic: avoid error message when no advanced filtering' has been queued to stable release 19.11.11

[christian.ehrhardt at canonical.com]

Hi,

FYI, your patch has been queued to stable release 19.11.11

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before December 10th 2021. 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/0dfb8b4a26a4b12da79fae719ad745673c43ae5f

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 0dfb8b4a26a4b12da79fae719ad745673c43ae5f Mon Sep 17 00:00:00 2001
From: Hyong Youb Kim <hyonkim at cisco.com>
Date: Mon, 25 Oct 2021 17:04:18 -0700
Subject: [PATCH] net/enic: avoid error message when no advanced filtering

[ upstream commit af397b3c93f82b0803c0890874d7ee3b5127522d ]

Probing the availability of Flow Manager API may print the following
error log.

PMD: rte_enic_pmd: Devcmd 88 failed with error code -1

The error indicates a flow manager operation failed and happens when
advanced filtering is disabled on vNIC. It is harmless but confusing
to the user. Since advanced filtering is a prerequisite, check first
if it is available and avoid the error message altogether.

Fixes: ea7768b5bba8 ("net/enic: add flow implementation based on Flow Manager API")

Signed-off-by: Hyong Youb Kim <hyonkim at cisco.com>
Reviewed-by: John Daley <johndale at cisco.com>
---
 drivers/net/enic/base/vnic_dev.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/enic/base/vnic_dev.c b/drivers/net/enic/base/vnic_dev.c
index 5535aa8774..4ce44362a9 100644
--- a/drivers/net/enic/base/vnic_dev.c
+++ b/drivers/net/enic/base/vnic_dev.c
@@ -520,6 +520,9 @@ static int vnic_dev_flowman_enable(struct vnic_dev *vdev, u32 *mode,
 	u64 ops;
 	static u32 instance;
 
+	/* Advanced filtering is a prerequisite */
+	if (!vnic_dev_capable_adv_filters(vdev))
+		return 0;
 	/* flowman devcmd available? */
 	if (!vnic_dev_capable(vdev, CMD_FLOW_MANAGER_OP))
 		return 0;
-- 
2.34.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-30 16:50:12.714328542 +0100
+++ 0116-net-enic-avoid-error-message-when-no-advanced-filter.patch	2021-11-30 16:50:05.942874646 +0100
@@ -1 +1 @@
-From af397b3c93f82b0803c0890874d7ee3b5127522d Mon Sep 17 00:00:00 2001
+From 0dfb8b4a26a4b12da79fae719ad745673c43ae5f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit af397b3c93f82b0803c0890874d7ee3b5127522d ]
+
@@ -17 +18,0 @@
-Cc: stable at dpdk.org
@@ -26 +27 @@
-index 9c42595ced..00d7782e6e 100644
+index 5535aa8774..4ce44362a9 100644
@@ -29,3 +30,3 @@
-@@ -594,6 +594,9 @@ static int vnic_dev_flowman_enable(struct vnic_dev *vdev, uint32_t *mode,
- 	uint64_t ops;
- 	static uint32_t instance;
+@@ -520,6 +520,9 @@ static int vnic_dev_flowman_enable(struct vnic_dev *vdev, u32 *mode,
+ 	u64 ops;
+ 	static u32 instance;