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 4C9F1A034E for ; Mon, 21 Feb 2022 16:38:47 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 48A63410F7; Mon, 21 Feb 2022 16:38:47 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id EE12040E5A for ; Mon, 21 Feb 2022 16:38:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645457924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pG//IAtHKrjc6DSnYGIIiKlkBL7I45gZbZiWUqua59o=; b=CcKWA84jCafyaDLB7Rqm01+zqtz01b+u++PFOQrycjvC0YXmVagFrKQyU1IdiRAFbrCPda kMony0O3zVy+xkyGlu8iUWeyM+6um29XIeod8RQQzXCsEX1Uq1DvntUpt2BBZOcmmHrF1O kD3T87A3ATH+qb6tiOSkc+a/eqEUtww= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-161-hLo0R9RHNUKtOYgMgn9iBw-1; Mon, 21 Feb 2022 10:38:40 -0500 X-MC-Unique: hLo0R9RHNUKtOYgMgn9iBw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 363E315720; Mon, 21 Feb 2022 15:38:39 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id D3EE578DDE; Mon, 21 Feb 2022 15:38:37 +0000 (UTC) From: Kevin Traynor To: Ajit Khaparde Cc: Kalesh AP , Somnath Kotur , dpdk stable Subject: patch 'net/bnxt: fix PAM4 mask setting' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:34:11 +0000 Message-Id: <20220221153625.152324-62-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 21.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 02/26/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/2e31b779e81830db62544e3520c5cbea69a71196 Thanks. Kevin --- >From 2e31b779e81830db62544e3520c5cbea69a71196 Mon Sep 17 00:00:00 2001 From: Ajit Khaparde Date: Tue, 4 Jan 2022 14:08:21 +0530 Subject: [PATCH] net/bnxt: fix PAM4 mask setting [ upstream commit 2ca072791715726cbb645b8d6ca0eb9734910c6b ] Set the PAM4 mask setting only when PAM4 signaling is enabled. Setting it otherwise seems to result in link negotiation. Also auto_pam4_link_speeds has been renamed to auto_pam4_link_speed_mask to reflect its real usage. Fixes: c23f9ded0391 ("net/bnxt: support 200G PAM4 link") Signed-off-by: Ajit Khaparde Reviewed-by: Kalesh AP Reviewed-by: Somnath Kotur --- drivers/net/bnxt/bnxt.h | 2 +- drivers/net/bnxt/bnxt_hwrm.c | 25 +++++++++++++------------ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h index 9c0dbc6af4..433f1c80be 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h @@ -298,5 +298,5 @@ struct bnxt_link_info { uint16_t force_pam4_link_speed; uint16_t support_pam4_speeds; - uint16_t auto_pam4_link_speeds; + uint16_t auto_pam4_link_speed_mask; uint16_t support_pam4_auto_speeds; uint8_t req_signal_mode; diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index b8c0cf50ad..5850e7e48b 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -1437,14 +1437,15 @@ static int bnxt_hwrm_port_phy_cfg(struct bnxt *bp, struct bnxt_link_info *conf) req.auto_mode = HWRM_PORT_PHY_CFG_INPUT_AUTO_MODE_SPEED_MASK; - req.auto_link_speed_mask = - conf->auto_link_speed_mask; - if (conf->auto_pam4_link_speeds) { + if (conf->auto_pam4_link_speed_mask && + bp->link_info->link_signal_mode) { enables |= HWRM_PORT_PHY_CFG_IN_EN_AUTO_PAM4_LINK_SPD_MASK; req.auto_link_pam4_speed_mask = - conf->auto_pam4_link_speeds; + rte_cpu_to_le_16(conf->auto_pam4_link_speed_mask); } else { enables |= HWRM_PORT_PHY_CFG_IN_EN_AUTO_LINK_SPEED_MASK; + req.auto_link_speed_mask = + rte_cpu_to_le_16(conf->auto_link_speed_mask); } } @@ -1519,5 +1520,5 @@ static int bnxt_hwrm_port_phy_qcfg(struct bnxt *bp, link_info->support_pam4_speeds = rte_le_to_cpu_16(resp->support_pam4_speeds); - link_info->auto_pam4_link_speeds = + link_info->auto_pam4_link_speed_mask = rte_le_to_cpu_16(resp->auto_pam4_link_speed_mask); link_info->module_status = resp->module_status; @@ -1530,5 +1531,5 @@ static int bnxt_hwrm_port_phy_qcfg(struct bnxt *bp, PMD_DRV_LOG(DEBUG, "Link Signal:%d,PAM::Auto:%x,Support:%x,Force:%x\n", link_info->link_signal_mode, - link_info->auto_pam4_link_speeds, + link_info->auto_pam4_link_speed_mask, link_info->support_pam4_speeds, link_info->force_pam4_link_speed); @@ -3246,5 +3247,5 @@ int bnxt_set_hwrm_link_config(struct bnxt *bp, bool link_up) if (bp->link_info->auto_link_speed == 0 && bp->link_info->link_signal_mode && - bp->link_info->auto_pam4_link_speeds == 0) + bp->link_info->auto_pam4_link_speed_mask == 0) autoneg = 0; @@ -3259,6 +3260,6 @@ int bnxt_set_hwrm_link_config(struct bnxt *bp, bool link_up) bnxt_parse_eth_link_speed_mask(bp, dev_conf->link_speeds); - link_req.auto_pam4_link_speeds = - bp->link_info->auto_pam4_link_speeds; + link_req.auto_pam4_link_speed_mask = + bp->link_info->auto_pam4_link_speed_mask; } else { if (bp->link_info->phy_type == @@ -3279,7 +3280,7 @@ int bnxt_set_hwrm_link_config(struct bnxt *bp, bool link_up) link_req.link_speed = bp->link_info->force_pam4_link_speed; - else if (bp->link_info->auto_pam4_link_speeds) + else if (bp->link_info->auto_pam4_link_speed_mask) link_req.link_speed = - bp->link_info->auto_pam4_link_speeds; + bp->link_info->auto_pam4_link_speed_mask; else if (bp->link_info->support_pam4_speeds) link_req.link_speed = @@ -3293,5 +3294,5 @@ int bnxt_set_hwrm_link_config(struct bnxt *bp, bool link_up) */ if (bp->link_info->auto_link_speed != 0 && - bp->link_info->auto_pam4_link_speeds == 0) + bp->link_info->auto_pam4_link_speed_mask == 0) link_req.link_speed = bp->link_info->auto_link_speed; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:46.008729709 +0000 +++ 0062-net-bnxt-fix-PAM4-mask-setting.patch 2022-02-21 15:22:44.142704240 +0000 @@ -1 +1 @@ -From 2ca072791715726cbb645b8d6ca0eb9734910c6b Mon Sep 17 00:00:00 2001 +From 2e31b779e81830db62544e3520c5cbea69a71196 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2ca072791715726cbb645b8d6ca0eb9734910c6b ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org