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 9CE2843C60 for ; Thu, 7 Mar 2024 02:37:12 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9642742F0E; Thu, 7 Mar 2024 02:37:12 +0100 (CET) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mails.dpdk.org (Postfix) with ESMTP id 7272242F01 for ; Thu, 7 Mar 2024 02:37:11 +0100 (CET) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-412f1fc5613so3660005e9.2 for ; Wed, 06 Mar 2024 17:37:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709775431; x=1710380231; 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=6a9OLg1lzozZjrJIEOlRO9eqVvGXh4fdVw5ykHd3oeg=; b=gKBWoOcW8ZA7GVsB27v6OGRqbANEsAHB9yqVgw171oqGG9xVyimgA5syrjE0HY/DPN uwqgBSau2muySt9lsjd70heK48sODKS87X8ZX19by86zqzQ/XtEu5HblfqP6Bn8ft/tm EnaitkMFwZgt28fguHE49R7AMq64vmUyHKz73Bt/iYznEF+zURSpRF2TC2yhKVObzCrg wBV2FTPK8Kuw1Za56ClYQAAG3sxd9E8l1fo9fC+uRivMnI72Al4iNXeYPkd2/J3LvKlL q3+x/0wdGYofaZ3nEHq6Rmnxv85YOmmIHM7q6wWSFbqyTFtqcgFWOFx0GAPoYEnOXwLr WMMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709775431; x=1710380231; 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=6a9OLg1lzozZjrJIEOlRO9eqVvGXh4fdVw5ykHd3oeg=; b=WFNbu3M6loiwsxEHDaHLQDoDSxGSoTJ9KiQloNn76V4YQt6IYQ8w9DtC5bK+8fX4Fe p6NBxHMKkszI1PeE/fbCzcEHvkKVZsbAoT/KfXszZ84uSVfMAo3+6GzmGXTxB9MEVG1G AjAC5W2CtS3gIAZaiLu4n+6SIpcktFRWeOtiML8h1iTYaWkAHWjfCx635s/G7UCwHhlp JAHKn9ZySl88GqdXfbhgdSBW5n2INN3VAgppJ+rFcTTVPh7EoT2hCRXmDjNaKHCqzKW8 GxnTlOEGgXnaKMOYeZdjWTlMKffZ114MkiVrShSsX7mmbGZNH3DQfDiRQT6SVmk8CRYC 6tyw== X-Forwarded-Encrypted: i=1; AJvYcCWSpu01F+YOmI2xwykgrZyJ4//cjKEqlTG/4beeS4KN0vOmJwpRNgaGt65Hkgt3JhybFtOXlv46MnrcLq/lvro= X-Gm-Message-State: AOJu0YyCNicniJvatSDxO7SYqv59ZnYWZBL5TmV0iN3PEyCbd5jLKlPZ P2s6lSA0mezBZ/2PjUceG1zFxwdv405itoCQxnmczMhfFOkEf3YMEr+N06Z438A= X-Google-Smtp-Source: AGHT+IEQWWODaGoEdMw0NYrdiM7jG4D8+iBaDnlpQArudvHkDM9VszGOk+qz+rp3T1X0F8XgLkVvsA== X-Received: by 2002:a5d:4ad2:0:b0:33d:8751:2288 with SMTP id y18-20020a5d4ad2000000b0033d87512288mr12298059wrs.13.1709775431069; Wed, 06 Mar 2024 17:37:11 -0800 (PST) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id i10-20020a05600011ca00b0033b60bad2fcsm18883420wrx.113.2024.03.06.17.37.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 17:37:10 -0800 (PST) From: luca.boccassi@gmail.com 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 22.11.5 Date: Thu, 7 Mar 2024 01:31:43 +0000 Message-Id: <20240307013159.1735343-86-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240307013159.1735343-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-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.5 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/09/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/66f4540fa5d591c5c16586a758a21890d8bb19c0 Thanks. Luca Boccassi --- >From 66f4540fa5d591c5c16586a758a21890d8bb19c0 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 [ 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 51e1e2d6b3..45f92ff558 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -2972,6 +2972,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) @@ -3009,23 +3011,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.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-07 01:05:42.032735646 +0000 +++ 0086-net-bnxt-fix-50G-and-100G-forced-speed.patch 2024-03-07 01:05:34.966943582 +0000 @@ -1 +1 @@ -From dd8d40bc8294ee1f5753205d14f37accc7a7debc Mon Sep 17 00:00:00 2001 +From 66f4540fa5d591c5c16586a758a21890d8bb19c0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit dd8d40bc8294ee1f5753205d14f37accc7a7debc ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 2ae0cb2067..8f37077522 100644 +index 51e1e2d6b3..45f92ff558 100644 @@ -27 +28 @@ -@@ -3158,6 +3158,8 @@ static uint16_t bnxt_check_eth_link_autoneg(uint32_t conf_link) +@@ -2972,6 +2972,8 @@ static uint16_t bnxt_check_eth_link_autoneg(uint32_t conf_link) @@ -36 +37 @@ -@@ -3195,23 +3197,23 @@ static uint16_t bnxt_parse_eth_link_speed(uint32_t conf_link_speed, +@@ -3009,23 +3011,23 @@ static uint16_t bnxt_parse_eth_link_speed(uint32_t conf_link_speed,