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 0D0D1457A1 for ; Mon, 12 Aug 2024 14:56:54 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 08007402C3; Mon, 12 Aug 2024 14:56:54 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2055.outbound.protection.outlook.com [40.107.94.55]) by mails.dpdk.org (Postfix) with ESMTP id 93E324029C for ; Mon, 12 Aug 2024 14:56:52 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=wP0jIsPV1bLwy1M9+OxmZkO33fAO2dk7qbNYpOaSk+kDlViTD+7Bs874LOA7erV0IYhRdvhqeWCm/fl9UexlRHQ0j6QGImKVmyNbKIPyvBNsDtMeWZrAvVmy+jwD2bjiY0Txq03opnJYR+Pkqvv99xHKILapwFMgtPWVjSCu9a3VzBw1rAa54mky17RCnQH5ozQHgvF0+4UVDLZ+G+klsGmIuXPe7WnwaTtwJR8E2BTBiLobEvYAYqQ2kTW1W9z7skanFresGtpx87Z/NfQZ7DxSIUOfQL3XOH+RHwepZL2Q1QBoYJTe6jWBkgoetfqYYFAnilFGZQ2EDohga7xIqQ== 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=mo3XQK4D0NRCk5oTjJM1cmsBW/Jx5rqgPGDrN/NZFcE=; b=QzQelZf0Pvcln52Dxnoiz+TqfmXND0yVcg8moA4svFz9fNanAUOL+xmfjPUNS40/jV55j4GtGlwMSUrHr8SlJyVtULPKwi/QzKyrmEAtJNxgddKmgdguxSWeUNQOZqXV6PqbCW8kihDRhJOR8uUce24Y4HISpW/zRMFpTRuiF7G5SBM0MrAiO70xAF5ZRZo0GDfJrBOMtNqvOD9IO/YrpZDXEtJLAbqcOIvlCxEhzAZ46ZpIXP3njPAjCaQIa5bdduTsPI2lY8KwH3Og0GgOV4rcD4wbucwFZkI4fuodbzvn//7LkX+QjRTebznb9FtnmgXpoX32VdW4YcLrDnn0Ww== 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=mo3XQK4D0NRCk5oTjJM1cmsBW/Jx5rqgPGDrN/NZFcE=; b=S+2frmZqgwoOVo4RKj5RLDoB4yTTIs496jZJRv8cqPO0y/cOwt1v9KVr4kzY5OfaDdh3Ol20VgKmSz4OSfXPFSATqZbppUVwJYGJ3OAU3Mhk93HvGu8eGD/MArBdqQUZZ53RHzzsRr9ejrqs1Ixv/350pU4Ptpd6U4f1bsh8FZTZFptVxfkLDmzdADK0KiShi1cJ9LADnzg2xwz6j3H1Ue8FaREIOJTEHM2fNiU/KXjf6S3GWbzL24VzagiCiKXPayyc+IPtKYZ3ZuOKlAXAuwv2X9p5cUkjoODcJ0V8dXxCwxyL5hMI1zGCTr6cQ5JvVXs2Iog2ghjFm5x2CYwQMQ== Received: from DM5PR07CA0104.namprd07.prod.outlook.com (2603:10b6:4:ae::33) by MN2PR12MB4048.namprd12.prod.outlook.com (2603:10b6:208:1d5::8) 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:49 +0000 Received: from DS1PEPF0001708E.namprd03.prod.outlook.com (2603:10b6:4:ae:cafe::6e) by DM5PR07CA0104.outlook.office365.com (2603:10b6:4:ae::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.20 via Frontend Transport; Mon, 12 Aug 2024 12:56:49 +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 DS1PEPF0001708E.mail.protection.outlook.com (10.167.17.134) 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:48 +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:38 -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:36 -0700 From: Xueming Li To: Waldemar Dworakowski CC: , Ian Stokes , Bruce Richardson , dpdk stable Subject: patch 'net/ice/base: fix board type definition' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:48:57 +0800 Message-ID: <20240812125035.389667-61-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: DS1PEPF0001708E:EE_|MN2PR12MB4048:EE_ X-MS-Office365-Filtering-Correlation-Id: d31748d6-0534-41fe-a9a2-08dcbace3abd 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?AESY8t7I6CSrOGdcfpey3AwI3VVl2rb/hhoYMFG1vPMHzPnc06vhlcceFRNx?= =?us-ascii?Q?hpN0ge1wKLJzGZisKjfQt8Fw1P4Gqp39ZdRlqrpWIVnokaey5EJCMg2A0jrC?= =?us-ascii?Q?kF1hUlvCozRizk316+ZMwwP5I6UCNuWKknOcWC0gPHwJIuuDhOxEV2AzLo0G?= =?us-ascii?Q?Ddsm/0clQJqlM+Es/wKfeFbi3JwMV4YCJOrw6bQwQkNvrdb7YRqcmKSm7ICx?= =?us-ascii?Q?FuuOZrYBA2GK0HbebjuFjdzN4RjfhbFFzDIRjcleRtDci6w4YdGzlsD44cf1?= =?us-ascii?Q?ohgNq6tiFnpUmdhmPAD0ZjsQOiCjuwh5lDffPKGtcwCCSjBqY6UCQZ4sZ22i?= =?us-ascii?Q?+QoOdrdQYzPrQkHswyUFbWEhIRsZsbNxuWUIYJxCqD9niXWa35pUMxK++CBz?= =?us-ascii?Q?FrgwDUJocwJBnMpkvbgioR9AjwcGWbmFZ9AhbPd4NAKNzZBPDzIxOUyF5Kxd?= =?us-ascii?Q?9ivo7ZcPNrSTP8tQ2XmshoVBK7zC57l+oBR7xbc0O+ZgEqd885mIN1Begquj?= =?us-ascii?Q?+76r+vYurIJo/NSayr3LhqCbxooFk9ChVdDYcJn004mL0rBYQRGF0x+bMG/I?= =?us-ascii?Q?XQi9SWOHXr3RqmnJYnjJdkFi2TqLMHEgahwH3bTNNL1AkfrU4MBYXShuGtZZ?= =?us-ascii?Q?SH+CshSauaNhH7hJ7pVc06es0uK5cwmiHmrv6QZPJIBui7NVgEnR5tmIJyjF?= =?us-ascii?Q?C1W6iG2vPbB8oZtjuDoljsUb1/YORm2Yxhq5STHczg2PYnIc2543KdAWNMLz?= =?us-ascii?Q?MUZnZOhPj29me552iSp/+v2veXzqW71g6Tj67i3sX30XJYyIVcxYmGu+1cF2?= =?us-ascii?Q?puq8RyEExzCpAbAdr7049Wd8El0hSkiQGMm2svQLUFIZssgvQpGocn9U9CPm?= =?us-ascii?Q?n41nlUK7T4YM4L782++cFE8TQsrqUhGz63KjKXQUqkCFjjDPtJdomC6YSDdU?= =?us-ascii?Q?8rDnkA3dtrdceH/j1PBna1dgZb6h/7x1uUhn8SiJP05ghWX4Md4GO2THAGcR?= =?us-ascii?Q?qLaomGxbFkSDAiO6wgjGlJYN+rh+sYAC6FXH5uFgPzuTQ0D3UEHxXopajrp0?= =?us-ascii?Q?RF/OpZ9ZfgYqz8duC9+ZrDvfextNsntsJYYUPHVYXP+GfGxxDJJ4UwsCqUfJ?= =?us-ascii?Q?DOZygYrXAkxMvdIw3CxDlPAeimLTwRdeWcSTxl79KQe+AsU8X8L3rF0YbFWB?= =?us-ascii?Q?k0HXbs7QJ/tYe06BP2OSRpkkPst97nXPmEmy8gymYtzdnx5taexFkojPD99Y?= =?us-ascii?Q?qSbk5WsaDnxFM8hyccaWSLuejH02C4zyw1PdKmClCzPBXfspf/NHOyBA0eaS?= =?us-ascii?Q?/mT9LpUe5tHmY6DDKJH3IO37GwdEEwaiZ2w6QArIC+RInccU7oeK6ZT+MRXd?= =?us-ascii?Q?uDytqE7HYJmpXQvNYoceLWxY0eff3jRcN7sTMqRyFZX22zsi3Llt0CoafGxH?= =?us-ascii?Q?C7//X+H4dHI+RBwT16nYUtQfpSUuDQob?= 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:48.9742 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d31748d6-0534-41fe-a9a2-08dcbace3abd 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: DS1PEPF0001708E.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4048 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=67a40ce4ef85d55f13b2e6796e7b13152ffaa182 Thanks. Xueming Li --- >From 67a40ce4ef85d55f13b2e6796e7b13152ffaa182 Mon Sep 17 00:00:00 2001 From: Waldemar Dworakowski Date: Wed, 26 Jun 2024 12:41:38 +0100 Subject: [PATCH] net/ice/base: fix board type definition Cc: Xueming Li [ upstream commit ee7419d85e4c55559002fdb57ec6dc4959155b2f ] The new version is compliant with implementation and documentation. Fixes: f4f79aa849b5 ("net/ice/base: add AQC get link topology handle support") Signed-off-by: Waldemar Dworakowski Signed-off-by: Ian Stokes Acked-by: Bruce Richardson --- drivers/net/ice/base/ice_adminq_cmd.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ice/base/ice_adminq_cmd.h b/drivers/net/ice/base/ice_adminq_cmd.h index 844e90bbce..1131379d63 100644 --- a/drivers/net/ice/base/ice_adminq_cmd.h +++ b/drivers/net/ice/base/ice_adminq_cmd.h @@ -1728,8 +1728,8 @@ struct ice_aqc_link_topo_addr { #define ICE_AQC_LINK_TOPO_HANDLE_M (0x3FF << ICE_AQC_LINK_TOPO_HANDLE_S) /* Used to decode the handle field */ #define ICE_AQC_LINK_TOPO_HANDLE_BRD_TYPE_M BIT(9) -#define ICE_AQC_LINK_TOPO_HANDLE_BRD_TYPE_LOM BIT(9) -#define ICE_AQC_LINK_TOPO_HANDLE_BRD_TYPE_MEZZ 0 +#define ICE_AQC_LINK_TOPO_HANDLE_BRD_TYPE_LOM 0 +#define ICE_AQC_LINK_TOPO_HANDLE_BRD_TYPE_MEZZ BIT(9) #define ICE_AQC_LINK_TOPO_HANDLE_NODE_S 0 /* In case of a Mezzanine type */ #define ICE_AQC_LINK_TOPO_HANDLE_MEZZ_NODE_M \ -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:04.563346536 +0800 +++ 0060-net-ice-base-fix-board-type-definition.patch 2024-08-12 20:44:02.125069300 +0800 @@ -1 +1 @@ -From ee7419d85e4c55559002fdb57ec6dc4959155b2f Mon Sep 17 00:00:00 2001 +From 67a40ce4ef85d55f13b2e6796e7b13152ffaa182 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit ee7419d85e4c55559002fdb57ec6dc4959155b2f ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index c431b82784..d90a5b0d34 100644 +index 844e90bbce..1131379d63 100644 @@ -22 +24 @@ -@@ -1746,8 +1746,8 @@ struct ice_aqc_link_topo_addr { +@@ -1728,8 +1728,8 @@ struct ice_aqc_link_topo_addr {