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 5E73EA034F for ; Tue, 1 Mar 2022 11:45:09 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 57B0E407FF; Tue, 1 Mar 2022 11:45:09 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 18A45426EA for ; Tue, 1 Mar 2022 11:45:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131507; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ySfuYmlkc6BK9ZsEeuab7K/Doombeca31Omi8GJPSg4=; b=XXtcg6rubyCinjpZr0JQgBdKINkeVuAsoBE3m77ae5eoLb7WCH0mJFLR/isE9RuhSezrJu LaRJjDiE/POcI9vpIZ+c5HXOdQ7bUFxkI9XeDJZbp3vHIbGfE+uSFkZMFqsixJQCyknDN8 fIjF6Nkuge/ceDpo/qLeuTZ6fBDGgoA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-463-TESZ4O2sNP6a2KwtUZdPbw-1; Tue, 01 Mar 2022 05:45:04 -0500 X-MC-Unique: TESZ4O2sNP6a2KwtUZdPbw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 74949186833B; Tue, 1 Mar 2022 10:45:03 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5E11275545; Tue, 1 Mar 2022 10:45:02 +0000 (UTC) From: Kevin Traynor To: Ivan Malov Cc: Andy Moreton , dpdk stable Subject: patch 'common/sfc_efx/base: fix recirculation ID set in outer rules' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:42:12 +0000 Message-Id: <20220301104300.334382-56-ktraynor@redhat.com> In-Reply-To: <20220301104300.334382-1-ktraynor@redhat.com> References: <20220301104300.334382-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 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 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 Reviewed-by: Andy Moreton --- 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@dpdk.org