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 85A8243B7D for ; Tue, 5 Mar 2024 10:58:21 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7D6A042E4F; Tue, 5 Mar 2024 10:58:21 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2067.outbound.protection.outlook.com [40.107.243.67]) by mails.dpdk.org (Postfix) with ESMTP id ECB974026B for ; Tue, 5 Mar 2024 10:58:19 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ahvgtxx7IarmJCI9aXoP3kJBnKzzA7Rcm5dgDoS8Q4OBfcfxz4uFEoEfm7GWwN+IAPPRMnS8RV6YXi6n58MnZyjsj9wPZ+b02OH1qkgBnGP/nuNTAs2tbvj9prxEmSl+XTyaEEri37ZlP4zm4eb+zpLwqNl/99LZng7WtcfyZbfdibVkegG19N8ivByiGUFjHK2b94uldL11uRh/GPyG4LN7HLAk4wVBFX1Spudj/00OPkDaRGJXOEKMhDYwt+rvxSPALUjn7Qifrv34as1IYW1SeCEl2AJemCO3AzYiQELi1zIxnju/0mKN61TD45qCxZVIarWM5U1hG9F1zGtLqg== 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=NVZg6qdb8hofjiEBQGVfXaMzPnLV5erOg64SCb9osFc=; b=eESQXm/f48OVyNUc7NF101CAZp6cfzgbbHKDHXlml7PCNvZgl4ZBBk211TVslS60i+hfKLo+BPKWLt9E3p4afFMfvsDVZul9cHRaXG/X5XZWYfqnE2Yzck2F+0KUAi60488ooQbuqnTekVy94xoTQeTQZW0qdtsn/gV4syvg/rnqP0/lePIbdXiPlVVhWrsaJMKSTqxtn4eQVrok1VkaeqWfzjdpOHbo6l4tcu4vMVyW7qd3bxD1sPd1ZCt+5lmyDqZXqkFwwnQ/APgo5aFqU4CKXE3/IKVUsLkjSFsn6AUJTI8SGd40+ecwYClyuqBASMNcJW2j88dlI08IOpr+vA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=broadcom.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=NVZg6qdb8hofjiEBQGVfXaMzPnLV5erOg64SCb9osFc=; b=SvZ3exYE3gjEHWkShUWXmoZmON0xh9+Gyu0byngknEnieKH00eUH9O1LBS5XDumaI1ovlC40po9bZNn4HnIcEWKGuVVOxu0c4wZ5tzEquyQFfarrLwXMqptj9Vwv4Zck9b3VLDVzJ6l73v67JrlWg65C6gbA7JVnESyGVSnoYqvhn+S2YgH1zbfB56+EDnerBnIKAAcBQvunxbMXboSqNUn0u8rmy/hr0HIlr5nHNclzY2rkO7ztM4hCWFYRltylq1XayiH0AIgqdCy2+FrLllg+sHtHvyQvxqRxwNFXiFB8/NUailjoS3tG94Ewf/G/+9dUyI8yunJmsiuv2x0sLQ== Received: from CYXPR02CA0016.namprd02.prod.outlook.com (2603:10b6:930:cf::19) by CH3PR12MB7692.namprd12.prod.outlook.com (2603:10b6:610:145::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.38; Tue, 5 Mar 2024 09:58:17 +0000 Received: from CY4PEPF0000EDD3.namprd03.prod.outlook.com (2603:10b6:930:cf:cafe::33) by CYXPR02CA0016.outlook.office365.com (2603:10b6:930:cf::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39 via Frontend Transport; Tue, 5 Mar 2024 09:58:17 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CY4PEPF0000EDD3.mail.protection.outlook.com (10.167.241.207) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.11 via Frontend Transport; Tue, 5 Mar 2024 09:58:16 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Tue, 5 Mar 2024 01:58:06 -0800 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.1258.12; Tue, 5 Mar 2024 01:58:04 -0800 From: Xueming Li To: Kalesh AP CC: Somnath Kotur , Ajit Khaparde , dpdk stable Subject: patch 'net/bnxt: fix 50G and 100G forced speed' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:47:35 +0800 Message-ID: <20240305094757.439387-115-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240305094757.439387-1-xuemingl@nvidia.com> References: <20240305094757.439387-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: 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: CY4PEPF0000EDD3:EE_|CH3PR12MB7692:EE_ X-MS-Office365-Filtering-Correlation-Id: 116dc408-b303-4574-c009-08dc3cfac7b2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7vaT3a4qdEIiZD0lKgmXsDxqRc5i61FvTKIBxNbTccOxxgBUWizIbTaYaJOHiQfQWED94PLjPb/tpBAFAXg23uUvSJRzqXJZmfhoRSnGgOXrm1fZahMu+yOxyv6WjehYbBPkGy78bORLhi1ZyftSELavLSEkojEe18KTiMe1MBf1wbEphyG2Gkw94oZtiTGiHxx5OrFKEJWeadiX3tlsSIGYGZ7XgBqIACTRXDjZ0zBJbEu9ycitYqfoxnNVFGSJ1tsbmDSKPU0qcWlEWVYVik75dZPEm/hpzV+ZNtgWEcr25q/v+Oc9Mz21cIhonykgc5GVdK2BtQIlA2IgyWJPda7ZYPU/Pq7e9W1dPoZ0g5P2Gw8+5JpNqeVh1abPAnnvwYSLIrxFqt5BLc1HTrpT7AjkzawGQWNOmGQnBbDrODBZlQ+//QccbmYivhXppo1HusdvzJD/0qf0Yfi+UWYgGoE8pT9O42+T6KwenZyJyMHAj3337uh/FCm3kNlqrSVB4mIBO1DD12m/l+RALGML6dzid095myfUIIg5CHPLTA3fAAUMGcD8/eCQd9WGNn0SNbz44hrlvgPTMCwlBqHD8EjupO5b6smZKBYnejH5VJBqrggF2oQKf3Sc92gSavfrQE9b9psV8juxXgt35Hz6j+/C3FoXPQTPMRPr16lsmrr256AKSOR2j4bfAHLPBlAcBM1SyfjX7zVxitPxCsEVV3z0L1ee1Tx6TodW48r6iD9e58TG66JBMTBfJmZ1KoVl X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(376005)(82310400014)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:58:16.8545 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 116dc408-b303-4574-c009-08dc3cfac7b2 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EDD3.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB7692 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/31/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=e1f8152ede3691aae1d920397e045f4edf8e0e79 Thanks. Xueming Li --- >From e1f8152ede3691aae1d920397e045f4edf8e0e79 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Thu, 16 Nov 2023 00:12:01 -0800 Subject: [PATCH] net/bnxt: fix 50G and 100G forced speed Cc: Xueming Li [ upstream commit dd8d40bc8294ee1f5753205d14f37accc7a7debc ] Thor based NICs can support PAM4 as well as NRZ link negotiation. While PAM4 can negotiate speeds at 50G, 100G and 200G, the PMD will use NRZ signaling for 50G and 100G speeds. PAM4 signaling will be used only for 200G speed negotiations. Driver has to check for NRZ speed support first while forcing speed. Fixes: c23f9ded0391 ("net/bnxt: support 200G PAM4 link") Signed-off-by: Kalesh AP Reviewed-by: Somnath Kotur Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_hwrm.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index 06f196760f..b6ce4fc5f0 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -3039,6 +3039,8 @@ static uint16_t bnxt_check_eth_link_autoneg(uint32_t conf_link) static uint16_t bnxt_parse_eth_link_speed(uint32_t conf_link_speed, struct bnxt_link_info *link_info) { + uint16_t support_pam4_speeds = link_info->support_pam4_speeds; + uint16_t support_speeds = link_info->support_speeds; uint16_t eth_link_speed = 0; if (conf_link_speed == RTE_ETH_LINK_SPEED_AUTONEG) @@ -3076,23 +3078,23 @@ static uint16_t bnxt_parse_eth_link_speed(uint32_t conf_link_speed, HWRM_PORT_PHY_CFG_INPUT_FORCE_LINK_SPEED_40GB; break; case RTE_ETH_LINK_SPEED_50G: - if (link_info->support_pam4_speeds & - HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_PAM4_SPEEDS_50G) { - eth_link_speed = HWRM_PORT_PHY_CFG_INPUT_FORCE_PAM4_LINK_SPEED_50GB; - link_info->link_signal_mode = BNXT_SIG_MODE_PAM4; - } else { + if (support_speeds & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_SPEEDS_50GB) { eth_link_speed = HWRM_PORT_PHY_CFG_INPUT_FORCE_LINK_SPEED_50GB; link_info->link_signal_mode = BNXT_SIG_MODE_NRZ; + } else if (support_pam4_speeds & + HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_PAM4_SPEEDS_50G) { + eth_link_speed = HWRM_PORT_PHY_CFG_INPUT_FORCE_PAM4_LINK_SPEED_50GB; + link_info->link_signal_mode = BNXT_SIG_MODE_PAM4; } break; case RTE_ETH_LINK_SPEED_100G: - if (link_info->support_pam4_speeds & - HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_PAM4_SPEEDS_100G) { - eth_link_speed = HWRM_PORT_PHY_CFG_INPUT_FORCE_PAM4_LINK_SPEED_100GB; - link_info->link_signal_mode = BNXT_SIG_MODE_PAM4; - } else { + if (support_speeds & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_SPEEDS_100GB) { eth_link_speed = HWRM_PORT_PHY_CFG_INPUT_FORCE_LINK_SPEED_100GB; link_info->link_signal_mode = BNXT_SIG_MODE_NRZ; + } else if (support_pam4_speeds & + HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_PAM4_SPEEDS_100G) { + eth_link_speed = HWRM_PORT_PHY_CFG_INPUT_FORCE_PAM4_LINK_SPEED_100GB; + link_info->link_signal_mode = BNXT_SIG_MODE_PAM4; } break; case RTE_ETH_LINK_SPEED_200G: -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:34.387615013 +0800 +++ 0114-net-bnxt-fix-50G-and-100G-forced-speed.patch 2024-03-05 17:39:30.923566498 +0800 @@ -1 +1 @@ -From dd8d40bc8294ee1f5753205d14f37accc7a7debc Mon Sep 17 00:00:00 2001 +From e1f8152ede3691aae1d920397e045f4edf8e0e79 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit dd8d40bc8294ee1f5753205d14f37accc7a7debc ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index 2ae0cb2067..8f37077522 100644 +index 06f196760f..b6ce4fc5f0 100644 @@ -27 +29 @@ -@@ -3158,6 +3158,8 @@ static uint16_t bnxt_check_eth_link_autoneg(uint32_t conf_link) +@@ -3039,6 +3039,8 @@ static uint16_t bnxt_check_eth_link_autoneg(uint32_t conf_link) @@ -36 +38 @@ -@@ -3195,23 +3197,23 @@ static uint16_t bnxt_parse_eth_link_speed(uint32_t conf_link_speed, +@@ -3076,23 +3078,23 @@ static uint16_t bnxt_parse_eth_link_speed(uint32_t conf_link_speed,