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 444A7457A1 for ; Mon, 12 Aug 2024 14:56:27 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3D0D240669; Mon, 12 Aug 2024 14:56:27 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2053.outbound.protection.outlook.com [40.107.94.53]) by mails.dpdk.org (Postfix) with ESMTP id B7D69402C3 for ; Mon, 12 Aug 2024 14:56:25 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=mG+xTpmqtAkR9VxyDPw7DaQDBKJrWKzFITRXCVPnrdFKUafaK3nr3ZAh08DLpXXJBtZhNZfIm/VK+RliReQE0HZRkzdNLrJxi5lIOFws0hpcILjppHX34bplv122Pqz3pP4tGOfEe5hP3rR7O5IHv+GI6qAkUYUJpLMLtnjzWFs2KMAHCmFgAKGk52YiOkeGBmOBaO9UQyO3qWxpD5br7TfjjUPoSC7wKnBzZlkwyyjX1CkBOSg6v3tYo4q6uFVzwbv6d+/LN10H5zRnDsPDkJRxBAwbb894ia+clEhukL522xKfAeXxk7IijJb2R4yHIb3dzOxKpLoL/l2rVzC30g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=2uD6KKAC2eorQl/dG1B8gcXuaL6cxzC+oQnMqiIeALA=; b=LysD7ppPobppK+HzdrSWwc5smJI32p0LmB8yEwkJwa+pimwuC7Xr86MGLc0PC8bDj9mBt+rCxOpN+3rXW+pSGlRNVk6kFNpf5rIBO+IEHYPIxslnsQD+RE5nQaWnBNIiaQHgWmfw20FzmIiVLwGVKVEzFtZ0CmaC56RYiXNRW0qP5YxMKJ10ECe5dqTTXtWbosriwmMCEu29u/CMGFHcU0ToMSI/lQJwuvfFTiUMPAg2OIBt7/0Yo0k74816X2ghUnC/gjKpT190SAY5MN1MOedR74fHdTr/fwS9DH8m+XaMJBuL63GL/wgdneozgvy4r6JM3X+Q4P2PNLHxeWQTMw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2uD6KKAC2eorQl/dG1B8gcXuaL6cxzC+oQnMqiIeALA=; b=esXziyzNWU+zOB19MsqWqhvlBrdOtA1J7OgliZuiEiSRI57DCDgL0SbYBm5HTcyq3RrnuAa7Vf7XSVaez42Bd/8UJU2EzFCIZKHNBxZLhguVluHvHcbm12Dkd0n9PhxtkjjuaUxb4DSuDwyNKjxyVkUX9bPSKn9P37dPzEoE9oMMPviemh3ScvGehRYrh3klC5sS58KbCj79LbI8ytrqZId1jiV3ELCck1I9eJ7ffSsKFlWwa7/RFxzOuX9UIlmFd0urQPKYEgcTAxm2H46JraaRoqkovwOROtoeIYG1XvaUYHYUV8+ARm/FibslxEiXM70BfwWXtEORWO/cd8iJtw== Received: from DM6PR14CA0058.namprd14.prod.outlook.com (2603:10b6:5:18f::35) by DM4PR12MB6135.namprd12.prod.outlook.com (2603:10b6:8:ac::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.20; Mon, 12 Aug 2024 12:56:20 +0000 Received: from DS1PEPF0001708F.namprd03.prod.outlook.com (2603:10b6:5:18f:cafe::c) by DM6PR14CA0058.outlook.office365.com (2603:10b6:5:18f::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.33 via Frontend Transport; Mon, 12 Aug 2024 12:56:20 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by DS1PEPF0001708F.mail.protection.outlook.com (10.167.17.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.19 via Frontend Transport; Mon, 12 Aug 2024 12:56:20 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 12 Aug 2024 05:56:11 -0700 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 12 Aug 2024 05:56:09 -0700 From: Xueming Li 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 23.11.2 Date: Mon, 12 Aug 2024 20:48:53 +0800 Message-ID: <20240812125035.389667-57-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com> References: <20240712110153.309690-23-xuemingl@nvidia.com> <20240812125035.389667-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF0001708F:EE_|DM4PR12MB6135:EE_ X-MS-Office365-Filtering-Correlation-Id: 55ccd30b-bcb9-42a6-7dee-08dcbace29d2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|376014|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?llU494KHawhR8taaMk9uvvKj/UeH1Hj8PZK3CAsFr/toJB5oIFAzYwZpuH8U?= =?us-ascii?Q?20xUldgXtRn/q8+rcmWIuQ7Tsk0AsBnUK2yQjvLQBt09emm5aobC2Sxt62YT?= =?us-ascii?Q?eHCDoUj9yDK3A2qlyMCczMzu9rMtJKVIeoSBnmhZMp2REafFNSGavqky0Cnj?= =?us-ascii?Q?c3zImucuumB76p6CU2Mbx/SdOyauLqykAaqijfxLq9h6M0rQ0v7DhN6eqnF+?= =?us-ascii?Q?oRYmffMBpNcYQ1HnuXU+x9a8Qt1wynksZ2oYEgTgfIoVUcSFK6orhfJNmV/t?= =?us-ascii?Q?NAY5HWtFAFwGADZkGiK2tcSI2ppLU0uk2uOSZbiFzgEP8mmBUN7U90vtixXb?= =?us-ascii?Q?eXht/xep6rA9JPMB8N3KKdxXUWW5E47RY+Fsxs5npbpcgmxU9st9o8TcPaLE?= =?us-ascii?Q?Bs6/y9QV66zCGz1vQ09GJHzn6Qri07BwNOOEbaTQ0Wc0Ck+CMXC4D3FGMK8d?= =?us-ascii?Q?tcqqh0KpqCn+Svi6Nq/vmdNlsu46VcRbja4+pIZ1WQjPzt02LX5wRa4NpGDo?= =?us-ascii?Q?QxGjJJCwa/z+8jYYOHUvpB/2lDKYVvZ1Oal8h08gYkPcz28btk57i9WdAS9U?= =?us-ascii?Q?Fqb+5ihEknhjmzxPs3gOX84GhOI/o/iwR08YP3Kttw0uuL3ive/AsuSyhyAs?= =?us-ascii?Q?Zc9oXBpPFpeJzLrY3jYl1CG6rwvgew52+YH3J8aKAT95L0zhJCFB4CYNYfj1?= =?us-ascii?Q?W9Ga++ZRe3yWBRibaq2ublUGAIclCQPkfeNYdEO5fJpFgRVikYs+50rvYlEZ?= =?us-ascii?Q?oWaSSok3Jw82aYuiyVg1iwMVKzT4Eo+XS09edlA7bpeykSKWQjkG4pJpVeQW?= =?us-ascii?Q?K8gHzKgvRCeprDUYrU6i8LPIiILJvDzsGYvQJcANYHbhXEOOXZ61ep2UV9+w?= =?us-ascii?Q?DPqF/IU/ze02MqrK2UmfQ2HclM7SbNYq6p6TfSjZuyqB/Akun+bjXjo/KbKb?= =?us-ascii?Q?hvwRCcmq4eIQvnSES5CqJGYFSyWdYF98iM5r5ysnpzDD/6NiXsLKrTzDeWF8?= =?us-ascii?Q?+gXA9311yUsMf99cGy6jHkiW5czBgBnPT1EkpvzI4BwUh5auOwtZ+6m7b0Ae?= =?us-ascii?Q?cVqoKL4IFju4inGBAs1ZgG6Kbs6EmJnqxf4YK0t3iEwTdRtkNCO+6IrMKN4z?= =?us-ascii?Q?bxEu3n/nkIWLmub1ZGGTxtrnA3mOCIIaeSGf1FGDG2aocU98EHd1Sbk+msc6?= =?us-ascii?Q?NqgBwW7JsERZl6XLRtkfY9CdEuyWpzLuQj+GEP9rlUZXQX1Wz2+mhORINZvl?= =?us-ascii?Q?hY2onnb+MAOOUzXA1cA7zoMU8EttU0611TgDg/tOgNGCixqfwW7j/FHjXVtH?= =?us-ascii?Q?j+UXcoufc3eqLSe3zKf0UdgYGcnbF6QdA+s84sni8VhycD/Y0bWw3bjrTMzI?= =?us-ascii?Q?T3YKqsjIjOFOb+dW7bTHKp7jn0wKgkcilek1XawV0AUXA569ofxYpZecCcEe?= =?us-ascii?Q?e31/uB33AJ2V3z+k1mVh1SLFWdqrmkXH?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(36860700013)(376014)(82310400026)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 12:56:20.5739 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 55ccd30b-bcb9-42a6-7dee-08dcbace29d2 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS1PEPF0001708F.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6135 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 23.11.2 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/14/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=c9eae16d5efb1a8724417604c8e492110a264133 Thanks. Xueming Li --- >From c9eae16d5efb1a8724417604c8e492110a264133 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 Cc: Xueming Li [ 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 d816df0ff6..39673e36f7 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.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:04.419904348 +0800 +++ 0056-net-ice-base-fix-GCS-descriptor-field-offsets.patch 2024-08-12 20:44:02.095069294 +0800 @@ -1 +1 @@ -From 243ec291b1eba3ddf7554c9c80a173e9aee58b68 Mon Sep 17 00:00:00 2001 +From c9eae16d5efb1a8724417604c8e492110a264133 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 243ec291b1eba3ddf7554c9c80a173e9aee58b68 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org