patch 'common/sfc_efx/base: fix recirculation ID set in outer rules' has been queued to stable release 21.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/06/22. 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

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

Thanks.

Kevin

---
>From 4874f1d005ca2c6491cdd6dfcc3654e430bb165f Mon Sep 17 00:00:00 2001
From: Ivan Malov <ivan.malov at oktetlabs.ru>
Date: Fri, 18 Feb 2022 01:25:07 +0300
Subject: [PATCH] common/sfc_efx/base: fix recirculation ID set in outer rules

[ upstream commit b4dd34c7f751a516b08139784b9ef8ece04fc659 ]

Recirculation ID field of MAE outer rule insert MCDI is
part of the lookup control structure and it has non-zero
bit offset relative to the byte offset of the structure.

Fixes: 5cf153e79c6c ("common/sfc_efx/base: support recirculation ID in outer rules")

Signed-off-by: Ivan Malov <ivan.malov at oktetlabs.ru>
Reviewed-by: Andy Moreton <amoreton at xilinx.com>
---
 drivers/common/sfc_efx/base/efx_mae.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/common/sfc_efx/base/efx_mae.c b/drivers/common/sfc_efx/base/efx_mae.c
index 7b24e3fee4..7d48b5787e 100644
--- a/drivers/common/sfc_efx/base/efx_mae.c
+++ b/drivers/common/sfc_efx/base/efx_mae.c
@@ -2243,5 +2243,6 @@ efx_mae_outer_rule_insert(
 	    MAE_ENC_FIELD_PAIRS_LEN);
 
-	MCDI_IN_SET_BYTE(req, MAE_OUTER_RULE_INSERT_IN_RECIRC_ID,
+	MCDI_IN_SET_DWORD_FIELD(req, MAE_OUTER_RULE_INSERT_IN_LOOKUP_CONTROL,
+	    MAE_OUTER_RULE_INSERT_IN_RECIRC_ID,
 	    spec->emms_outer_rule_recirc_id);
 
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-03-01 10:41:02.923259937 +0000
+++ 0056-common-sfc_efx-base-fix-recirculation-ID-set-in-oute.patch	2022-03-01 10:41:01.342244106 +0000
@@ -1 +1 @@
-From b4dd34c7f751a516b08139784b9ef8ece04fc659 Mon Sep 17 00:00:00 2001
+From 4874f1d005ca2c6491cdd6dfcc3654e430bb165f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b4dd34c7f751a516b08139784b9ef8ece04fc659 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org