[dpdk-stable] patch 'net/sfc/base: reduce filter priorities to implemented only' has been queued to LTS release 18.11.9

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.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/03/20. 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/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/e2bba83304c0cecfa7ef8c675eb46a6a3de49b30

Thanks.

Kevin.

---
>From e2bba83304c0cecfa7ef8c675eb46a6a3de49b30 Mon Sep 17 00:00:00 2001
From: Igor Romanov <igor.romanov at oktetlabs.ru>
Date: Tue, 10 Mar 2020 09:48:36 +0000
Subject: [PATCH] net/sfc/base: reduce filter priorities to implemented only

[ upstream commit 5b1dd95e270bfc4a824aad8fd560ce97f06679d1 ]

Only implemented filter priorities are manual and auto. Remove
unused priorities since exposing unimplemented functionality
is of no benefit.

Tx filter specification default priority is changed to manual,
since required priority does not differ from it in the implementation.

Fixes: f9565517ff4f ("net/sfc/base: import filters support")

Signed-off-by: Igor Romanov <igor.romanov at oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
---
 drivers/net/sfc/base/efx.h        | 6 +-----
 drivers/net/sfc/base/efx_filter.c | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/net/sfc/base/efx.h b/drivers/net/sfc/base/efx.h
index 444f6d1db3..93d8580d04 100644
--- a/drivers/net/sfc/base/efx.h
+++ b/drivers/net/sfc/base/efx.h
@@ -2869,6 +2869,5 @@ typedef uint32_t efx_filter_match_flags_t;
 
 typedef enum efx_filter_priority_s {
-	EFX_FILTER_PRI_HINT = 0,	/* Performance hint */
-	EFX_FILTER_PRI_AUTO,		/* Automatic filter based on device
+	EFX_FILTER_PRI_AUTO = 0,	/* Automatic filter based on device
 					 * address list or hardware
 					 * requirements. This may only be used
@@ -2876,7 +2875,4 @@ typedef enum efx_filter_priority_s {
 					 * each NIC type. */
 	EFX_FILTER_PRI_MANUAL,		/* Manually configured filter */
-	EFX_FILTER_PRI_REQUIRED,	/* Required for correct behaviour of the
-					 * client (e.g. SR-IOV, HyperV VMQ etc.)
-					 */
 } efx_filter_priority_t;
 
diff --git a/drivers/net/sfc/base/efx_filter.c b/drivers/net/sfc/base/efx_filter.c
index a7523b38b6..c55b1c7761 100644
--- a/drivers/net/sfc/base/efx_filter.c
+++ b/drivers/net/sfc/base/efx_filter.c
@@ -315,5 +315,5 @@ efx_filter_spec_init_tx(
 
 	memset(spec, 0, sizeof (*spec));
-	spec->efs_priority = EFX_FILTER_PRI_REQUIRED;
+	spec->efs_priority = EFX_FILTER_PRI_MANUAL;
 	spec->efs_flags = EFX_FILTER_FLAG_TX;
 	spec->efs_dmaq_id = (uint16_t)etp->et_index;
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-28 17:13:00.006760740 +0100
+++ 0016-net-sfc-base-reduce-filter-priorities-to-implemented.patch	2020-05-28 17:12:59.065557215 +0100
@@ -1 +1 @@
-From 5b1dd95e270bfc4a824aad8fd560ce97f06679d1 Mon Sep 17 00:00:00 2001
+From e2bba83304c0cecfa7ef8c675eb46a6a3de49b30 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5b1dd95e270bfc4a824aad8fd560ce97f06679d1 ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
-index 53ddaa987c..c609c700fa 100644
+index 444f6d1db3..93d8580d04 100644
@@ -27 +28 @@
-@@ -2951,6 +2951,5 @@ typedef uint32_t efx_filter_match_flags_t;
+@@ -2869,6 +2869,5 @@ typedef uint32_t efx_filter_match_flags_t;
@@ -35 +36 @@
-@@ -2958,7 +2957,4 @@ typedef enum efx_filter_priority_s {
+@@ -2876,7 +2875,4 @@ typedef enum efx_filter_priority_s {
@@ -44 +45 @@
-index 7efb380641..575f6228be 100644
+index a7523b38b6..c55b1c7761 100644