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 44C4546211 for ; Thu, 13 Feb 2025 11:03:48 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3D89D42F51; Thu, 13 Feb 2025 11:03:48 +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 2C8A442F51 for ; Thu, 13 Feb 2025 11:03:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739441025; 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=71P5xCrDV9Y0XGrAXWWATcqPXsQNOdFVmfdV59GR534=; b=YdE4M8hdxyMrlbKmCLPDbsYKul+Z2OTo5knkyNnNpoAZlwbiEumRkKOl5HFmvUQusl5hf6 a1jq3LH+M8QrB1oAZnyaFI8rXBXIV0PEnYI1RbKuYBkI/MWpFAQpckRQajJoFVg6LiErsJ kTem5LEaLaqQH7tRVpYj8aoSFbS9Dcc= Received: from mx-prod-mc-08.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-410-5P9DbSxwN0GSPsFa-dyO8g-1; Thu, 13 Feb 2025 05:03:44 -0500 X-MC-Unique: 5P9DbSxwN0GSPsFa-dyO8g-1 X-Mimecast-MFC-AGG-ID: 5P9DbSxwN0GSPsFa-dyO8g 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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A5E2E1800871; Thu, 13 Feb 2025 10:03:43 +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 818C61800359; Thu, 13 Feb 2025 10:03:42 +0000 (UTC) From: Kevin Traynor To: Dengdui Huang Cc: dpdk stable Subject: patch 'net/hns3: fix copper port initialization' has been queued to stable release 24.11.2 Date: Thu, 13 Feb 2025 09:59:10 +0000 Message-ID: <20250213095933.362078-103-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: qmLsvnqn-4JWeoJu81Rc_Aqy6HbFm_vnuNjHv3qdHmA_1739441023 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/e38a5f52e81b6dd49ba25e4af3b023b7eddf25fa Thanks. Kevin --- >From e38a5f52e81b6dd49ba25e4af3b023b7eddf25fa Mon Sep 17 00:00:00 2001 From: Dengdui Huang Date: Mon, 10 Feb 2025 11:01:12 +0800 Subject: [PATCH] net/hns3: fix copper port initialization [ upstream commit 763546c33ea9600e76790c470d2921808068eb3d ] The initialization of copper port contains the following two steps. 1. Configure firmware takeover the PHY. The firmware will start an asynchronous task to initialize the PHY chip. 2. Configure work speed and duplex. In earlier versions of the firmware, when the asynchronous task is not finished, the firmware will return -ENOTBLK in the second step. And this will lead to driver failed to initialize. Here add retry for this case. Fixes: 2e4859f3b362 ("net/hns3: support PF device with copper PHYs") Signed-off-by: Dengdui Huang --- drivers/net/hns3/hns3_ethdev.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index 72d1c30a7b..9f7119b734 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -4853,5 +4853,5 @@ hns3_get_link_duplex(uint32_t link_speeds) static int -hns3_set_copper_port_link_speed(struct hns3_hw *hw, +hns3_copper_port_link_speed_cfg(struct hns3_hw *hw, struct hns3_set_link_speed_cfg *cfg) { @@ -4887,4 +4887,31 @@ hns3_set_copper_port_link_speed(struct hns3_hw *hw, } +static int +hns3_set_copper_port_link_speed(struct hns3_hw *hw, + struct hns3_set_link_speed_cfg *cfg) +{ +#define HNS3_PHY_PARAM_CFG_RETRY_TIMES 10 +#define HNS3_PHY_PARAM_CFG_RETRY_DELAY_MS 100 + uint32_t retry_cnt = 0; + int ret; + + /* + * The initialization of copper port contains the following two steps. + * 1. Configure firmware takeover the PHY. The firmware will start an + * asynchronous task to initialize the PHY chip. + * 2. Configure work speed and duplex. + * In earlier versions of the firmware, when the asynchronous task is not + * finished, the firmware will return -ENOTBLK in the second step. And this + * will lead to driver failed to initialize. Here add retry for this case. + */ + ret = hns3_copper_port_link_speed_cfg(hw, cfg); + while (ret == -ENOTBLK && retry_cnt++ < HNS3_PHY_PARAM_CFG_RETRY_TIMES) { + rte_delay_ms(HNS3_PHY_PARAM_CFG_RETRY_DELAY_MS); + ret = hns3_copper_port_link_speed_cfg(hw, cfg); + } + + return ret; +} + static int hns3_set_autoneg(struct hns3_hw *hw, bool enable) -- 2.48.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-12 17:29:45.406642623 +0000 +++ 0103-net-hns3-fix-copper-port-initialization.patch 2025-02-12 17:29:34.610947481 +0000 @@ -1 +1 @@ -From 763546c33ea9600e76790c470d2921808068eb3d Mon Sep 17 00:00:00 2001 +From e38a5f52e81b6dd49ba25e4af3b023b7eddf25fa Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 763546c33ea9600e76790c470d2921808068eb3d ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org