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 C55E5A0543 for ; Tue, 21 Jun 2022 10:07:20 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C10C840151; Tue, 21 Jun 2022 10:07:20 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2068.outbound.protection.outlook.com [40.107.236.68]) by mails.dpdk.org (Postfix) with ESMTP id 8A38E42836 for ; Tue, 21 Jun 2022 10:07:19 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bY2DKIcVbrfAS7Nf/BpU/9u/Rpx2xOJoSKyXtfgyK202E/JVyjdLenF7UT1o4ayUwTCjQTWPCc1wVfAymqr97Q70tiWn8Ec6nPb7E23IjglgQ9SdlyBWYUPxF1FF8G/ODZzhSfqTcrF8fQLa7ueAJf0iya/04TgmBnyKQRQR4NGADHtgpOk2pjp7DMPdhGGS+xXPf/mg6dnPX9reeN34cpqWyXv2oWSMIvLjEINLhHeWeSLv542aCDC3vt8AwtWqC4Ta74wGtjbjXNG/Wam4UrW2uc2RTmcgYvM+T2tFaL/eHLxEJHQcjWO05YxlgsHnx9QiQ7c4zAHr5MDvklY3kw== 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=CaSgRvy2xpMB2qCygeGICGvC10GWqvUc1pE0rmf7kE4=; b=UaDkXj3yDk+SQZaDyhf0wmgyrmkiibgTrfuFWqMI+FQdAMPDgC85qnI8idjL9iP6thCQTSruk6gqZptnRtVK0vBdnNNVmUff0PiL3F5O+8DIhSvu293CvIIn9bWdM4KHpU5D8Y/SP8Zzz5RqmMWZG53HsuMdRR+8TXEJKXtzyAvVgQudfou+n1FbcJ+mfyFtX0lbvH0+aH3jN/f4pFU6mbndjj6oQLaK6xqBXuhiPXeNJd+5Fd3J/Wh79rY0qewLUDW4Q02aaTgEqXrgc9m2xAcebAXWWGIKFLRGxA6LOAYheVLb5b41ia65b6oThrfyv9K2BS4Y737fobF4BHXMNA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.238) 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 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=CaSgRvy2xpMB2qCygeGICGvC10GWqvUc1pE0rmf7kE4=; b=Y0YIyHBcAuDe7v9V5MgPO2l7E/VwfJHIHanKKspsuHL552Imoiscypcxx3mdSQvOlNZhy++PqIFZHsxMFGsnvRPwn5SnaAApxQB6sSCnKQ48xWLZVRD2DKCkEAPcJqfOxL/bV0QFwinrPBkQjk4tdv3rfurOwGlhjbTPn7dVwQObo0eLS9S4uQUa+HaL+iSPRpz/sprXjCjezLqj8luz+MKfwWB/pHWJS1uZCVByKrrNGw9UzgZxsUWM4+DrQoSlOT5vuZFmHiNcaVzmxduwnK+eTtt10lRVIkToUe2rfxdidCHCwds29ZKmfyC/Cclq7yZkn16PzuCoNSM2iNfi9A== Received: from CO2PR04CA0079.namprd04.prod.outlook.com (2603:10b6:102:1::47) by BL0PR12MB2818.namprd12.prod.outlook.com (2603:10b6:208:37::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.15; Tue, 21 Jun 2022 08:07:18 +0000 Received: from CO1NAM11FT068.eop-nam11.prod.protection.outlook.com (2603:10b6:102:1:cafe::af) by CO2PR04CA0079.outlook.office365.com (2603:10b6:102:1::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.14 via Frontend Transport; Tue, 21 Jun 2022 08:07:17 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.238) 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 12.22.5.238 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.238; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.238) by CO1NAM11FT068.mail.protection.outlook.com (10.13.175.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5353.14 via Frontend Transport; Tue, 21 Jun 2022 08:07:17 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL105.nvidia.com (10.27.9.14) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Tue, 21 Jun 2022 08:07:17 +0000 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.22; Tue, 21 Jun 2022 01:07:15 -0700 From: Xueming Li To: Kalesh AP CC: Ajit Khaparde , Somnath Kotur , dpdk stable Subject: patch 'net/bnxt: fix speed autonegotiation' has been queued to stable release 20.11.6 Date: Tue, 21 Jun 2022 11:01:54 +0300 Message-ID: <20220621080301.2315720-49-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220621080301.2315720-1-xuemingl@nvidia.com> References: <20220621080301.2315720-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-Office365-Filtering-Correlation-Id: 5d786a1c-e26b-4e55-3adc-08da535d0efe X-MS-TrafficTypeDiagnostic: BL0PR12MB2818:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7rXDaTS1AcjuKH1r2kqmqmvlKW2VspNuIGSRnKJsPLI9uktmze0eQ7G4jdUWcQo7KyiF9upOPuvuuOYbKo2mtCZ0RyqHzyF4PwAUrypHwNM9TK3QHGMy9VzndNjW9d7+x3AyXVEe7NCiHDpTcvGHj4Elqf9VMTaZ6pi0V2TGS2xbKczg1xAlZ/ez0NORvzJgoNv2j+G7hSRSST/Lh2zVqiwq16ZB2KuJmKN832hr1jPJrxovLGAK4+bdZJSfcyMlhkwuVXoCU/qnfD4HxMUQJV0eDY+W+OIGKgspuE458eFyX2ZWPDEF4NFJ9gz8ZY6vODVUUzF/8VKwLw8rsy7qFj1/cQ7J+NneON9DwTrBqeCbiXgVTNGuKDGYclA7gcLNdDiH7ocgbMYp3Cv20fd0Dr4Do5xFJCkPDgAm2Cpulvgfx8u0npvoUwvxTp9QI/SGUuJ+0tUDR6k0sfiSk0obtj7wDa2+aE9XTb20i4c+Mm7IS8lvFhHCxSxRgbUTEajc7kSlZrAHlgZIZJQXg66sUqSAWnYpHWlOid6hxp+0sVSXguAt/UI30IcvrtL0J2mv0i3AIS8z/7nZe2j/Ir/bJ5yiev5XhCeUWdtHxSr73twNGiOEeoi8oi2t+fWB5lkveZ7FEhdjvyDtXkln9vqLqeLhZALkFhdq1+yMtDDtWvoazlws492soT0WTfgbzWo0fJfKAt9FDag4epHEc9F8j29Gj7/J5sqtClHpzhuCi9Gjn2Y4wWZTnjDcLZWZV6JfGNT1o5OgxqX4Wh2JDRsk7yaSRJLt1a1asgn6nB0Qbl1hspd3/FXgA+oQzXwfaf/xG4d37qUAOJjuK06QHZYF+5cgFxUQ2903r57JxFKzEuM= X-Forefront-Antispam-Report: CIP:12.22.5.238; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(136003)(396003)(39860400002)(376002)(346002)(36840700001)(46966006)(40470700004)(16526019)(70586007)(8676002)(186003)(1076003)(26005)(82310400005)(40460700003)(86362001)(55016003)(426003)(336012)(4326008)(53546011)(70206006)(47076005)(36860700001)(6666004)(478600001)(36756003)(7696005)(966005)(6286002)(2616005)(41300700001)(316002)(6916009)(54906003)(2906002)(83380400001)(8936002)(81166007)(40480700001)(356005)(5660300002)(82740400003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2022 08:07:17.3702 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5d786a1c-e26b-4e55-3adc-08da535d0efe X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.238]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT068.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR12MB2818 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 20.11.6 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/23/22. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/214e9d80bea943b94e0b16616f839b6be5dab4fa Thanks. Xueming Li --- >From 214e9d80bea943b94e0b16616f839b6be5dab4fa Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Wed, 27 Apr 2022 20:28:16 +0530 Subject: [PATCH] net/bnxt: fix speed autonegotiation Cc: Xueming Li [ upstream commit 34a075947879232fcbaf656665380ce25f0523aa ] The "active_fec_signal_mode" in HWRM_PORT_PHY_QCFG response does not return correct value till the link is up. Driver cannot rely on active_fec_signal_mode while setting autoneg speed. While setting autoneg speed, driver is currently checking only "auto_link_speed_mask". Fixed to check "auto_pam4_link_speed_mask" as well. Also, while setting auto mode and setting speed mask, driver will have to set both NRZ and PAM4 mask. Fixes: c23f9ded0391 ("net/bnxt: support 200G PAM4 link") Signed-off-by: Kalesh AP Reviewed-by: Ajit Khaparde Reviewed-by: Somnath Kotur --- drivers/net/bnxt/bnxt_hwrm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index 4ddf3c0f6d..6a3d81f223 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -1291,17 +1291,17 @@ static int bnxt_hwrm_port_phy_cfg(struct bnxt *bp, struct bnxt_link_info *conf) } } /* AutoNeg - Advertise speeds specified. */ - if (conf->auto_link_speed_mask && + if ((conf->auto_link_speed_mask || conf->auto_pam4_link_speed_mask) && !(conf->phy_flags & HWRM_PORT_PHY_CFG_INPUT_FLAGS_FORCE)) { req.auto_mode = HWRM_PORT_PHY_CFG_INPUT_AUTO_MODE_SPEED_MASK; - if (conf->auto_pam4_link_speed_mask && - bp->link_info->link_signal_mode) { + if (conf->auto_pam4_link_speed_mask) { enables |= HWRM_PORT_PHY_CFG_IN_EN_AUTO_PAM4_LINK_SPD_MASK; req.auto_link_pam4_speed_mask = rte_cpu_to_le_16(conf->auto_pam4_link_speed_mask); - } else { + } + if (conf->auto_link_speed_mask) { enables |= HWRM_PORT_PHY_CFG_IN_EN_AUTO_LINK_SPEED_MASK; req.auto_link_speed_mask = -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-21 15:37:51.501601302 +0800 +++ 0048-net-bnxt-fix-speed-autonegotiation.patch 2022-06-21 15:37:49.061118001 +0800 @@ -1 +1 @@ -From 34a075947879232fcbaf656665380ce25f0523aa Mon Sep 17 00:00:00 2001 +From 214e9d80bea943b94e0b16616f839b6be5dab4fa Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 34a075947879232fcbaf656665380ce25f0523aa ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -26 +28 @@ -index 82d1a6205b..6e4753c508 100644 +index 4ddf3c0f6d..6a3d81f223 100644 @@ -29 +31 @@ -@@ -1429,17 +1429,17 @@ static int bnxt_hwrm_port_phy_cfg(struct bnxt *bp, struct bnxt_link_info *conf) +@@ -1291,17 +1291,17 @@ static int bnxt_hwrm_port_phy_cfg(struct bnxt *bp, struct bnxt_link_info *conf)