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 604BDA0A02 for ; Mon, 17 May 2021 18:13:08 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5391A41104; Mon, 17 May 2021 18:13:08 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id DABB340041 for ; Mon, 17 May 2021 18:13:06 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifre-0007qc-N8; Mon, 17 May 2021 16:13:06 +0000 From: Christian Ehrhardt To: Huisong Li Cc: Min Hu , dpdk stable Date: Mon, 17 May 2021 18:08:13 +0200 Message-Id: <20210517161039.3132619-64-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/hns3: fix reporting undefined speed' has been queued to stable release 19.11.9 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/19/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/606602aa104f331467742e5d96d03b6952ce8cd8 Thanks. Christian Ehrhardt --- >From 606602aa104f331467742e5d96d03b6952ce8cd8 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Tue, 23 Mar 2021 21:45:51 +0800 Subject: [PATCH] net/hns3: fix reporting undefined speed [ upstream commit b6579e3db794be36637a66e009199a1e7451e995 ] There may be a case in future that the speed obtained from firmware is undefined (such as, 400G or other rate), and link status of device is up. At this case, PMD driver will reports 100Mbps to the user in the "hns3_dev_link_update" API, which is unreasonable. Besides, if the speed from firmware is zero, driver should report zero instead of 100Mbps. Fixes: 59fad0f32135 ("net/hns3: support link update operation") Signed-off-by: Huisong Li Signed-off-by: Min Hu (Connor) --- drivers/net/hns3/hns3_ethdev.c | 5 ++++- drivers/net/hns3/hns3_ethdev_vf.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index 66be58dc26..98bc37d294 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -2578,7 +2578,10 @@ hns3_dev_link_update(struct rte_eth_dev *eth_dev, new_link.link_speed = mac->link_speed; break; default: - new_link.link_speed = ETH_SPEED_NUM_100M; + if (mac->link_status) + new_link.link_speed = ETH_SPEED_NUM_UNKNOWN; + else + new_link.link_speed = ETH_SPEED_NUM_NONE; break; } diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c index c936114075..0c21a20740 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c @@ -1695,7 +1695,10 @@ hns3vf_dev_link_update(struct rte_eth_dev *eth_dev, new_link.link_speed = mac->link_speed; break; default: - new_link.link_speed = ETH_SPEED_NUM_100M; + if (mac->link_status) + new_link.link_speed = ETH_SPEED_NUM_UNKNOWN; + else + new_link.link_speed = ETH_SPEED_NUM_NONE; break; } -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:32.043049196 +0200 +++ 0064-net-hns3-fix-reporting-undefined-speed.patch 2021-05-17 17:40:29.219809853 +0200 @@ -1 +1 @@ -From b6579e3db794be36637a66e009199a1e7451e995 Mon Sep 17 00:00:00 2001 +From 606602aa104f331467742e5d96d03b6952ce8cd8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b6579e3db794be36637a66e009199a1e7451e995 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index d392f6d109..73b96c18d1 100644 +index 66be58dc26..98bc37d294 100644 @@ -27 +28 @@ -@@ -2725,7 +2725,10 @@ hns3_dev_link_update(struct rte_eth_dev *eth_dev, +@@ -2578,7 +2578,10 @@ hns3_dev_link_update(struct rte_eth_dev *eth_dev, @@ -40 +41 @@ -index 30788f5c32..6c3ddcc50e 100644 +index c936114075..0c21a20740 100644 @@ -43 +44 @@ -@@ -2123,7 +2123,10 @@ hns3vf_dev_link_update(struct rte_eth_dev *eth_dev, +@@ -1695,7 +1695,10 @@ hns3vf_dev_link_update(struct rte_eth_dev *eth_dev,