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 9B3CC455AD for ; Mon, 15 Jul 2024 17:29:48 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 977D740DD6; Mon, 15 Jul 2024 17:29:48 +0200 (CEST) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mails.dpdk.org (Postfix) with ESMTP id 081EA40A71 for ; Mon, 15 Jul 2024 17:29:39 +0200 (CEST) Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-42795086628so30306245e9.3 for ; Mon, 15 Jul 2024 08:29:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721057379; x=1721662179; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WRZi0pvfYYaKKBUwymMfjNqcF3ypgY3kXi55D0UKfX8=; b=TF/JS1GgOIcAsBm9I1QU96LYfIPqpJCVbB8iG85Ft2IQnDyYIEsu9EFactMryMdscQ wLF8fGMgSunIRfla/cqJrJnUtpTOtR7RYlPZgK2RkRE/jPI2s+RQaRohvZo4TCoibCS/ SjZDIWe6dJACa9N1QFxgqXkd1CCcFa23CSW5qGiQmVo35trYJn3X5jRip+hna8GOswAI tB5ADcMPdGXJ6gA70Y9FMNL9degBFWpQ1QHvp/q5g8A8pVCm+B5bDZBCWpCy7/Wb30HA CZFbxxQ3r08Nlu23apruypB8WRHBGLgZCiNrXPOc9SNZHOqdUae4ogpB4N1HOFMHBvqh KSsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721057379; x=1721662179; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WRZi0pvfYYaKKBUwymMfjNqcF3ypgY3kXi55D0UKfX8=; b=a1SIcxxOtARHRrkiFvBuRXAjwFuz+cZjnj+UAZ0D2urDRzgCwAe+GJVFOw39JL6jXV G0Uk3VPdSUfw+AJNH/hxwiwn6xGu9R8DVRyhWJxGzx3/W08BL7dZfgm+Fi0hOZXe5o0Q YfNn9QdPgewBWJ1HNwWpeCyrW+Mebk9qP2pmrWU44ICwLBOxchcK9dPdlIJWmL4HLHD7 tjbzAux0nCBwTeqkS9CCfg0kuiG+2NhhHxWGxgEIMGscICXX7ZAnGKoE+Sb9gmOB7Us4 lZSteIrCIxGOrYQFsixnY5qBtQKwEfCwFjNQIzbfTl9mLk86OZiKX2lX4cWyeHqRjWeM 8mJw== X-Forwarded-Encrypted: i=1; AJvYcCWsfaH+TApM2b59UCvUgtxI8mCR4Y4dvqJt0tJVniDZYY2movZ3GBp6zwKgkoCX0AlisfU6lHMjNzDsO4Uh0lU= X-Gm-Message-State: AOJu0YwSYBtg9YuELYJ1aLZEU3AItChwhTyd3nr6Jdp5VufKQAXRCE0X h61X9HDIi2zgx9dZG9olBCLZuptWvirz6/xpDZdc2hh2JosP99gM2G8BK9aPeDE= X-Google-Smtp-Source: AGHT+IGOTvtOcT/51mN9LPYPZydiVD5g74ysSHZp48F7DgMWa+eTihX3l0zmYRGuCJZ6+CTe5EI+BQ== X-Received: by 2002:a05:600c:68c:b0:426:6960:34b2 with SMTP id 5b1f17b1804b1-426708f9b36mr117465295e9.33.1721057378632; Mon, 15 Jul 2024 08:29:38 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-427a5e983e7sm91118225e9.23.2024.07.15.08.29.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jul 2024 08:29:38 -0700 (PDT) From: luca.boccassi@gmail.com 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 22.11.6 Date: Mon, 15 Jul 2024 16:26:26 +0100 Message-Id: <20240715152704.2229503-48-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240715152704.2229503-1-luca.boccassi@gmail.com> References: <20240624235907.885628-81-luca.boccassi@gmail.com> <20240715152704.2229503-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/17/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/92938d56d0f7ea32972107db372ee83cb3037421 Thanks. Luca Boccassi --- >From 92938d56d0f7ea32972107db372ee83cb3037421 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 be6d88f0ca..cd12d47d9b 100644 --- a/drivers/net/ice/base/ice_lan_tx_rx.h +++ b/drivers/net/ice/base/ice_lan_tx_rx.h @@ -1074,10 +1074,9 @@ struct ice_tx_ctx_desc { __le64 qw1; }; -#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 #define ICE_TXD_CTX_QW1_DTYPE_M (0xFUL << ICE_TXD_CTX_QW1_DTYPE_S) -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-15 16:19:37.064054551 +0100 +++ 0048-net-ice-base-fix-GCS-descriptor-field-offsets.patch 2024-07-15 16:19:34.588206890 +0100 @@ -1 +1 @@ -From 243ec291b1eba3ddf7554c9c80a173e9aee58b68 Mon Sep 17 00:00:00 2001 +From 92938d56d0f7ea32972107db372ee83cb3037421 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 be6d88f0ca..cd12d47d9b 100644