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 CF59046211 for ; Thu, 13 Feb 2025 11:00:49 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CAF1142ECC; Thu, 13 Feb 2025 11:00:49 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 1F93940287 for ; Thu, 13 Feb 2025 11:00:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739440847; 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=C6h8aKHKzdvrY4dGt567nATN8+SHRl66Kyi1cWjCncg=; b=PuvV+5z0hAuFsrv/8RHaAu/hLMcHwMlS8jxvW4KkEo6pPtjvDrY6NuyrnxmTl7oYyn+PM4 cXbbsUD5hD2wB2UJ5h3QJSyFBgegTtoDb9EdU02gkQ/vvE/WXMNrFh39ZZF/hMqXA/UnRC 8mxBy1JEVorPePPj7fdg27POeyNM5Ck= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-110-pUWsw3w7PhWoGtJDvq-V0A-1; Thu, 13 Feb 2025 05:00:43 -0500 X-MC-Unique: pUWsw3w7PhWoGtJDvq-V0A-1 X-Mimecast-MFC-AGG-ID: pUWsw3w7PhWoGtJDvq-V0A_1739440842 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 72AFE1800268; Thu, 13 Feb 2025 10:00:42 +0000 (UTC) Received: from rh.Home (unknown [10.45.224.21]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9D81D1800360; Thu, 13 Feb 2025 10:00:40 +0000 (UTC) From: Kevin Traynor To: Piotr Kwapulinski Cc: Yuan Wang , Bruce Richardson , dpdk stable Subject: patch 'net/ixgbe/base: remove 2.5/5G from auto-negotiation for E610' has been queued to stable release 24.11.2 Date: Thu, 13 Feb 2025 09:57:52 +0000 Message-ID: <20250213095933.362078-25-ktraynor@redhat.com> In-Reply-To: <20250213095933.362078-1-ktraynor@redhat.com> References: <20250213095933.362078-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: S37nEZpA-tHQ83AWGaOSAqerYkD1ydRUStbVxHLYaVw_1739440842 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 24.11.2 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/17/25. 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/f3fddb3b103dd339d2fe5d6ceaf91ef8679b70bf Thanks. Kevin --- >From f3fddb3b103dd339d2fe5d6ceaf91ef8679b70bf Mon Sep 17 00:00:00 2001 From: Piotr Kwapulinski Date: Tue, 14 Jan 2025 18:10:13 +0800 Subject: [PATCH] net/ixgbe/base: remove 2.5/5G from auto-negotiation for E610 [ upstream commit c38b4274255703a48d0177c013ee95afb4bde910 ] 2.5 and 5 Gbps link speeds must be excluded from the auto-negotiation set used during driver initialization due to compatibility issues with certain switches. Those issues do not exist in case of E610 2.5G SKU device (0x57b1). Fixes: c6cb313da739 ("net/ixgbe/base: add link management for E610") Signed-off-by: Piotr Kwapulinski Signed-off-by: Yuan Wang Acked-by: Bruce Richardson --- drivers/net/ixgbe/base/ixgbe_e610.c | 37 +++++++++++++++++++---------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/drivers/net/ixgbe/base/ixgbe_e610.c b/drivers/net/ixgbe/base/ixgbe_e610.c index b0d55a2411..31c2d986aa 100644 --- a/drivers/net/ixgbe/base/ixgbe_e610.c +++ b/drivers/net/ixgbe/base/ixgbe_e610.c @@ -4228,4 +4228,23 @@ s32 ixgbe_identify_phy_E610(struct ixgbe_hw *hw) pcaps.phy_type_high & IXGBE_PHY_TYPE_HIGH_1G_USXGMII) hw->phy.speeds_supported |= IXGBE_LINK_SPEED_1GB_FULL; + if (pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_10GBASE_T || + pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_10G_SFI_DA || + pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_10GBASE_SR || + pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_10GBASE_LR || + pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_10GBASE_KR_CR1 || + pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_10G_SFI_AOC_ACC || + pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_10G_SFI_C2C || + pcaps.phy_type_high & IXGBE_PHY_TYPE_HIGH_10G_USXGMII) + hw->phy.speeds_supported |= IXGBE_LINK_SPEED_10GB_FULL; + + /* 2.5 and 5 Gbps link speeds must be excluded from the + * auto-negotiation set used during driver initialization due to + * compatibility issues with certain switches. Those issues do not + * exist in case of E610 2.5G SKU device (0x57b1). + */ + if (!hw->phy.autoneg_advertised && + hw->device_id != IXGBE_DEV_ID_E610_2_5G_T) + hw->phy.autoneg_advertised = hw->phy.speeds_supported; + if (pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_2500BASE_T || pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_2500BASE_X || @@ -4234,21 +4253,13 @@ s32 ixgbe_identify_phy_E610(struct ixgbe_hw *hw) pcaps.phy_type_high & IXGBE_PHY_TYPE_HIGH_2500M_USXGMII) hw->phy.speeds_supported |= IXGBE_LINK_SPEED_2_5GB_FULL; + + if (!hw->phy.autoneg_advertised && + hw->device_id == IXGBE_DEV_ID_E610_2_5G_T) + hw->phy.autoneg_advertised = hw->phy.speeds_supported; + if (pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_5GBASE_T || pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_5GBASE_KR || pcaps.phy_type_high & IXGBE_PHY_TYPE_HIGH_5G_USXGMII) hw->phy.speeds_supported |= IXGBE_LINK_SPEED_5GB_FULL; - if (pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_10GBASE_T || - pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_10G_SFI_DA || - pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_10GBASE_SR || - pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_10GBASE_LR || - pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_10GBASE_KR_CR1 || - pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_10G_SFI_AOC_ACC || - pcaps.phy_type_low & IXGBE_PHY_TYPE_LOW_10G_SFI_C2C || - pcaps.phy_type_high & IXGBE_PHY_TYPE_HIGH_10G_USXGMII) - hw->phy.speeds_supported |= IXGBE_LINK_SPEED_10GB_FULL; - - /* Initialize autoneg speeds */ - if (!hw->phy.autoneg_advertised) - hw->phy.autoneg_advertised = hw->phy.speeds_supported; /* Set PHY ID */ -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-12 17:29:37.306473561 +0000 +++ 0025-net-ixgbe-base-remove-2.5-5G-from-auto-negotiation-f.patch 2025-02-12 17:29:34.271945458 +0000 @@ -1 +1 @@ -From c38b4274255703a48d0177c013ee95afb4bde910 Mon Sep 17 00:00:00 2001 +From f3fddb3b103dd339d2fe5d6ceaf91ef8679b70bf Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c38b4274255703a48d0177c013ee95afb4bde910 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index ee8614d3db..a7d642887f 100644 +index b0d55a2411..31c2d986aa 100644 @@ -25 +26 @@ -@@ -4257,4 +4257,23 @@ s32 ixgbe_identify_phy_E610(struct ixgbe_hw *hw) +@@ -4228,4 +4228,23 @@ s32 ixgbe_identify_phy_E610(struct ixgbe_hw *hw) @@ -49 +50 @@ -@@ -4263,21 +4282,13 @@ s32 ixgbe_identify_phy_E610(struct ixgbe_hw *hw) +@@ -4234,21 +4253,13 @@ s32 ixgbe_identify_phy_E610(struct ixgbe_hw *hw)