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 46DCD45804 for ; Fri, 23 Aug 2024 18:22:46 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3FB9E43386; Fri, 23 Aug 2024 18:22:46 +0200 (CEST) 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 A9D6A402BE for ; Fri, 23 Aug 2024 18:22:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1724430164; 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=iR0Nzej5YN14Ci1e4hlW61RAZKn0wQQWWOM3Qj+Gfoo=; b=FcQe210LOxLlldKMmSYFPrXvxJ27kU1dmQMkZojMgGzPGRLuRwBJyhFKTHiaXqMW29FPUO nwLYVYfwz4cv+1kmFt4SBZ1Jqc9A2dJq3+vhjC8YcfFaB/nS1qWt9Xg/J00G2LJIy3+gEC 7/ZLaE2K48mI4ZnQrB6ff3eu0jodDVw= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-477-CPEYo0SfOjGWZDPHftA9aw-1; Fri, 23 Aug 2024 12:22:43 -0400 X-MC-Unique: CPEYo0SfOjGWZDPHftA9aw-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id EE9B31955BED; Fri, 23 Aug 2024 16:22:41 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.193.224]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E31FB1956053; Fri, 23 Aug 2024 16:22:39 +0000 (UTC) From: Kevin Traynor To: Eric Joyner Cc: Ian Stokes , Bruce Richardson , dpdk stable Subject: patch 'net/ice/base: fix GCS descriptor field offsets' has been queued to stable release 21.11.8 Date: Fri, 23 Aug 2024 17:18:34 +0100 Message-ID: <20240823161929.1004778-86-ktraynor@redhat.com> In-Reply-To: <20240823161929.1004778-1-ktraynor@redhat.com> References: <20240823161929.1004778-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/28/24. 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/57a52a5d57444ad0f78faa92a820da2f04a48feb Thanks. Kevin --- >From 57a52a5d57444ad0f78faa92a820da2f04a48feb Mon Sep 17 00:00:00 2001 From: Eric Joyner Date: Wed, 26 Jun 2024 12:41:09 +0100 Subject: [PATCH] net/ice/base: fix GCS descriptor field offsets [ upstream commit 243ec291b1eba3ddf7554c9c80a173e9aee58b68 ] Update the offsets, and remove the ICE_TX_GCS_DESC_ENA define since a non-0 value used for the ICE_TX_GCS_DESC_TYPE field will enable GCS offload; there is no dedicated bit to enable it anymore. Fixes: c31095a0b20f ("net/ice/base: add GCO defines and GCO flex descriptor") Signed-off-by: Eric Joyner Signed-off-by: Ian Stokes Acked-by: Bruce Richardson --- drivers/net/ice/base/ice_lan_tx_rx.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/ice/base/ice_lan_tx_rx.h b/drivers/net/ice/base/ice_lan_tx_rx.h index 2b6f039dcb..88cc721e9a 100644 --- a/drivers/net/ice/base/ice_lan_tx_rx.h +++ b/drivers/net/ice/base/ice_lan_tx_rx.h @@ -1075,8 +1075,7 @@ struct ice_tx_ctx_desc { }; -#define ICE_TX_GSC_DESC_START 0 /* 7 BITS */ -#define ICE_TX_GSC_DESC_OFFSET 7 /* 4 BITS */ -#define ICE_TX_GSC_DESC_TYPE 11 /* 2 BITS */ -#define ICE_TX_GSC_DESC_ENA 13 /* 1 BIT */ +#define ICE_TX_GCS_DESC_START 0 /* 8 BITS */ +#define ICE_TX_GCS_DESC_OFFSET 8 /* 4 BITS */ +#define ICE_TX_GCS_DESC_TYPE 12 /* 3 BITS */ #define ICE_TXD_CTX_QW1_DTYPE_S 0 -- 2.46.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-23 17:18:12.274992180 +0100 +++ 0086-net-ice-base-fix-GCS-descriptor-field-offsets.patch 2024-08-23 17:18:09.769430277 +0100 @@ -1 +1 @@ -From 243ec291b1eba3ddf7554c9c80a173e9aee58b68 Mon Sep 17 00:00:00 2001 +From 57a52a5d57444ad0f78faa92a820da2f04a48feb Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 243ec291b1eba3ddf7554c9c80a173e9aee58b68 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index d816df0ff6..39673e36f7 100644 +index 2b6f039dcb..88cc721e9a 100644