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 CAEF142D46 for ; Sun, 25 Jun 2023 08:46:09 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C4E17410ED; Sun, 25 Jun 2023 08:46:09 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2072.outbound.protection.outlook.com [40.107.102.72]) by mails.dpdk.org (Postfix) with ESMTP id DFABA40A7F for ; Sun, 25 Jun 2023 08:46:08 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BowxttbzKDKYq6lvDHvQBuop7z+A+SHqk7KvW4kAbsdfCS9jv5ftzfeGPE0yvELfFb8TlGjyIIwoQLMS00SXDtNkajue4jPj1nfVlKmrGRpOeeWWPiwIHIn1n8QWaIslErH1IXk53kNyIT1wCQyKlssb//v5qA6NIMQjo9jHy6bWhG3fBt6Ud8XuFRpNdSv9yvLGJYS9oQReh+uRgZEH3cWUCl9Iw0Ys7DTP6NR9v1O3mAOIa+rNbwC4DfGBIKWn1KfmRnTNtKdbiNLxhvt0dRR7ICeK8PRgXbekNi5YwYlCmWHhKnKh/Jy+4sOzRxQ7Se7ZpoLdgsahvrkSby36CQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=SmnjFlDFX3sViZzYC0GAAXbAeNb94bmwzbpmjbttoX0=; b=nc8/I0aJtlr70rlxxHDsChNca71313MjbvdIv1vkTK4UYOYS7vKPCBSUhGRbAKEtE6sz0TLdYyGgZRwZjwVgsHrl3Yv1HzgO78d/dQqxuRnMGuqojQDsFSs3jYoxWm3mcDCyvLy35kUVc5e5gvARwfew+XImIuUk7l7MnmVXx8IoOlk0uk14hDvaol91ADsmUJFEUv/n2GTehoxwPCWbPOYo98hoRHa8E1pblbJ1WZsXv9XefJaM2TQ8J0mfRXItYlt82Q5+WgQaZzVaSIieyxgEcGFHltLY7J2X+qO3+rXb28thCKD92YspbBe3I/HREFpnzvHcSbYslOCFN70NIQ== 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 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=SmnjFlDFX3sViZzYC0GAAXbAeNb94bmwzbpmjbttoX0=; b=KF941pmLeMvuBg7HG4Mwo8bezDEfPAvlkVcboplr+PS/No/3oK2UNbkRhg9jeWVdyyOsFvUgEANU64i3KKda1jJ5+rvDqJfU6u+VS/JFCI3KJV9UzEbP5p3Mql354wxHjk8rRXBwbtxj5zK7f7opd7aR86pJjZM+YSeDD6Zgbkgjq7r7abRi7ckobODcEx511eRJrzFSjMNPHBCxrZzbhHVWfi4olW9IwEwCM9EFZjRndsIrtZoH96wPYHwO6WPBJPv0ApyOGDrYTDiRAUBZ5GUxcWQPufobtHa5MfWJwf6nZYtc51GAdpvhPTKgkygDB6M0/zOKAC2VcBDs3Z95pQ== Received: from BN8PR03CA0010.namprd03.prod.outlook.com (2603:10b6:408:94::23) by SJ1PR12MB6241.namprd12.prod.outlook.com (2603:10b6:a03:458::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.24; Sun, 25 Jun 2023 06:46:07 +0000 Received: from BN8NAM11FT061.eop-nam11.prod.protection.outlook.com (2603:10b6:408:94:cafe::8f) by BN8PR03CA0010.outlook.office365.com (2603:10b6:408:94::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.32 via Frontend Transport; Sun, 25 Jun 2023 06:46:06 +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 BN8NAM11FT061.mail.protection.outlook.com (10.13.177.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.47 via Frontend Transport; Sun, 25 Jun 2023 06:46:05 +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.986.5; Sat, 24 Jun 2023 23:45:55 -0700 Received: from nvidia.com (10.126.230.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.986.37; Sat, 24 Jun 2023 23:45:54 -0700 From: Xueming Li To: Qiming Yang CC: Dave Ertman , dpdk stable Subject: patch 'net/ice/base: fix incorrect defines for DCBx' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:35:34 +0800 Message-ID: <20230625063544.11183-117-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230625063544.11183-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT061:EE_|SJ1PR12MB6241:EE_ X-MS-Office365-Filtering-Correlation-Id: e4f3b84a-5414-4fdd-c84f-08db7547d9ce X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XCX4eZbRiMYwnPefyzbV4I4orJ9yM661rQEiRgqF/QGtxcwbxS4jjYnBiJj5cZCL3Z3yTPLpZmdXdipOrOviTg4s1vZUinpVLp/KkBK5x4YHshHw0lQJUxfFZGKIClHbex9em2fOeZ3oKa3TphC5B223mKJ/uTGUIEnohV3QoD19WkwMVB1Bpt/curD+V3+p/5S7ySeLmopppTLATd709oFRTIQk9azkq+ueZgzXkvAMgRCg5M+PoFahhDJY8ZKUPB2g35CpsR1F8ED2PGbtoC3v0aOOisWG/yRHFSPdYlfsJL6KbbbI1mVSz+2rtKArlLyKsapF6MOCsRghfEuGAVmEQlpJ+zNDASjmn4EHnGGHRAGl8hteDUAiLuo9gKKdQt+O3Jsu4fAhMKkDPBRjXZUr4kTI411CKtyczEsZ3G/Z661bTrYTQsWtPJjw/f4uaEm0ZgNx8OIRp6i/fGGW0ejz92Pj2oi7ARSzmOU/G7Bi1mnhdtonPH5hnt32w3U0Y50imLNf2kvM/VOvdRbuVwL9X54UnStg+LE82nztnnJxn2PsprlDv2hbqv13oz/JgGScJzB3gfxu40yDqs2YdqnV8GLwdecw43RdgwOo8t8kFI6OrPZe70xeHwQaZQPbSPqRDy9vxJcOmJUrSLTLU9b7lZWvmWGUGMYrL1RWZP2bafnV+a7GSuiPaaNGMSZ2KGxIT9Pcg6Zm/QFUxqzsE10nkvIytB/oquos8hOiFNajcZzMaZxgUO/v+yw1f26X1Pg+1TlHwJy/LAWZjn8plw== 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:(13230028)(4636009)(396003)(136003)(376002)(39860400002)(346002)(451199021)(36840700001)(40470700004)(46966006)(36860700001)(82310400005)(47076005)(966005)(478600001)(7696005)(6666004)(2616005)(54906003)(426003)(83380400001)(336012)(26005)(53546011)(1076003)(186003)(16526019)(6286002)(2906002)(5660300002)(40460700003)(36756003)(70206006)(356005)(4326008)(7636003)(70586007)(82740400003)(55016003)(40480700001)(316002)(86362001)(8936002)(8676002)(41300700001)(6916009); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:46:05.8361 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e4f3b84a-5414-4fdd-c84f-08db7547d9ce 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: BN8NAM11FT061.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ1PR12MB6241 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/23. 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=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=7691c220b621029944dd3ae1b556e24d7cbc8648 Thanks. Xueming Li --- >From 7691c220b621029944dd3ae1b556e24d7cbc8648 Mon Sep 17 00:00:00 2001 From: Qiming Yang Date: Thu, 18 May 2023 15:16:22 +0000 Subject: [PATCH] net/ice/base: fix incorrect defines for DCBx Cc: Xueming Li [ upstream commit 80beb5949b7cc8538d9918b4b184ff00dfd5a227 ] In all cases but one, CEE mode is defined as 0x01 and IEEE mode is defined as 0x02. in past these values were swapped. This is causing the DCB information sent from the FW agent to be parsed with incorrect structures and resulting in incorrect values. Change the defines to match what they are in the rest of the kernel. Fixes: 97e32e8d4870 ("net/ice/base: complete pending LLDP MIB") Signed-off-by: Dave Ertman Signed-off-by: Qiming Yang --- 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 5a817982b4..93a3a6007f 100644 --- a/drivers/net/ice/base/ice_adminq_cmd.h +++ b/drivers/net/ice/base/ice_adminq_cmd.h @@ -2002,8 +2002,8 @@ struct ice_aqc_lldp_get_mib { #define ICE_AQ_LLDP_DCBX_S 6 #define ICE_AQ_LLDP_DCBX_M (0x3 << ICE_AQ_LLDP_DCBX_S) #define ICE_AQ_LLDP_DCBX_NA 0 -#define ICE_AQ_LLDP_DCBX_IEEE 1 -#define ICE_AQ_LLDP_DCBX_CEE 2 +#define ICE_AQ_LLDP_DCBX_CEE 1 +#define ICE_AQ_LLDP_DCBX_IEEE 2 /* The following bytes are reserved for the Get LLDP MIB command (0x0A00) * and in the LLDP MIB Change Event (0x0A01). They are valid for the * Get LLDP MIB (0x0A00) response only. -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:32:01.583627400 +0800 +++ 0116-net-ice-base-fix-incorrect-defines-for-DCBx.patch 2023-06-25 14:31:58.565773900 +0800 @@ -1 +1 @@ -From 80beb5949b7cc8538d9918b4b184ff00dfd5a227 Mon Sep 17 00:00:00 2001 +From 7691c220b621029944dd3ae1b556e24d7cbc8648 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 80beb5949b7cc8538d9918b4b184ff00dfd5a227 ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org